From 7298ddee182f08f7232e8daf8e628b089678f77b Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Sat, 23 Nov 2013 22:54:47 -0300
Subject: simple test for ActorLogging instrumentation

---
 kamon-trace/src/main/resources/META-INF/aop.xml    |  1 +
 .../ActorLoggingInstrumentation.scala              | 29 ----------------------
 .../instrumentation/ActorLoggingTracing.scala      | 28 +++++++++++++++++++++
 3 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingInstrumentation.scala
 create mode 100644 kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingTracing.scala

(limited to 'kamon-trace/src/main')

diff --git a/kamon-trace/src/main/resources/META-INF/aop.xml b/kamon-trace/src/main/resources/META-INF/aop.xml
index 090cac42..fb13360a 100644
--- a/kamon-trace/src/main/resources/META-INF/aop.xml
+++ b/kamon-trace/src/main/resources/META-INF/aop.xml
@@ -4,6 +4,7 @@
     <aspects>
         <aspect name="kamon.trace.instrumentation.EnvelopeTraceContextMixin"/>
         <aspect name="kamon.trace.instrumentation.BehaviourInvokeTracing"/>
+        <aspect name="kamon.trace.instrumentation.ActorLoggingTracing"/>
 
         <aspect name="kamon.trace.instrumentation.FutureTracing" />
 
diff --git a/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingInstrumentation.scala b/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingInstrumentation.scala
deleted file mode 100644
index fecdc7e3..00000000
--- a/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingInstrumentation.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-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}
-
-@Aspect
-class ActorLoggingInstrumentation {
-
-
-  @DeclareMixin("akka.event.Logging.LogEvent+")
-  def traceContextMixin: ContextAware = ContextAware.default
-
-  @Pointcut("execution(* akka.event.slf4j.Slf4jLogger.withMdc(..)) && args(logSource, logEvent, logStatement)")
-  def withMdcInvocation(logSource: String, logEvent: ContextAware, logStatement: () => _): Unit = {}
-
-  @Around("withMdcInvocation(logSource, logEvent, logStatement)")
-  def putTraceContextInMDC(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()
-    }
-  }
-}
diff --git a/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingTracing.scala b/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingTracing.scala
new file mode 100644
index 00000000..9a9460b7
--- /dev/null
+++ b/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorLoggingTracing.scala
@@ -0,0 +1,28 @@
+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}
+
+@Aspect
+class ActorLoggingTracing {
+
+  @DeclareMixin("akka.event.Logging.LogEvent+")
+  def mixin: ContextAware = ContextAware.default
+
+  @Pointcut("execution(* akka.event.slf4j.Slf4jLogger.withMdc(..)) && args(logSource, logEvent, logStatement)")
+  def withMdcInvocation(logSource: String, logEvent: ContextAware, logStatement: () => _): Unit = {}
+
+  @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()
+    }
+  }
+}
-- 
cgit v1.2.3