diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-12-28 07:59:59 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-12-28 18:15:48 +0100 |
| commit | ff7ac0ec79dd61849b4c76b10f74af72c7cceea9 (patch) | |
| tree | b937dbe85d23f7f6ff910dabea795b66a8009f57 /kamon-core/src/main/resources/META-INF/aop.xml | |
| parent | 20e0193071b483b68c53b55bd5502d05f0631ec6 (diff) | |
| download | Kamon-ff7ac0ec79dd61849b4c76b10f74af72c7cceea9.tar.gz Kamon-ff7ac0ec79dd61849b4c76b10f74af72c7cceea9.tar.bz2 Kamon-ff7ac0ec79dd61849b4c76b10f74af72c7cceea9.zip | |
! core,akka: separate all akka instrumentation into it's own kamon-akka module, related to #136.
All Akka-related instrumentation and code has been moved to the kamon-akka module,
including the filters for actor, dispatcher and router metrics. Also the following
changes are included:
- Router Metrics are now working properly, related to #139.
- Cleanup the log output for this module, related to #142.
- Some minor cleanups in various tests.
This PR breaks the reporting modules which will need to wait for #141 to be ready to come back
to life.
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, 0 insertions, 21 deletions
diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml index 8c7eb235..47ce11d8 100644 --- a/kamon-core/src/main/resources/META-INF/aop.xml +++ b/kamon-core/src/main/resources/META-INF/aop.xml @@ -5,38 +5,17 @@ <!-- Disable AspectJ Weaver not present error --> <aspect name="kamon.instrumentation.AspectJWeaverMissingWarning"/> - <!-- Actors --> - <aspect name="akka.kamon.instrumentation.TraceContextIntoRepointableActorRefMixin"/> - <aspect name="akka.kamon.instrumentation.TraceContextIntoSystemMessageMixin"/> - <aspect name="akka.kamon.instrumentation.ActorSystemMessageInstrumentation"/> - <aspect name="akka.kamon.instrumentation.TraceContextIntoEnvelopeMixin"/> - <aspect name="akka.kamon.instrumentation.ActorCellMetricsIntoActorCellMixin"/> - <aspect name="akka.kamon.instrumentation.ActorCellInstrumentation"/> - <aspect name="akka.kamon.instrumentation.ActorLoggingInstrumentation"/> - - <!-- Dispatchers --> - <aspect name="akka.kamon.instrumentation.DispatcherInstrumentation"/> - <aspect name="akka.kamon.instrumentation.DispatcherMetricCollectionInfoIntoDispatcherMixin"/> - <!-- Futures --> <aspect name="kamon.instrumentation.scala.FutureInstrumentation"/> <aspect name="kamon.instrumentation.scalaz.FutureInstrumentation"/> - <!-- Patterns --> - <aspect name="akka.kamon.instrumentation.AskPatternInstrumentation"/> </aspects> <weaver> <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"/> - <!-- Exclude CallingThreadDispatcher, is only for test purposes --> - <exclude within="akka.testkit.CallingThreadDispatcher"/> </weaver> </aspectj>
\ No newline at end of file |