passing MDC context from Cinder

Netflix · Sep 5, 2023 · 9999b2f · 9999b2f
1 parent 1c4f393
commit 9999b2f
Show file tree

Hide file tree

Showing 13 changed files with 210 additions and 34 deletions.
diff --git a/hollow-diff-ui/dependencies.lock b/hollow-diff-ui/dependencies.lock
@@ -68,6 +68,12 @@
                 "com.netflix.hollow:hollow-ui-tools"
             ],
             "locked": "2.3"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     },
     "testCompileClasspath": {
@@ -145,6 +151,12 @@
                 "com.netflix.hollow:hollow-ui-tools"
             ],
             "locked": "2.3"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     },
     "toolsCompileClasspath": {
@@ -222,6 +234,12 @@
                 "com.netflix.hollow:hollow-ui-tools"
             ],
             "locked": "2.3"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     }
 }
diff --git a/hollow-explorer-ui/dependencies.lock b/hollow-explorer-ui/dependencies.lock
@@ -58,6 +58,12 @@
                 "com.netflix.hollow:hollow-ui-tools"
             ],
             "locked": "2.3"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     },
     "testCompileClasspath": {
@@ -125,6 +131,12 @@
                 "com.netflix.hollow:hollow-ui-tools"
             ],
             "locked": "2.3"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     },
     "toolsCompileClasspath": {
@@ -192,6 +204,12 @@
                 "com.netflix.hollow:hollow-ui-tools"
             ],
             "locked": "2.3"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     }
 }
diff --git a/hollow-jsonadapter/dependencies.lock b/hollow-jsonadapter/dependencies.lock
@@ -31,6 +31,12 @@
         },
         "commons-lang:commons-lang": {
             "locked": "2.6"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     },
     "testCompileClasspath": {
@@ -71,6 +77,12 @@
         },
         "junit:junit": {
             "locked": "4.11"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     }
 }
diff --git a/hollow-perf/dependencies.lock b/hollow-perf/dependencies.lock
@@ -41,6 +41,12 @@
         },
         "org.openjdk.jmh:jmh-generator-bytecode": {
             "locked": "1.25"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     },
     "runtimeClasspath": {
@@ -49,6 +55,12 @@
         },
         "org.openjdk.jmh:jmh-core": {
             "locked": "1.21"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     },
     "testCompileClasspath": {
@@ -65,6 +77,12 @@
         },
         "org.openjdk.jmh:jmh-core": {
             "locked": "1.21"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     }
 }
diff --git a/hollow-test/dependencies.lock b/hollow-test/dependencies.lock
@@ -7,6 +7,12 @@
     "runtimeClasspath": {
         "com.netflix.hollow:hollow": {
             "project": true
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     },
     "testCompileClasspath": {
@@ -23,6 +29,12 @@
         },
         "junit:junit": {
             "locked": "4.11"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     }
 }
diff --git a/hollow-ui-tools/dependencies.lock b/hollow-ui-tools/dependencies.lock
@@ -37,6 +37,12 @@
         },
         "org.apache.velocity:velocity-engine-core": {
             "locked": "2.3"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     },
     "testCompileClasspath": {
@@ -83,6 +89,12 @@
         },
         "org.apache.velocity:velocity-engine-core": {
             "locked": "2.3"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     },
     "toolsCompileClasspath": {
@@ -129,6 +141,12 @@
         },
         "org.apache.velocity:velocity-engine-core": {
             "locked": "2.3"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     }
 }
diff --git a/hollow-zenoadapter/dependencies.lock b/hollow-zenoadapter/dependencies.lock
@@ -13,6 +13,12 @@
         },
         "com.netflix.zeno:netflix-zeno": {
             "locked": "2.22.3"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     },
     "testCompileClasspath": {
@@ -35,6 +41,12 @@
         },
         "junit:junit": {
             "locked": "4.11"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     }
 }
diff --git a/hollow/build.gradle b/hollow/build.gradle
@@ -6,6 +6,7 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:2.15.0'
     testImplementation 'com.github.spotbugs:spotbugs:4.2.1'
     testImplementation 'org.assertj:assertj-core:3.15.0'
+    implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: '2.0.9'
 }
 
 tasks.withType(JavaCompile).configureEach {

diff --git a/hollow/dependencies.lock b/hollow/dependencies.lock
@@ -1,4 +1,14 @@
 {
+    "compileClasspath": {
+        "org.slf4j:jul-to-slf4j": {
+            "locked": "2.0.9"
+        }
+    },
+    "runtimeClasspath": {
+        "org.slf4j:jul-to-slf4j": {
+            "locked": "2.0.9"
+        }
+    },
     "testCompileClasspath": {
         "com.github.spotbugs:spotbugs": {
             "locked": "4.2.1"
@@ -14,6 +24,9 @@
         },
         "org.mockito:mockito-core": {
             "locked": "2.15.0"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "locked": "2.0.9"
         }
     },
     "testRuntimeClasspath": {
@@ -37,6 +50,12 @@
         },
         "org.mockito:mockito-core": {
             "locked": "2.15.0"
+        },
+        "org.slf4j:jul-to-slf4j": {
+            "firstLevelTransitive": [
+                "com.netflix.hollow:hollow"
+            ],
+            "locked": "2.0.9"
         }
     }
 }
diff --git a/hollow/src/main/java/com/netflix/hollow/api/client/HollowAnnouncementWatcher.java b/hollow/src/main/java/com/netflix/hollow/api/client/HollowAnnouncementWatcher.java
@@ -20,6 +20,9 @@
 
 import com.netflix.hollow.api.consumer.HollowConsumer;
 import com.netflix.hollow.core.HollowConstants;
+import org.slf4j.MDC;
+
+import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -129,16 +132,23 @@ public void triggerAsyncRefreshWithRandomDelay(int maxDelayMillis) {
     public void triggerAsyncRefreshWithDelay(int delayMillis) {
         final HollowClient client = this.client;
         final long targetBeginTime = System.currentTimeMillis() + delayMillis;
-
+        // Capture MDC context on the original thread
+        final Map<String, String> mdcContext = MDC.getCopyOfContextMap();
         refreshExecutor.execute(new Runnable() {
             public void run() {
+                // Set MDC context on the new thread
+                if (mdcContext != null) {
+                    MDC.setContextMap(mdcContext);
+                }
                 try {
                     long delay = targetBeginTime - System.currentTimeMillis();
                     if(delay > 0)
                         Thread.sleep(delay);
                     client.triggerRefresh();
                 } catch(Throwable th) {
                     log.log(Level.SEVERE, "Async refresh failed", th);
+                } finally {
+                    MDC.clear();
                 }
             }
         });

diff --git a/hollow/src/main/java/com/netflix/hollow/api/consumer/HollowConsumer.java b/hollow/src/main/java/com/netflix/hollow/api/consumer/HollowConsumer.java
@@ -39,6 +39,8 @@
 import com.netflix.hollow.core.util.DefaultHashCodeFinder;
 import com.netflix.hollow.core.util.HollowObjectHashCodeFinder;
 import com.netflix.hollow.tools.history.HollowHistory;
+import org.slf4j.MDC;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -258,25 +260,36 @@ public void triggerAsyncRefresh() {
      */
     public void triggerAsyncRefreshWithDelay(int delayMillis) {
         final long targetBeginTime = System.currentTimeMillis() + delayMillis;
+        // Capture MDC context on the original thread
+        final Map<String, String> mdcContext = MDC.getCopyOfContextMap();
 
         refreshExecutor.execute(() -> {
-            try {
-                long delay = targetBeginTime - System.currentTimeMillis();
-                if (delay > 0)
-                    Thread.sleep(delay);
-            } catch (InterruptedException e) {
-                // Interrupting, such as shutting down the executor pool,
-                // cancels the trigger
-                LOG.log(Level.INFO, "Async refresh interrupted before trigger, refresh cancelled", e);
-                return;
+            // Set MDC context on the new thread
+            if (mdcContext != null) {
+                MDC.setContextMap(mdcContext);
             }
-
             try {
-                triggerRefresh();
-            } catch (Error | RuntimeException e) {
-                // Ensure exceptions are propagated to the executor
-                LOG.log(Level.SEVERE, "Async refresh failed", e);
-                throw e;
+                try {
+                    long delay = targetBeginTime - System.currentTimeMillis();
+                    if (delay > 0)
+                        Thread.sleep(delay);
+                } catch (InterruptedException e) {
+                    // Interrupting, such as shutting down the executor pool,
+                    // cancels the trigger
+                    LOG.log(Level.INFO, "Async refresh interrupted before trigger, refresh cancelled", e);
+                    return;
+                }
+
+                try {
+                    triggerRefresh();
+                } catch (Error | RuntimeException e) {
+                    // Ensure exceptions are propagated to the executor
+                    LOG.log(Level.SEVERE, "Async refresh failed", e);
+                    throw e;
+                }
+            } finally {
+                // clear MDC context when entire task is done
+                MDC.clear();
             }
         });
     }