wip

2 files changed, 50 insertions, 50 deletions

diff --git a/kamon-core/src/main/scala/kamon/util/BaggageOnMDC.scala b/kamon-core/src/main/scala/kamon/util/BaggageOnMDC.scala
index 885a73d9..83027cc5 100644
--- a/kamon-core/src/main/scala/kamon/util/BaggageOnMDC.scala
+++ b/kamon-core/src/main/scala/kamon/util/BaggageOnMDC.scala
@@ -22,51 +22,51 @@ import kamon.Kamon
 import org.slf4j.MDC
 
 import scala.collection.JavaConverters._
-
-object BaggageOnMDC {
-
-  /**
-    * Copy all baggage keys into SLF4J's MDC, evaluates the provided piece of code and removes the baggage keys
-    * afterwards, only when there is a currently active span. Optionally adds the Trace ID as well.
-    *
-    */
-  def withBaggageOnMDC[T](includeTraceID: Boolean, code: => T): T = {
-    val activeSpan = Kamon.activeSpan()
-    if(activeSpan == null)
-      code
-    else {
-      val baggageItems = activeSpan.context().baggageItems().asScala
-      baggageItems.foreach(entry => MDC.put(entry.getKey, entry.getValue))
-      if(includeTraceID)
-        addTraceIDToMDC(activeSpan.context())
-
-      val evaluatedCode = code
-
-      baggageItems.foreach(entry => MDC.remove(entry.getKey))
-      if(includeTraceID)
-        removeTraceIDFromMDC()
-
-      evaluatedCode
-
-    }
-  }
-
-  def withBaggageOnMDC[T](code: Supplier[T]): T =
-    withBaggageOnMDC(true, code.get())
-
-  def withBaggageOnMDC[T](includeTraceID: Boolean, code: Supplier[T]): T =
-    withBaggageOnMDC(includeTraceID, code.get())
-
-  def withBaggageOnMDC[T](code: => T): T =
-    withBaggageOnMDC(true, code)
-
-  private val TraceIDKey = "trace_id"
-
-  private def addTraceIDToMDC(context: io.opentracing.SpanContext): Unit = context match {
-    case ctx: KamonSpanContext => MDC.put(TraceIDKey, HexCodec.toLowerHex(ctx.traceID))
-    case _ =>
-  }
-
-  private def removeTraceIDFromMDC(): Unit =
-    MDC.remove(TraceIDKey)
-}
+//
+//object BaggageOnMDC {
+//
+//  /**
+//    * Copy all baggage keys into SLF4J's MDC, evaluates the provided piece of code and removes the baggage keys
+//    * afterwards, only when there is a currently active span. Optionally adds the Trace ID as well.
+//    *
+//    */
+//  def withBaggageOnMDC[T](includeTraceID: Boolean, code: => T): T = {
+//    val activeSpan = Kamon.activeSpan()
+//    if(activeSpan == null)
+//      code
+//    else {
+//      val baggageItems = activeSpan.context().baggageItems().asScala
+//      baggageItems.foreach(entry => MDC.put(entry.getKey, entry.getValue))
+//      if(includeTraceID)
+//        addTraceIDToMDC(activeSpan.context())
+//
+//      val evaluatedCode = code
+//
+//      baggageItems.foreach(entry => MDC.remove(entry.getKey))
+//      if(includeTraceID)
+//        removeTraceIDFromMDC()
+//
+//      evaluatedCode
+//
+//    }
+//  }
+//
+//  def withBaggageOnMDC[T](code: Supplier[T]): T =
+//    withBaggageOnMDC(true, code.get())
+//
+//  def withBaggageOnMDC[T](includeTraceID: Boolean, code: Supplier[T]): T =
+//    withBaggageOnMDC(includeTraceID, code.get())
+//
+//  def withBaggageOnMDC[T](code: => T): T =
+//    withBaggageOnMDC(true, code)
+//
+//  private val TraceIDKey = "trace_id"
+//
+//  private def addTraceIDToMDC(context: io.opentracing.SpanContext): Unit = context match {
+//    case ctx: KamonSpanContext => MDC.put(TraceIDKey, HexCodec.toLowerHex(ctx.traceID))
+//    case _ =>
+//  }
+//
+//  private def removeTraceIDFromMDC(): Unit =
+//    MDC.remove(TraceIDKey)
+//}
diff --git a/kamon-core/src/main/scala/kamon/util/Mixin.scala b/kamon-core/src/main/scala/kamon/util/Mixin.scala
index 348b34f1..318679c1 100644
--- a/kamon-core/src/main/scala/kamon/util/Mixin.scala
+++ b/kamon-core/src/main/scala/kamon/util/Mixin.scala
@@ -16,8 +16,8 @@
 package kamon
 package util
 
-import io.opentracing.ActiveSpan
-import io.opentracing.ActiveSpan.Continuation
+import kamon.trace.{ActiveSpan, Continuation}
+
 
 /**
   *  Utility trait that marks objects carrying an ActiveSpan.Continuation.