From bc24dc67a0e0bacf62ef040d991b25d28e4c4a2b Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Mon, 25 Nov 2013 02:39:24 -0300
Subject: relocate ask pattern tracing

---
 kamon-trace/src/main/resources/META-INF/aop.xml    | 25 +++++++++-------
 .../scala/akka/pattern/AskPatternTracing.scala     | 33 +++++++++++++++++++++
 .../trace/instrumentation/AskPatternTracing.scala  | 34 ----------------------
 3 files changed, 48 insertions(+), 44 deletions(-)
 create mode 100644 kamon-trace/src/main/scala/akka/pattern/AskPatternTracing.scala
 delete mode 100644 kamon-trace/src/main/scala/kamon/trace/instrumentation/AskPatternTracing.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 fb13360a..40bea5fc 100644
--- a/kamon-trace/src/main/resources/META-INF/aop.xml
+++ b/kamon-trace/src/main/resources/META-INF/aop.xml
@@ -1,18 +1,23 @@
 <!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd">
 
 <aspectj>
-    <aspects>
-        <aspect name="kamon.trace.instrumentation.EnvelopeTraceContextMixin"/>
-        <aspect name="kamon.trace.instrumentation.BehaviourInvokeTracing"/>
-        <aspect name="kamon.trace.instrumentation.ActorLoggingTracing"/>
+  <aspects>
+    <!-- Actors -->
+    <aspect name="kamon.trace.instrumentation.EnvelopeTraceContextMixin"/>
+    <aspect name="kamon.trace.instrumentation.BehaviourInvokeTracing"/>
+    <aspect name="kamon.trace.instrumentation.ActorLoggingTracing"/>
 
-        <aspect name="kamon.trace.instrumentation.FutureTracing" />
+    <!-- Futures -->
+    <aspect name="kamon.trace.instrumentation.FutureTracing"/>
 
+    <!-- Patterns -->
+    <aspect name="akka.pattern.AskPatternTracing"/>
 
-        <include within="scala.concurrent..*"/>
-        <include within="akka..*"/>
-        <include within="spray..*"/>
-        <include within="kamon..*"/>
-    </aspects>
+
+    <include within="scala.concurrent..*"/>
+    <include within="akka..*"/>
+    <include within="spray..*"/>
+    <include within="kamon..*"/>
+  </aspects>
 
 </aspectj>
diff --git a/kamon-trace/src/main/scala/akka/pattern/AskPatternTracing.scala b/kamon-trace/src/main/scala/akka/pattern/AskPatternTracing.scala
new file mode 100644
index 00000000..d4f8896b
--- /dev/null
+++ b/kamon-trace/src/main/scala/akka/pattern/AskPatternTracing.scala
@@ -0,0 +1,33 @@
+package akka.pattern
+
+import org.aspectj.lang.annotation.{AfterReturning, Pointcut, Aspect}
+import akka.event.Logging.Warning
+import scala.compat.Platform.EOL
+import akka.actor.ActorRefProvider
+
+@Aspect
+class AskPatternTracing {
+
+  class StackTraceCaptureException extends Throwable
+
+  @Pointcut(value = "execution(* akka.pattern.PromiseActorRef$.apply(..)) && args(provider, *)", argNames = "provider")
+  def promiseActorRefApply(provider: ActorRefProvider): Unit = {
+    provider.settings.config.getBoolean("kamon.trace.ask-pattern-tracing")
+  }
+
+  @AfterReturning(pointcut = "promiseActorRefApply(provider)", returning = "promiseActor")
+  def hookAskTimeoutWarning(provider: ActorRefProvider, promiseActor: PromiseActorRef): Unit = {
+    val future = promiseActor.result.future
+    val system = promiseActor.provider.guardian.underlying.system
+    implicit val ec = system.dispatcher
+    val stack = new StackTraceCaptureException
+
+    future onFailure {
+      case timeout: AskTimeoutException =>
+        val stackString = stack.getStackTrace.drop(3).mkString("", EOL, EOL)
+
+        system.eventStream.publish(Warning("AskPatternTracing", classOf[AskPatternTracing],
+          "Timeout triggered for ask pattern registered at: " + stackString))
+    }
+  }
+}
diff --git a/kamon-trace/src/main/scala/kamon/trace/instrumentation/AskPatternTracing.scala b/kamon-trace/src/main/scala/kamon/trace/instrumentation/AskPatternTracing.scala
deleted file mode 100644
index 625ed1ae..00000000
--- a/kamon-trace/src/main/scala/kamon/trace/instrumentation/AskPatternTracing.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package akka.pattern.tracing
-
-import org.aspectj.lang.annotation.{After, AfterReturning, Pointcut, Aspect}
-import akka.pattern.{AskTimeoutException, PromiseActorRef}
-import akka.event.Logging.Warning
-import scala.compat.Platform.EOL
-import akka.actor.ActorRefProvider
-
-@Aspect
-class AskPatternTracing {
-
-  class StackTraceCaptureException extends Throwable
-
-  @Pointcut(value = "execution(* akka.pattern.PromiseActorRef$.apply(..)) && args(provider, *)", argNames = "provider")
-  def promiseActorRefApply(provider: ActorRefProvider): Unit = {
-    provider.settings.config.getBoolean("kamon.trace.ask-pattern-tracing")
-  }
-
-  @AfterReturning(pointcut = "promiseActorRefApply(provider)", returning = "promiseActor")
-  def hookAskTimeoutWarning(provider: ActorRefProvider, promiseActor: PromiseActorRef): Unit = {
-    val future = promiseActor.result.future
-    val system = promiseActor.provider.guardian.underlying.system
-    implicit val ec = system.dispatcher
-    val stack = new StackTraceCaptureException
-
-    future onFailure {
-      case timeout: AskTimeoutException =>
-        val stackString = stack.getStackTrace.drop(3).mkString("", EOL, EOL)
-
-        system.eventStream.publish(Warning("AskPatternTracing", classOf[AskPatternTracing],
-          "Timeout triggered for ask pattern registered at: " + stackString))
-    }
-  }
-}
-- 
cgit v1.2.3