diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-03 23:27:57 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-03 23:27:57 +0100 |
| commit | 59faf588080b137817444a6877170e2bd687427f (patch) | |
| tree | a5f1cadf6c21915938d435e1a9d01583475d0c6a /kamon-akka-remote/src/main/resources/META-INF/aop.xml | |
| parent | 4b999c39b6bd09d891de718fad10b795264755c6 (diff) | |
| parent | 6e3d9ae88ecce10420eeac82294c54c1b43dedf4 (diff) | |
| download | Kamon-59faf588080b137817444a6877170e2bd687427f.tar.gz Kamon-59faf588080b137817444a6877170e2bd687427f.tar.bz2 Kamon-59faf588080b137817444a6877170e2bd687427f.zip | |
Merge branch 'master' into release-0.2, kamon-play still need fixes.
Conflicts:
kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala
kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala
kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala
kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala
kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala
kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala
kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala
project/Dependencies.scala
Diffstat (limited to 'kamon-akka-remote/src/main/resources/META-INF/aop.xml')
| -rw-r--r-- | kamon-akka-remote/src/main/resources/META-INF/aop.xml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/kamon-akka-remote/src/main/resources/META-INF/aop.xml b/kamon-akka-remote/src/main/resources/META-INF/aop.xml new file mode 100644 index 00000000..ba1c8e79 --- /dev/null +++ b/kamon-akka-remote/src/main/resources/META-INF/aop.xml @@ -0,0 +1,12 @@ +<!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd"> + +<aspectj> + <aspects> + <!-- Remoting and Cluster --> + <aspect name="akka.remote.instrumentation.RemotingInstrumentation"/> + </aspects> + + <weaver> + <include within="akka..*"/> + </weaver> +</aspectj>
\ No newline at end of file |