diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-13 01:40:00 +0100 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-13 01:40:00 +0100 |
commit | d990039c7e0a3b6a909f93dc477fc7aaf4907e42 (patch) | |
tree | b9b0baa126f63f5e0e4cd4e5283eae55620134cd | |
parent | 2f274788aa8c96eed918ef3ddb69de496d5d0346 (diff) | |
parent | 6ca527bd36b4056bff52f56e82cc02a7198ecc0f (diff) | |
download | Kamon-d990039c7e0a3b6a909f93dc477fc7aaf4907e42.tar.gz Kamon-d990039c7e0a3b6a909f93dc477fc7aaf4907e42.tar.bz2 Kamon-d990039c7e0a3b6a909f93dc477fc7aaf4907e42.zip |
Merge pull request #108 from carrot-garden/package-name-space
= core: kamon akka instrumentation name space
7 files changed, 17 insertions, 17 deletions
diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml index 3a029ace..8c7eb235 100644 --- a/kamon-core/src/main/resources/META-INF/aop.xml +++ b/kamon-core/src/main/resources/META-INF/aop.xml @@ -6,24 +6,24 @@ <aspect name="kamon.instrumentation.AspectJWeaverMissingWarning"/> <!-- Actors --> - <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"/> + <aspect name="akka.kamon.instrumentation.TraceContextIntoRepointableActorRefMixin"/> + <aspect name="akka.kamon.instrumentation.TraceContextIntoSystemMessageMixin"/> + <aspect name="akka.kamon.instrumentation.ActorSystemMessageInstrumentation"/> + <aspect name="akka.kamon.instrumentation.TraceContextIntoEnvelopeMixin"/> + <aspect name="akka.kamon.instrumentation.ActorCellMetricsIntoActorCellMixin"/> + <aspect name="akka.kamon.instrumentation.ActorCellInstrumentation"/> + <aspect name="akka.kamon.instrumentation.ActorLoggingInstrumentation"/> <!-- Dispatchers --> - <aspect name="akka.instrumentation.DispatcherInstrumentation"/> - <aspect name="akka.instrumentation.DispatcherMetricCollectionInfoIntoDispatcherMixin"/> + <aspect name="akka.kamon.instrumentation.DispatcherInstrumentation"/> + <aspect name="akka.kamon.instrumentation.DispatcherMetricCollectionInfoIntoDispatcherMixin"/> <!-- Futures --> <aspect name="kamon.instrumentation.scala.FutureInstrumentation"/> <aspect name="kamon.instrumentation.scalaz.FutureInstrumentation"/> <!-- Patterns --> - <aspect name="akka.instrumentation.AskPatternInstrumentation"/> + <aspect name="akka.kamon.instrumentation.AskPatternInstrumentation"/> </aspects> <weaver> diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala index 90928ba0..a340566d 100644 --- a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala +++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala @@ -14,7 +14,7 @@ * ========================================================================================= */ -package akka.instrumentation +package akka.kamon.instrumentation import akka.actor._ import akka.dispatch.{ Envelope, MessageDispatcher } diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala index 82b8304d..6b90a81e 100644 --- a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala +++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala @@ -14,7 +14,7 @@ * ========================================================================================= */ -package akka.instrumentation +package akka.kamon.instrumentation import kamon.trace.{ TraceContextAware, TraceRecorder } import org.aspectj.lang.ProceedingJoinPoint diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentation.scala index 7845e90d..48016876 100644 --- a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentation.scala +++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentation.scala @@ -14,7 +14,7 @@ * ========================================================================================= */ -package akka.instrumentation +package akka.kamon.instrumentation import akka.dispatch.sysmsg.EarliestFirstSystemMessageList import kamon.trace.{ TraceContextAware, TraceRecorder } diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala index 3bf13ce2..ebc204a5 100644 --- a/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala +++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala @@ -14,7 +14,7 @@ * ========================================================================================= */ -package akka.instrumentation +package akka.kamon.instrumentation import akka.actor.ActorRefProvider import akka.event.Logging.Warning diff --git a/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala index 8b3af3d6..4b1bbc4d 100644 --- a/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala +++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/DispatcherInstrumentation.scala @@ -14,14 +14,14 @@ * ========================================================================================= */ -package akka.instrumentation +package akka.kamon.instrumentation import java.lang.reflect.Method import java.util.concurrent.ThreadPoolExecutor import akka.actor.{ ActorSystemImpl, Cancellable } import akka.dispatch.{ Dispatcher, Dispatchers, ExecutorServiceDelegate, MessageDispatcher } -import akka.instrumentation.DispatcherMetricsCollector.DispatcherMetricsMeasurement +import akka.kamon.instrumentation.DispatcherMetricsCollector.DispatcherMetricsMeasurement import kamon.Kamon import kamon.metric.DispatcherMetrics.DispatcherMetricRecorder import kamon.metric.{ DispatcherMetrics, Metrics } diff --git a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala index d279423b..97bcb0cf 100644 --- a/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala @@ -17,7 +17,7 @@ package kamon.metric import java.nio.LongBuffer -import akka.instrumentation.ActorCellMetrics +import akka.kamon.instrumentation.ActorCellMetrics import kamon.Kamon import kamon.metric.ActorMetricsTestActor._ import kamon.metric.instrument.Histogram.MutableRecord |