diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-07-03 14:39:10 -0300 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-07-03 14:39:10 -0300 |
commit | fc2333281acc028c79e1cfe00840666deea5a9d1 (patch) | |
tree | e81af37eb7f3edee9cffc9703740f36010c48f4a /kamon-core/src/main/resources | |
parent | 9133663dd5f34bb60cb2d431fa4852f4f339cda0 (diff) | |
parent | a3353d3e3fcb1dfab3e8f401187e236e99df2202 (diff) | |
download | Kamon-fc2333281acc028c79e1cfe00840666deea5a9d1.tar.gz Kamon-fc2333281acc028c79e1cfe00840666deea5a9d1.tar.bz2 Kamon-fc2333281acc028c79e1cfe00840666deea5a9d1.zip |
Merge branch 'wip/metrics-collection-refactor'
Conflicts:
kamon-datadog/src/test/scala/kamon/datadog/DatadogMetricSenderSpec.scala
Diffstat (limited to 'kamon-core/src/main/resources')
-rw-r--r-- | kamon-core/src/main/resources/META-INF/aop.xml | 22 | ||||
-rw-r--r-- | kamon-core/src/main/resources/reference.conf | 43 |
2 files changed, 34 insertions, 31 deletions
diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml index 3f7dd42d..e1edaed9 100644 --- a/kamon-core/src/main/resources/META-INF/aop.xml +++ b/kamon-core/src/main/resources/META-INF/aop.xml @@ -3,23 +3,23 @@ <aspectj> <aspects> <!-- Actors --> - <aspect name="akka.instrumentation.RepointableActorRefTraceContextMixin"/> - <aspect name="akka.instrumentation.SystemMessageTraceContextMixin"/> - <aspect name="akka.instrumentation.ActorSystemMessagePassingTracing"/> - <aspect name="akka.instrumentation.EnvelopeTraceContextMixin"/> - <aspect name="akka.instrumentation.ActorCellMetricsMixin"/> - <aspect name="akka.instrumentation.BehaviourInvokeTracing"/> - <aspect name="kamon.instrumentation.ActorLoggingTracing"/> + <aspect name="akka.instrumentation.TraceContextIntoRepointableActorRefMixin"/> + <aspect name="akka.instrumentation.TraceContextIntoSystemMessageMixin"/> + <aspect name="akka.instrumentation.ActorSystemMessageInstrumentation"/> + <aspect name="akka.instrumentation.TraceContextIntoEnvelopeMixin"/> + <aspect name="akka.instrumentation.ActorCellMetricsIntoActorCellMixin"/> + <aspect name="akka.instrumentation.ActorCellInstrumentation"/> + <aspect name="akka.instrumentation.ActorLoggingInstrumentation"/> <!-- Dispatchers --> - <aspect name="akka.instrumentation.DispatcherTracing"/> - <aspect name="akka.instrumentation.DispatcherMetricsMixin"/> + <aspect name="akka.instrumentation.DispatcherInstrumentation"/> + <aspect name="akka.instrumentation.DispatcherMetricCollectionInfoIntoDispatcherMixin"/> <!-- Futures --> - <aspect name="kamon.instrumentation.FutureTracing"/> + <aspect name="kamon.instrumentation.scala.FutureInstrumentation"/> <!-- Patterns --> - <aspect name="akka.instrumentation.AskPatternTracing"/> + <aspect name="akka.instrumentation.AskPatternInstrumentation"/> </aspects> <weaver options="-XmessageHandlerClass:kamon.weaver.logging.KamonWeaverMessageHandler"> diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf index d2830892..b7f5c70e 100644 --- a/kamon-core/src/main/resources/reference.conf +++ b/kamon-core/src/main/resources/reference.conf @@ -48,30 +48,33 @@ kamon { ] precision { + default-histogram-precision { + highest-trackable-value = 3600000000000 + significant-value-digits = 2 + } + + default-min-max-counter-precision { + refresh-interval = 100 milliseconds + highest-trackable-value = 999999999 + significant-value-digits = 2 + } + + default-gauge-precision { + refresh-interval = 100 milliseconds + highest-trackable-value = 999999999 + significant-value-digits = 2 + } + + actor { - processing-time { - highest-trackable-value = 3600000000000 - significant-value-digits = 2 - } - time-in-mailbox { - highest-trackable-value = 3600000000000 - significant-value-digits = 2 - } - mailbox-size { - highest-trackable-value = 999999999 - significant-value-digits = 2 - } + processing-time = ${kamon.metrics.precision.default-histogram-precision} + time-in-mailbox = ${kamon.metrics.precision.default-histogram-precision} + mailbox-size = ${kamon.metrics.precision.default-min-max-counter-precision} } trace { - elapsed-time { - highest-trackable-value = 3600000000000 - significant-value-digits = 2 - } - segment { - highest-trackable-value = 3600000000000 - significant-value-digits = 2 - } + elapsed-time = ${kamon.metrics.precision.default-histogram-precision} + segment = ${kamon.metrics.precision.default-histogram-precision} } dispatcher { |