From 52233d1ddef10b3c40df134b33f0d255dce85ae5 Mon Sep 17 00:00:00 2001
From: Diego <diegolparra@gmail.com>
Date: Tue, 21 Oct 2014 12:49:28 -0300
Subject: = core: exclude CallerThreadDispatcher from instrumentation, change
 Dispatcher to MessageDispatcher in DispatcherInstrumentation  and fixes #95

---
 kamon-core/src/main/resources/META-INF/aop.xml                          | 2 ++
 .../scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'kamon-core/src/main')

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")
-- 
cgit v1.2.3