diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-09-01 00:03:44 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-09-01 00:03:44 -0300 |
| commit | 4b999c39b6bd09d891de718fad10b795264755c6 (patch) | |
| tree | 9957acba109fd53c5bc02a15f14fdfc7cf0a4c00 /kamon-core/src/main/resources/META-INF/aop.xml | |
| parent | a54d41b14314c48e105156db6738eb65de0649d5 (diff) | |
| parent | 23785a41dc3a0e9651ba87bc9dc255932ea64bd6 (diff) | |
| download | Kamon-4b999c39b6bd09d891de718fad10b795264755c6.tar.gz Kamon-4b999c39b6bd09d891de718fad10b795264755c6.tar.bz2 Kamon-4b999c39b6bd09d891de718fad10b795264755c6.zip | |
Merge branch 'master' into release-0.2
Conflicts:
kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala
project/Dependencies.scala
version.sbt
Diffstat (limited to 'kamon-core/src/main/resources/META-INF/aop.xml')
| -rw-r--r-- | kamon-core/src/main/resources/META-INF/aop.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml index 07f5cfd1..a272320f 100644 --- a/kamon-core/src/main/resources/META-INF/aop.xml +++ b/kamon-core/src/main/resources/META-INF/aop.xml @@ -14,12 +14,16 @@ <aspect name="akka.instrumentation.ActorCellInstrumentation"/> <aspect name="akka.instrumentation.ActorLoggingInstrumentation"/> + <!-- Remoting and Cluster --> + <aspect name="akka.remote.instrumentation.RemotingInstrumentation"/> + <!-- Dispatchers --> <aspect name="akka.instrumentation.DispatcherInstrumentation"/> <aspect name="akka.instrumentation.DispatcherMetricCollectionInfoIntoDispatcherMixin"/> <!-- Futures --> <aspect name="kamon.instrumentation.scala.FutureInstrumentation"/> + <aspect name="kamon.instrumentation.scalaz.FutureInstrumentation"/> <!-- Patterns --> <aspect name="akka.instrumentation.AskPatternInstrumentation"/> @@ -27,9 +31,13 @@ <weaver options="-XmessageHandlerClass:kamon.weaver.logging.KamonWeaverMessageHandler"> <include within="scala.concurrent..*"/> + <include within="scalaz.concurrent..*"/> <include within="akka..*"/> <include within="spray..*"/> <include within="kamon..*"/> + + <!-- For some weird reason ByteString produces a java.lang.VerifyError after going through the weaver. --> + <exclude within="akka.util.ByteString"/> </weaver> </aspectj>
\ No newline at end of file |