feat: add MDC to workflow execution

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/MDCUtils.java

@@ -66,6 +66,15 @@ public static void withMDCForEvent(
     }
   }
 
+  public static void withMDCForResource(HasMetadata resource, Runnable runnable) {
+    try {
+      MDCUtils.addResourceInfo(resource);
+      runnable.run();
+    } finally {
+      MDCUtils.removeResourceInfo();
+    }
+  }
+
   public static void addResourceIDInfo(ResourceID resourceID) {
     if (enabled) {
       MDC.put(NAME, resourceID.getName());

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/NodeExecutor.java

@@ -19,36 +19,43 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.processing.MDCUtils;
 
 abstract class NodeExecutor<R, P extends HasMetadata> implements Runnable {
 
   private static final Logger log = LoggerFactory.getLogger(NodeExecutor.class);
 
   private final DependentResourceNode<R, P> dependentResourceNode;
   private final AbstractWorkflowExecutor<P> workflowExecutor;
+  private final P primary;
 
   protected NodeExecutor(
       DependentResourceNode<R, P> dependentResourceNode,
-      AbstractWorkflowExecutor<P> workflowExecutor) {
+      AbstractWorkflowExecutor<P> workflowExecutor,
+      P primary) {
     this.dependentResourceNode = dependentResourceNode;
     this.workflowExecutor = workflowExecutor;
+    this.primary = primary;
   }
 
   @Override
   public void run() {
-    try {
-      doRun(dependentResourceNode);
-
-    } catch (Exception e) {
-      // Exception is required because of Kotlin
-      workflowExecutor.handleExceptionInExecutor(dependentResourceNode, e);
-    } catch (Error e) {
-      // without this user would see no sign about the error
-      log.error("java.lang.Error during execution", e);
-      throw e;
-    } finally {
-      workflowExecutor.handleNodeExecutionFinish(dependentResourceNode);
-    }
+    MDCUtils.withMDCForResource(
+        primary,
+        () -> {
+          try {
+            doRun(dependentResourceNode);
+          } catch (Exception e) {
+            // Exception is required because of Kotlin
+            workflowExecutor.handleExceptionInExecutor(dependentResourceNode, e);
+          } catch (Error e) {
+            // without this user would see no sign about the error
+            log.error("java.lang.Error during execution", e);
+            throw e;
+          } finally {
+            workflowExecutor.handleNodeExecutionFinish(dependentResourceNode);
+          }
+        });
   }
 
   protected abstract void doRun(DependentResourceNode<R, P> dependentResourceNode);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowCleanupExecutor.java

@@ -87,7 +87,7 @@ private synchronized void handleCleanup(DependentResourceNode dependentResourceN
   private class CleanupExecutor<R> extends NodeExecutor<R, P> {
 
     private CleanupExecutor(DependentResourceNode<R, P> drn) {
-      super(drn, WorkflowCleanupExecutor.this);
+      super(drn, WorkflowCleanupExecutor.this, primary);
     }
 
     @Override

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowReconcileExecutor.java

@@ -150,7 +150,7 @@ private boolean allDependentsDeletedAlready(DependentResourceNode<?, P> dependen
   private class NodeReconcileExecutor<R> extends NodeExecutor<R, P> {
 
     private NodeReconcileExecutor(DependentResourceNode<R, P> dependentResourceNode) {
-      super(dependentResourceNode, WorkflowReconcileExecutor.this);
+      super(dependentResourceNode, WorkflowReconcileExecutor.this, primary);
     }
 
     @Override
@@ -176,7 +176,7 @@ protected void doRun(DependentResourceNode<R, P> dependentResourceNode) {
   private class NodeDeleteExecutor<R> extends NodeExecutor<R, P> {
 
     private NodeDeleteExecutor(DependentResourceNode<R, P> dependentResourceNode) {
-      super(dependentResourceNode, WorkflowReconcileExecutor.this);
+      super(dependentResourceNode, WorkflowReconcileExecutor.this, primary);
     }
 
     @Override

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/NodeExecutorTest.java

@@ -26,7 +26,7 @@
 class NodeExecutorTest {
 
   private NodeExecutor errorThrowingNodeExecutor =
-      new NodeExecutor(null, null) {
+      new NodeExecutor(null, null, null) {
         @Override
         protected void doRun(DependentResourceNode dependentResourceNode) {
           throw new NoSuchFieldError();