aboutsummaryrefslogtreecommitdiff
path: root/kamon-core
diff options
context:
space:
mode:
Diffstat (limited to 'kamon-core')
-rw-r--r--kamon-core/src/main/resources/META-INF/aop.xml2
-rw-r--r--kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala2
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")