diff options
| author | Ivan Topolnak <itopolnak@despegar.com> | 2014-01-13 17:56:51 -0300 |
|---|---|---|
| committer | Ivan Topolnak <itopolnak@despegar.com> | 2014-01-13 17:56:51 -0300 |
| commit | 111ea55690351d0903e9902c525c781ef2d743a8 (patch) | |
| tree | 003b0e1cf95f1d3cba55927422ff063c049a5cf9 /kamon-core/src/main/resources/META-INF/aop.xml | |
| parent | 571e96665bb3cb3f20fb59209be63dabbb3148f4 (diff) | |
| parent | 7a10c0ef2a6566229e8571f6d385ca2ff794cc20 (diff) | |
| download | Kamon-111ea55690351d0903e9902c525c781ef2d743a8.tar.gz Kamon-111ea55690351d0903e9902c525c781ef2d743a8.tar.bz2 Kamon-111ea55690351d0903e9902c525c781ef2d743a8.zip | |
Merge branch 'wip/trace-and-metrics-integration'
Conflicts:
kamon-newrelic/src/main/scala/kamon/newrelic/NewRelicErrorLogger.scala
Diffstat (limited to 'kamon-core/src/main/resources/META-INF/aop.xml')
| -rw-r--r-- | kamon-core/src/main/resources/META-INF/aop.xml | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml index f6951705..1448f22f 100644 --- a/kamon-core/src/main/resources/META-INF/aop.xml +++ b/kamon-core/src/main/resources/META-INF/aop.xml @@ -2,17 +2,30 @@ <aspectj> <weaver options="-verbose -showWeaveInfo"> - <!--<dump within="*"/>--> + <!-- In case you want to see the weaved classes --> + <!--<dump within="*"/>--> </weaver> <aspects> - <aspect name="kamon.instrumentation.ActorSystemInstrumentation"/> + <!-- Actors --> + <aspect name="akka.instrumentation.RepointableActorRefTraceContextMixin"/> + <aspect name="akka.instrumentation.SystemMessageTraceContextMixin"/> + <aspect name="akka.instrumentation.ActorSystemMessagePassingTracing"/> + <aspect name="akka.instrumentation.EnvelopeTraceContextMixin"/> + <aspect name="akka.instrumentation.BehaviourInvokeTracing"/> + <aspect name="kamon.instrumentation.ActorLoggingTracing"/> + + <!-- Futures --> + <aspect name="kamon.instrumentation.FutureTracing"/> + + <!-- Patterns --> + <aspect name="akka.instrumentation.AskPatternTracing"/> + - <!--<exclude within="*"/>--> <include within="scala.concurrent..*"/> <include within="akka..*"/> <include within="spray..*"/> <include within="kamon..*"/> </aspects> -</aspectj> +</aspectj>
\ No newline at end of file |