diff options
author | Diego <diegolparra@gmail.com> | 2015-11-25 00:28:31 -0300 |
---|---|---|
committer | Diego <diegolparra@gmail.com> | 2015-11-25 00:28:31 -0300 |
commit | a49f4138630a459ca7bf7309f114cdfcbbda2598 (patch) | |
tree | 232ddb7c57b354c032d22379763d0100917aba37 /kamon-akka-remote/src/main | |
parent | 5a26b2a6d14e97198c2a5251415493fb250330fc (diff) | |
download | Kamon-a49f4138630a459ca7bf7309f114cdfcbbda2598.tar.gz Kamon-a49f4138630a459ca7bf7309f114cdfcbbda2598.tar.bz2 Kamon-a49f4138630a459ca7bf7309f114cdfcbbda2598.zip |
! core: Decoupling basic apis from reporters in order to improve Kamon tooling for tests
Diffstat (limited to 'kamon-akka-remote/src/main')
-rw-r--r-- | kamon-akka-remote/src/main/scala/kamon/akka/instrumentation/RemotingInstrumentation.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kamon-akka-remote/src/main/scala/kamon/akka/instrumentation/RemotingInstrumentation.scala b/kamon-akka-remote/src/main/scala/kamon/akka/instrumentation/RemotingInstrumentation.scala index 7564cfd0..a0940c10 100644 --- a/kamon-akka-remote/src/main/scala/kamon/akka/instrumentation/RemotingInstrumentation.scala +++ b/kamon-akka-remote/src/main/scala/kamon/akka/instrumentation/RemotingInstrumentation.scala @@ -1,12 +1,12 @@ package akka.kamon.instrumentation import akka.actor.{ ActorRef, Address } -import akka.remote.instrumentation.TraceContextAwareWireFormats.{ TraceContextAwareRemoteEnvelope, RemoteTraceContext, AckAndTraceContextAwareEnvelopeContainer } -import akka.remote.{ RemoteActorRefProvider, Ack, SeqNo } import akka.remote.WireFormats._ +import akka.remote.instrumentation.TraceContextAwareWireFormats.{ AckAndTraceContextAwareEnvelopeContainer, RemoteTraceContext, TraceContextAwareRemoteEnvelope } +import akka.remote.{ Ack, RemoteActorRefProvider, SeqNo } import akka.util.ByteString import kamon.Kamon -import kamon.trace.{ Tracer, TraceContext } +import kamon.trace.Tracer import kamon.util.MilliTimestamp import org.aspectj.lang.ProceedingJoinPoint import org.aspectj.lang.annotation._ @@ -71,7 +71,7 @@ class RemotingInstrumentation { .setSystem(system) .setProtocol(protocol) .build() - case _ ⇒ throw new IllegalArgumentException(s"Address [${address}] could not be serialized: host or port missing.") + case _ ⇒ throw new IllegalArgumentException(s"Address [$address] could not be serialized: host or port missing.") } @Pointcut("execution(* akka.remote.transport.AkkaPduProtobufCodec$.decodeMessage(..)) && args(bs, provider, localAddress)") @@ -89,7 +89,7 @@ class RemotingInstrumentation { val ctx = tracer.newContext( remoteTraceContext.getTraceName, Option(remoteTraceContext.getTraceToken), - new MilliTimestamp(remoteTraceContext.getStartMilliTime()).toRelativeNanoTimestamp, + new MilliTimestamp(remoteTraceContext.getStartMilliTime).toRelativeNanoTimestamp, remoteTraceContext.getIsOpen, isLocal = false) |