diff options
| author | Diego <diegolparra@gmail.com> | 2014-10-21 12:49:28 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2014-10-21 12:49:28 -0300 |
| commit | 509988c356965e3c4b40bcd4036b7dc573796e1f (patch) | |
| tree | 10eaeeae709ded64e17f742ec29783ac31dfdb0a | |
| parent | 2fab1e6bdef50932cfa01d137411847e8e05c1a2 (diff) | |
| download | Kamon-509988c356965e3c4b40bcd4036b7dc573796e1f.tar.gz Kamon-509988c356965e3c4b40bcd4036b7dc573796e1f.tar.bz2 Kamon-509988c356965e3c4b40bcd4036b7dc573796e1f.zip | |
= core: exclude CallerThreadDispatcher from instrumentation, change Dispatcher to MessageDispatcher in DispatcherInstrumentation and fixes #95
| -rw-r--r-- | kamon-core/src/main/resources/META-INF/aop.xml | 2 | ||||
| -rw-r--r-- | kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml index cd7b1645..ee2af95a 100644 --- a/kamon-core/src/main/resources/META-INF/aop.xml +++ b/kamon-core/src/main/resources/META-INF/aop.xml @@ -38,6 +38,8 @@ <!-- For some weird reason ByteString produces a java.lang.VerifyError after going through the weaver. --> <exclude within="akka.util.ByteString"/> + <!-- Exclude CallingThreadDispatcher, is only for test purposes --> + <exclude within="akka.testkit.CallingThreadDispatcher"/> </weaver> </aspectj>
\ No newline at end of file diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala index db366e8c..8b3af3d6 100644 --- a/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala +++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala @@ -105,7 +105,7 @@ class DispatcherInstrumentation { @Aspect class DispatcherMetricCollectionInfoIntoDispatcherMixin { - @DeclareMixin("akka.dispatch.Dispatcher") + @DeclareMixin("akka.dispatch.MessageDispatcher") def mixinDispatcherMetricsToMessageDispatcher: DispatcherMetricCollectionInfo = new DispatcherMetricCollectionInfo {} @DeclareMixin("akka.dispatch.Dispatchers") |