From f293332a6123b1ab24f83edb5ff56bd0335c20ad Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Sun, 2 Feb 2014 22:55:05 -0300
Subject: instrument akka testkit to correctly propagate TraceContexts when
 replying from a test probe

---
 kamon-core/src/test/resources/META-INF/aop.xml     | 13 ------
 .../test/scala/akka/testkit/TestProbeTracing.scala | 54 ----------------------
 2 files changed, 67 deletions(-)
 delete mode 100644 kamon-core/src/test/resources/META-INF/aop.xml
 delete mode 100644 kamon-core/src/test/scala/akka/testkit/TestProbeTracing.scala

(limited to 'kamon-core/src/test')

diff --git a/kamon-core/src/test/resources/META-INF/aop.xml b/kamon-core/src/test/resources/META-INF/aop.xml
deleted file mode 100644
index ea8dce20..00000000
--- a/kamon-core/src/test/resources/META-INF/aop.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd">
-
-<aspectj>
-    <aspects>
-        <!-- Actors -->
-        <aspect name="akka.testkit.TestProbeTracing"/>
-    </aspects>
-
-    <weaver options="-verbose -showWeaveInfo">
-        <include within="akka..*"/>
-    </weaver>
-
-</aspectj>
\ No newline at end of file
diff --git a/kamon-core/src/test/scala/akka/testkit/TestProbeTracing.scala b/kamon-core/src/test/scala/akka/testkit/TestProbeTracing.scala
deleted file mode 100644
index a050145a..00000000
--- a/kamon-core/src/test/scala/akka/testkit/TestProbeTracing.scala
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * =========================================================================================
- * 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 akka.testkit
-
-import org.aspectj.lang.annotation._
-import kamon.trace.{ TraceContextAware, TraceRecorder }
-import org.aspectj.lang.ProceedingJoinPoint
-import akka.testkit.TestActor.RealMessage
-
-@Aspect
-class TestProbeTracing {
-
-  @DeclareMixin("akka.testkit.TestActor.RealMessage")
-  def mixin: TraceContextAware = TraceContextAware.default
-
-  @Pointcut("execution(akka.testkit.TestActor.RealMessage.new(..)) && this(ctx)")
-  def realMessageCreation(ctx: TraceContextAware): Unit = {}
-
-  @After("realMessageCreation(ctx)")
-  def afterRealMessageCreation(ctx: TraceContextAware): Unit = {
-    // Necessary to force the initialization of ContextAware at the moment of creation.
-    ctx.traceContext
-  }
-
-  @Pointcut("execution(* akka.testkit.TestProbe.reply(..)) && this(testProbe)")
-  def testProbeReply(testProbe: TestProbe): Unit = {}
-
-  @Around("testProbeReply(testProbe)")
-  def aroundTestProbeReply(pjp: ProceedingJoinPoint, testProbe: TestProbe): Any = {
-    val traceContext = testProbe.lastMessage match {
-      case msg: RealMessage ⇒ msg.asInstanceOf[TraceContextAware].traceContext
-      case _                ⇒ None
-    }
-
-    TraceRecorder.withTraceContext(traceContext) {
-      pjp.proceed
-    }
-  }
-
-}
-- 
cgit v1.2.3