Make logback always print WorkflowId and ActivityId in samples (temporalio#303)

Spikhalskiy · web-flow · commit 9c9ae9e8f960 · 2022-05-31T22:18:05.000-04:00
diff --git a/src/main/java/io/temporal/samples/hello/HelloActivity.java b/src/main/java/io/temporal/samples/hello/HelloActivity.java
@@ -31,6 +31,8 @@
 import io.temporal.workflow.WorkflowInterface;
 import io.temporal.workflow.WorkflowMethod;
 import java.time.Duration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /** Sample Temporal Workflow Definition that executes a single Activity. */
 public class HelloActivity {
@@ -107,8 +109,11 @@ public String getGreeting(String name) {
 
   /** Simple activity implementation, that concatenates two strings. */
   static class GreetingActivitiesImpl implements GreetingActivities {
+    private static final Logger log = LoggerFactory.getLogger(GreetingActivitiesImpl.class);
+
     @Override
     public String composeGreeting(String greeting, String name) {
+      log.info("Composing greeting...");
       return greeting + " " + name + "!";
     }
   }
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -22,7 +22,9 @@
         <!-- encoders are assigned the type
              ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
         <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+            <!-- WorkflowId and ActivityId are keys populated by JavaSDK into MDC context -->
+            <!-- See io.temporal.internal.logging.LoggerTag for a full list of keys -->
+            <pattern>%d{HH:mm:ss.SSS} {%X{WorkflowId} %X{ActivityId}} [%thread] %-5level %logger{36} - %msg %n</pattern>
         </encoder>
     </appender>
     <logger name="io.grpc.netty" level="INFO"/>
