diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2013-11-25 02:39:24 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2013-11-25 02:39:24 -0300 |
| commit | bc24dc67a0e0bacf62ef040d991b25d28e4c4a2b (patch) | |
| tree | c3d80642d22bfbb27b98d20e7e6631a45f79efb0 /kamon-trace | |
| parent | 0ffbf436a7d9d69c2292c9892e740b592dc8d85e (diff) | |
| download | Kamon-bc24dc67a0e0bacf62ef040d991b25d28e4c4a2b.tar.gz Kamon-bc24dc67a0e0bacf62ef040d991b25d28e4c4a2b.tar.bz2 Kamon-bc24dc67a0e0bacf62ef040d991b25d28e4c4a2b.zip | |
relocate ask pattern tracing
Diffstat (limited to 'kamon-trace')
| -rw-r--r-- | kamon-trace/src/main/resources/META-INF/aop.xml | 25 | ||||
| -rw-r--r-- | kamon-trace/src/main/scala/akka/pattern/AskPatternTracing.scala (renamed from kamon-trace/src/main/scala/kamon/trace/instrumentation/AskPatternTracing.scala) | 5 |
2 files changed, 17 insertions, 13 deletions
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/kamon/trace/instrumentation/AskPatternTracing.scala b/kamon-trace/src/main/scala/akka/pattern/AskPatternTracing.scala index 625ed1ae..d4f8896b 100644 --- a/kamon-trace/src/main/scala/kamon/trace/instrumentation/AskPatternTracing.scala +++ b/kamon-trace/src/main/scala/akka/pattern/AskPatternTracing.scala @@ -1,7 +1,6 @@ -package akka.pattern.tracing +package akka.pattern -import org.aspectj.lang.annotation.{After, AfterReturning, Pointcut, Aspect} -import akka.pattern.{AskTimeoutException, PromiseActorRef} +import org.aspectj.lang.annotation.{AfterReturning, Pointcut, Aspect} import akka.event.Logging.Warning import scala.compat.Platform.EOL import akka.actor.ActorRefProvider |