diff options
| author | Ivan Topolnak <itopolnak@despegar.com> | 2014-01-13 17:56:51 -0300 |
|---|---|---|
| committer | Ivan Topolnak <itopolnak@despegar.com> | 2014-01-13 17:56:51 -0300 |
| commit | 111ea55690351d0903e9902c525c781ef2d743a8 (patch) | |
| tree | 003b0e1cf95f1d3cba55927422ff063c049a5cf9 /kamon-trace/src/main/resources | |
| parent | 571e96665bb3cb3f20fb59209be63dabbb3148f4 (diff) | |
| parent | 7a10c0ef2a6566229e8571f6d385ca2ff794cc20 (diff) | |
| download | Kamon-111ea55690351d0903e9902c525c781ef2d743a8.tar.gz Kamon-111ea55690351d0903e9902c525c781ef2d743a8.tar.bz2 Kamon-111ea55690351d0903e9902c525c781ef2d743a8.zip | |
Merge branch 'wip/trace-and-metrics-integration'
Conflicts:
kamon-newrelic/src/main/scala/kamon/newrelic/NewRelicErrorLogger.scala
Diffstat (limited to 'kamon-trace/src/main/resources')
| -rw-r--r-- | kamon-trace/src/main/resources/META-INF/aop.xml | 26 | ||||
| -rw-r--r-- | kamon-trace/src/main/resources/reference.conf | 3 |
2 files changed, 0 insertions, 29 deletions
diff --git a/kamon-trace/src/main/resources/META-INF/aop.xml b/kamon-trace/src/main/resources/META-INF/aop.xml deleted file mode 100644 index d9916724..00000000 --- a/kamon-trace/src/main/resources/META-INF/aop.xml +++ /dev/null @@ -1,26 +0,0 @@ -<!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd"> - -<aspectj> - <aspects> - <!-- Actors --> - <aspect name="akka.actor.RepointableActorRefTraceContextMixin"/> - <aspect name="akka.actor.SystemMessageTraceContextMixin"/> - <aspect name="akka.actor.ActorSystemMessagePassingTracing"/> - <aspect name="kamon.trace.instrumentation.EnvelopeTraceContextMixin"/> - <aspect name="kamon.trace.instrumentation.BehaviourInvokeTracing"/> - <aspect name="kamon.trace.instrumentation.ActorLoggingTracing"/> - - <!-- Futures --> - <aspect name="kamon.trace.instrumentation.FutureTracing"/> - - <!-- Patterns --> - <aspect name="akka.pattern.AskPatternTracing"/> - - - <include within="scala.concurrent..*"/> - <include within="akka..*"/> - <include within="spray..*"/> - <include within="kamon..*"/> - </aspects> - -</aspectj> diff --git a/kamon-trace/src/main/resources/reference.conf b/kamon-trace/src/main/resources/reference.conf deleted file mode 100644 index 03f13f01..00000000 --- a/kamon-trace/src/main/resources/reference.conf +++ /dev/null @@ -1,3 +0,0 @@ -kamon.trace { - ask-pattern-tracing = off -}
\ No newline at end of file |