diff options
| author | Ivan Topolnak <ivantopo@gmail.com> | 2013-11-07 18:41:33 -0300 |
|---|---|---|
| committer | Ivan Topolnak <ivantopo@gmail.com> | 2013-11-07 18:41:33 -0300 |
| commit | bf86900669d649308f4914c54e6fe076510506a6 (patch) | |
| tree | d8bf9af9f5c8a946d757137a303f6956c05edb03 /kamon-core/src/main | |
| parent | 2b63540e5fffab545d0846cfb3dab5c0e1d0c9e1 (diff) | |
| download | Kamon-bf86900669d649308f4914c54e6fe076510506a6.tar.gz Kamon-bf86900669d649308f4914c54e6fe076510506a6.tar.bz2 Kamon-bf86900669d649308f4914c54e6fe076510506a6.zip | |
halfway to our own NewRelic Agent
Diffstat (limited to 'kamon-core/src/main')
| -rw-r--r-- | kamon-core/src/main/resources/META-INF/aop.xml (renamed from kamon-core/src/main/resources/META-INF/aop_remove_when_possible.xml) | 3 | ||||
| -rw-r--r-- | kamon-core/src/main/scala/kamon/AkkaExtensionSwap.scala | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/kamon-core/src/main/resources/META-INF/aop_remove_when_possible.xml b/kamon-core/src/main/resources/META-INF/aop.xml index 207bf1b9..3532b19b 100644 --- a/kamon-core/src/main/resources/META-INF/aop_remove_when_possible.xml +++ b/kamon-core/src/main/resources/META-INF/aop.xml @@ -10,9 +10,6 @@ <aspect name="kamon.trace.instrumentation.EnvelopeTracingContext"/> <aspect name="kamon.trace.instrumentation.ActorCellInvokeInstrumentation"/> <aspect name="kamon.trace.instrumentation.RunnableTracing" /> - <aspect name="kamon.instrumentation.SprayRequestContextTracing"/> - <aspect name="kamon.instrumentation.SprayOpenRequestContextTracing"/> - <aspect name = "kamon.instrumentation.SprayServerInstrumentation"/> <aspect name="kamon.instrumentation.ActorSystemInstrumentation"/> <aspect name="kamon.trace.instrumentation.ActorLoggingInstrumentation"/> diff --git a/kamon-core/src/main/scala/kamon/AkkaExtensionSwap.scala b/kamon-core/src/main/scala/kamon/AkkaExtensionSwap.scala index 3d503d54..aee7df9f 100644 --- a/kamon-core/src/main/scala/kamon/AkkaExtensionSwap.scala +++ b/kamon-core/src/main/scala/kamon/AkkaExtensionSwap.scala @@ -1,10 +1,10 @@ package kamon -import akka.actor.{ActorSystem, ExtensionId} +import akka.actor.{Extension, ActorSystem, ExtensionId} import java.util.concurrent.ConcurrentHashMap object AkkaExtensionSwap { - def swap(system: ActorSystem, key: ExtensionId[_], value: Kamon.Extension): Unit = { + def swap(system: ActorSystem, key: ExtensionId[_], value: Extension): Unit = { val extensionsField = system.getClass.getDeclaredField("extensions") extensionsField.setAccessible(true) |