1 files changed, 33 insertions, 0 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/concurrent/MdcThreadFactory.scala b/src/main/scala/xyz/driver/pdsuicommon/concurrent/MdcThreadFactory.scala
new file mode 100644
index 0000000..d1dc3ae
--- /dev/null
+++ b/src/main/scala/xyz/driver/pdsuicommon/concurrent/MdcThreadFactory.scala
@@ -0,0 +1,33 @@
+package xyz.driver.pdsuicommon.concurrent
+
+import java.util.concurrent.ThreadFactory
+
+import org.slf4j.MDC
+
+object MdcThreadFactory {
+  def from(orig: ThreadFactory): ThreadFactory = new MdcThreadFactory(orig)
+}
+
+class MdcThreadFactory(orig: ThreadFactory) extends ThreadFactory {
+
+  override def newThread(runnable: Runnable): Thread = {
+    val parentMdcContext = MDC.getCopyOfContextMap
+
+    orig.newThread(new Runnable {
+      def run(): Unit = {
+        val saveMdcContext = MDC.getCopyOfContextMap
+        setContextMap(parentMdcContext)
+
+        try {
+          runnable.run()
+        } finally {
+          setContextMap(saveMdcContext)
+        }
+      }
+    })
+  }
+
+  private[this] def setContextMap(context: java.util.Map[String, String]): Unit =
+    Option(context).fold(MDC.clear())(MDC.setContextMap)
+
+}