From 5606d35cb9f06ac655ea2abc4f0aa2e53c892b0f Mon Sep 17 00:00:00 2001 From: Carlos Ferreyra Date: Thu, 26 Dec 2013 14:39:36 -0300 Subject: Added new respondWithUow directive to add the X-UOW header back in the response. Changed ActorLogging to just propagate the trace context (does not add to the MDC anymore). Created UowConverter to let logback know where the extract the UOW from. --- kamon-trace/src/main/scala/kamon/trace/UowTracing.scala | 10 +++++++++- .../kamon/trace/instrumentation/ActorLoggingTracing.scala | 12 +++--------- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'kamon-trace/src') diff --git a/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala b/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala index 3d1a7778..fcddcf90 100644 --- a/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala +++ b/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala @@ -79,4 +79,12 @@ class UowTraceAggregator(reporting: ActorRef, aggregationTimeout: Duration) exte object UowTraceAggregator { def props(reporting: ActorRef, aggregationTimeout: Duration) = Props(classOf[UowTraceAggregator], reporting, aggregationTimeout) -} \ No newline at end of file +} + +package logback { + import ch.qos.logback.classic.pattern.ClassicConverter + import ch.qos.logback.classic.spi.ILoggingEvent + class UowConverter extends ClassicConverter { + def convert(event: ILoggingEvent): String = Trace.context().map(_.uow).getOrElse("undefined") + } +} diff --git a/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingTracing.scala b/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingTracing.scala index 783fd6e1..0d06eb2c 100644 --- a/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingTracing.scala +++ b/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingTracing.scala @@ -17,8 +17,7 @@ package kamon.trace.instrumentation import org.aspectj.lang.annotation.{ Around, Pointcut, DeclareMixin, Aspect } import org.aspectj.lang.ProceedingJoinPoint -import org.slf4j.MDC -import kamon.trace.{ TraceContext, ContextAware, Trace } +import kamon.trace.{ ContextAware, Trace } @Aspect class ActorLoggingTracing { @@ -31,13 +30,8 @@ class ActorLoggingTracing { @Around("withMdcInvocation(logSource, logEvent, logStatement)") def aroundWithMdcInvocation(pjp: ProceedingJoinPoint, logSource: String, logEvent: ContextAware, logStatement: () ⇒ _): Unit = { - logEvent.traceContext match { - case Some(ctx) ⇒ - MDC.put("uow", ctx.uow) - pjp.proceed() - MDC.remove("uow") - - case None ⇒ pjp.proceed() + Trace.withContext(logEvent.traceContext) { + pjp.proceed() } } } -- cgit v1.2.3 From 9fd83d6a2d53e93e8d5042eeea722e1992e760b5 Mon Sep 17 00:00:00 2001 From: Carlos Ferreyra Date: Thu, 26 Dec 2013 15:20:36 -0300 Subject: Changed logback dependency to provided. Promoted the logback converter to its own file. --- .../src/main/scala/kamon/trace/UowTracing.scala | 8 -------- .../kamon/trace/logging/LogbackUowConverter.scala | 24 ++++++++++++++++++++++ project/Build.scala | 3 ++- 3 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 kamon-trace/src/main/scala/kamon/trace/logging/LogbackUowConverter.scala (limited to 'kamon-trace/src') diff --git a/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala b/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala index fcddcf90..20cce830 100644 --- a/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala +++ b/kamon-trace/src/main/scala/kamon/trace/UowTracing.scala @@ -80,11 +80,3 @@ class UowTraceAggregator(reporting: ActorRef, aggregationTimeout: Duration) exte object UowTraceAggregator { def props(reporting: ActorRef, aggregationTimeout: Duration) = Props(classOf[UowTraceAggregator], reporting, aggregationTimeout) } - -package logback { - import ch.qos.logback.classic.pattern.ClassicConverter - import ch.qos.logback.classic.spi.ILoggingEvent - class UowConverter extends ClassicConverter { - def convert(event: ILoggingEvent): String = Trace.context().map(_.uow).getOrElse("undefined") - } -} diff --git a/kamon-trace/src/main/scala/kamon/trace/logging/LogbackUowConverter.scala b/kamon-trace/src/main/scala/kamon/trace/logging/LogbackUowConverter.scala new file mode 100644 index 00000000..add47fdf --- /dev/null +++ b/kamon-trace/src/main/scala/kamon/trace/logging/LogbackUowConverter.scala @@ -0,0 +1,24 @@ +/* =================================================== + * Copyright © 2013 the kamon project + * + * 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.Trace + +class LogbackUowConverter extends ClassicConverter { + def convert(event: ILoggingEvent): String = Trace.context().map(_.uow).getOrElse("undefined") +} diff --git a/project/Build.scala b/project/Build.scala index 3faf7adc..2b022ba6 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -31,7 +31,8 @@ object Build extends Build { .settings(aspectJSettings: _*) .settings( libraryDependencies ++= - compile(akkaActor, aspectJ, logback) ++ + compile(akkaActor, aspectJ) ++ + provided(logback) ++ test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, logback)) .dependsOn(kamonCore) -- cgit v1.2.3