diff options
Diffstat (limited to 'kamon-core/src/main/resources')
-rw-r--r-- | kamon-core/src/main/resources/META-INF/aop_remove_when_possible.xml (renamed from kamon-core/src/main/resources/META-INF/aop.xml) | 6 | ||||
-rw-r--r-- | kamon-core/src/main/resources/logback.xml | 12 | ||||
-rw-r--r-- | kamon-core/src/main/resources/reference.conf | 11 |
3 files changed, 3 insertions, 26 deletions
diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop_remove_when_possible.xml index c63e17e5..207bf1b9 100644 --- a/kamon-core/src/main/resources/META-INF/aop.xml +++ b/kamon-core/src/main/resources/META-INF/aop_remove_when_possible.xml @@ -7,14 +7,14 @@ <aspects> - <aspect name="kamon.instrumentation.EnvelopeTracingContext"/> - <aspect name="kamon.instrumentation.ActorCellInvokeInstrumentation"/> + <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.instrumentation.ActorLoggingInstrumentation"/> + <aspect name="kamon.trace.instrumentation.ActorLoggingInstrumentation"/> <!--<aspect name="kamon.instrumentation.MessageQueueInstrumentation" />--> <!--<aspect name="kamon.instrumentation.InceptionAspect"/>--> diff --git a/kamon-core/src/main/resources/logback.xml b/kamon-core/src/main/resources/logback.xml deleted file mode 100644 index 2ae1e3bd..00000000 --- a/kamon-core/src/main/resources/logback.xml +++ /dev/null @@ -1,12 +0,0 @@ -<configuration scan="true"> - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>%date{HH:mm:ss.SSS} %-5level [%X{uow}][%X{requestId}] [%thread] %logger{55} - %msg%n</pattern> - </encoder> - </appender> - - <root level="debug"> - <appender-ref ref="STDOUT" /> - </root> - -</configuration> diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf deleted file mode 100644 index 29532595..00000000 --- a/kamon-core/src/main/resources/reference.conf +++ /dev/null @@ -1,11 +0,0 @@ -akka { - loggers = ["kamon.newrelic.NewRelicErrorLogger", "akka.event.slf4j.Slf4jLogger"] -} - - - - - - - - |