diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2017-08-15 00:06:26 +0200 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2017-08-15 00:06:26 +0200 |
commit | 6721d325d018756296213ac8f9129bc304a21afb (patch) | |
tree | e08a5ce92802f521be228beae0ddb4ef258d0066 /kamon-core/src/main/scala/kamon/util | |
parent | ac3b72e27765ceec4cc3958b0fa7eaba0299f017 (diff) | |
parent | a949c875684d78818224cd2ca7aaf79aa7878724 (diff) | |
download | Kamon-6721d325d018756296213ac8f9129bc304a21afb.tar.gz Kamon-6721d325d018756296213ac8f9129bc304a21afb.tar.bz2 Kamon-6721d325d018756296213ac8f9129bc304a21afb.zip |
Merge remote-tracking branch 'ivantopo/wip/moving-ot-support-to-a-separeate-project' into kamon-1.0-develop
Diffstat (limited to 'kamon-core/src/main/scala/kamon/util')
-rw-r--r-- | kamon-core/src/main/scala/kamon/util/BaggageOnMDC.scala | 72 | ||||
-rw-r--r-- | kamon-core/src/main/scala/kamon/util/Mixin.scala | 45 |
2 files changed, 0 insertions, 117 deletions
diff --git a/kamon-core/src/main/scala/kamon/util/BaggageOnMDC.scala b/kamon-core/src/main/scala/kamon/util/BaggageOnMDC.scala deleted file mode 100644 index 885a73d9..00000000 --- a/kamon-core/src/main/scala/kamon/util/BaggageOnMDC.scala +++ /dev/null @@ -1,72 +0,0 @@ -/* - * ========================================================================================= - * Copyright © 2013-2015 the kamon project <http://kamon.io/> - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language governing permissions - * and limitations under the License. - * ========================================================================================= - */ -package kamon.util - -import java.util.function.Supplier - -import kamon.trace.{SpanContext => KamonSpanContext} -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) -} diff --git a/kamon-core/src/main/scala/kamon/util/Mixin.scala b/kamon-core/src/main/scala/kamon/util/Mixin.scala deleted file mode 100644 index 348b34f1..00000000 --- a/kamon-core/src/main/scala/kamon/util/Mixin.scala +++ /dev/null @@ -1,45 +0,0 @@ -/* ========================================================================================= - * Copyright © 2013-2017 the kamon project <http://kamon.io/> - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language governing permissions - * and limitations under the License. - * ========================================================================================= - */ - -package kamon -package util - -import io.opentracing.ActiveSpan -import io.opentracing.ActiveSpan.Continuation - -/** - * Utility trait that marks objects carrying an ActiveSpan.Continuation. - */ -trait HasContinuation { - def continuation: Continuation -} - -object HasContinuation { - private class Default(val continuation: Continuation) extends HasContinuation - - /** - * Construct a HasContinuation instance by capturing a continuation from the provided active span. - */ - def from(activeSpan: ActiveSpan): HasContinuation = { - val continuation = if(activeSpan == null) null else activeSpan.capture() - new Default(continuation) - } - - /** - * Constructs a new HasContinuation instance using Kamon's tracer currently active span. - */ - def fromTracerActiveSpan(): HasContinuation = - new Default(Kamon.activeSpanContinuation()) -} |