Adding attempt number into MDC context for better diagnosing (#2193)

temporalio · Aug 21, 2024 · f2e113a · f2e113a
1 parent 4eaeb9e
commit f2e113a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/logging/LoggerTag.java b/temporal-sdk/src/main/java/io/temporal/internal/logging/LoggerTag.java
@@ -37,4 +37,5 @@ private LoggerTag() {}
   public static final String WORKER_TYPE = "WorkerType";
   public static final String SIDE_EFFECT_ID = "SideEffectId";
   public static final String CHILD_WORKFLOW_ID = "ChildWorkflowId";
+  public static final String ATTEMPT = "Attempt";
 }
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/worker/ActivityWorker.java b/temporal-sdk/src/main/java/io/temporal/internal/worker/ActivityWorker.java
@@ -247,6 +247,7 @@ public void handle(ActivityTask task) throws Exception {
       MDC.put(LoggerTag.WORKFLOW_ID, pollResponse.getWorkflowExecution().getWorkflowId());
       MDC.put(LoggerTag.WORKFLOW_TYPE, pollResponse.getWorkflowType().getName());
       MDC.put(LoggerTag.RUN_ID, pollResponse.getWorkflowExecution().getRunId());
+      MDC.put(LoggerTag.ATTEMPT, Integer.toString(pollResponse.getAttempt()));
 
       ActivityTaskHandler.Result result = null;
       try {
@@ -257,6 +258,7 @@ public void handle(ActivityTask task) throws Exception {
         MDC.remove(LoggerTag.WORKFLOW_ID);
         MDC.remove(LoggerTag.WORKFLOW_TYPE);
         MDC.remove(LoggerTag.RUN_ID);
+        MDC.remove(LoggerTag.ATTEMPT);
         if (
         // handleActivity throw an exception (not a normal scenario)
         result == null

diff --git a/temporal-sdk/src/main/java/io/temporal/internal/worker/LocalActivityWorker.java b/temporal-sdk/src/main/java/io/temporal/internal/worker/LocalActivityWorker.java
@@ -441,6 +441,7 @@ public void handle(LocalActivityAttemptTask attemptTask) throws Exception {
         MDC.put(LoggerTag.WORKFLOW_ID, activityTask.getWorkflowExecution().getWorkflowId());
         MDC.put(LoggerTag.WORKFLOW_TYPE, activityTask.getWorkflowType().getName());
         MDC.put(LoggerTag.RUN_ID, activityTask.getWorkflowExecution().getRunId());
+        MDC.put(LoggerTag.ATTEMPT, Integer.toString(activityTask.getAttempt()));
 
         slotSupplier.markSlotUsed(
             new LocalActivitySlotInfo(
@@ -506,6 +507,7 @@ public void handle(LocalActivityAttemptTask attemptTask) throws Exception {
         MDC.remove(LoggerTag.WORKFLOW_ID);
         MDC.remove(LoggerTag.WORKFLOW_TYPE);
         MDC.remove(LoggerTag.RUN_ID);
+        MDC.remove(LoggerTag.ATTEMPT);
       }
     }