diff options
Diffstat (limited to 'kamon-core/src/legacy-main/scala/kamon/trace/logging')
-rw-r--r-- | kamon-core/src/legacy-main/scala/kamon/trace/logging/LogbackTraceTokenConverter.scala | 26 | ||||
-rw-r--r-- | kamon-core/src/legacy-main/scala/kamon/trace/logging/MdcKeysSupport.scala | 54 |
2 files changed, 80 insertions, 0 deletions
diff --git a/kamon-core/src/legacy-main/scala/kamon/trace/logging/LogbackTraceTokenConverter.scala b/kamon-core/src/legacy-main/scala/kamon/trace/logging/LogbackTraceTokenConverter.scala new file mode 100644 index 00000000..8177ed14 --- /dev/null +++ b/kamon-core/src/legacy-main/scala/kamon/trace/logging/LogbackTraceTokenConverter.scala @@ -0,0 +1,26 @@ +/* =================================================== + * Copyright © 2013 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.trace.logging + +import ch.qos.logback.classic.pattern.ClassicConverter +import ch.qos.logback.classic.spi.ILoggingEvent +import kamon.trace.Tracer + +class LogbackTraceTokenConverter extends ClassicConverter { + + def convert(event: ILoggingEvent): String = + Tracer.currentContext.collect(_.token).getOrElse("undefined") +} diff --git a/kamon-core/src/legacy-main/scala/kamon/trace/logging/MdcKeysSupport.scala b/kamon-core/src/legacy-main/scala/kamon/trace/logging/MdcKeysSupport.scala new file mode 100644 index 00000000..556366b0 --- /dev/null +++ b/kamon-core/src/legacy-main/scala/kamon/trace/logging/MdcKeysSupport.scala @@ -0,0 +1,54 @@ +/* + * ========================================================================================= + * Copyright © 2013-2016 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.trace.logging + +import kamon.trace.TraceLocal.AvailableToMdc +import kamon.trace.{EmptyTraceContext, MetricsOnlyContext, TraceContext, Tracer} +import kamon.util.Supplier +import org.slf4j.MDC + +trait MdcKeysSupport { + + val traceTokenKey = "traceToken" + val traceNameKey = "traceName" + + private val defaultKeys = Seq(traceTokenKey, traceNameKey) + + def withMdc[A](thunk: ⇒ A): A = { + val keys = copyToMdc(Tracer.currentContext) + try thunk finally keys.foreach(key ⇒ MDC.remove(key)) + } + + // Java variant. + def withMdc[A](thunk: Supplier[A]): A = withMdc(thunk.get) + + private[kamon] def copyToMdc(traceContext: TraceContext): Iterable[String] = traceContext match { + case ctx: MetricsOnlyContext ⇒ + + // Add the default key value pairs for the trace token and trace name. + MDC.put(traceTokenKey, ctx.token) + MDC.put(traceNameKey, ctx.name) + + defaultKeys ++ ctx.traceLocalStorage.underlyingStorage.collect { + case (available: AvailableToMdc, value) ⇒ Map(available.mdcKey → String.valueOf(value)) + }.flatMap { value ⇒ value.map { case (k, v) ⇒ MDC.put(k, v); k } } + + case EmptyTraceContext ⇒ Iterable.empty[String] + } +} + +object MdcKeysSupport extends MdcKeysSupport
\ No newline at end of file |