Clear the MDC in the Kafka plugin thread.

Signed-off-by: David Venable <[email protected]>
opensearch-project · Feb 15, 2024 · 58d9a7d · 58d9a7d
1 parent d5e8095
commit 58d9a7d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...java/org/opensearch/dataprepper/plugins/kafka/common/thread/KafkaPluginThreadFactory.java b/...java/org/opensearch/dataprepper/plugins/kafka/common/thread/KafkaPluginThreadFactory.java
@@ -43,7 +43,11 @@ public static KafkaPluginThreadFactory defaultExecutorThreadFactory(final String
     public Thread newThread(final Runnable runnable) {
         final Thread thread = delegateThreadFactory.newThread(() -> {
             MDC.put(KafkaMdc.MDC_KAFKA_PLUGIN_KEY, kafkaPluginType);
-            runnable.run();
+            try {
+                runnable.run();
+            } finally {
+                MDC.clear();
+            }
         });
 
         thread.setName(threadPrefix + threadNumber.getAndIncrement());