aboutsummaryrefslogtreecommitdiff
path: root/kamon-akka-remote/src
diff options
context:
space:
mode:
Diffstat (limited to 'kamon-akka-remote/src')
-rw-r--r--kamon-akka-remote/src/main/scala/kamon/instrumentation/akka/RemotingInstrumentation.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/kamon-akka-remote/src/main/scala/kamon/instrumentation/akka/RemotingInstrumentation.scala b/kamon-akka-remote/src/main/scala/kamon/instrumentation/akka/RemotingInstrumentation.scala
index 560008cf..6bdee063 100644
--- a/kamon-akka-remote/src/main/scala/kamon/instrumentation/akka/RemotingInstrumentation.scala
+++ b/kamon-akka-remote/src/main/scala/kamon/instrumentation/akka/RemotingInstrumentation.scala
@@ -5,6 +5,7 @@ import akka.remote.instrumentation.TraceContextAwareWireFormats.{ TraceContextAw
import akka.remote.{ RemoteActorRefProvider, Ack, SeqNo }
import akka.remote.WireFormats._
import akka.util.ByteString
+import kamon.MilliTimestamp
import kamon.trace.TraceRecorder
import org.aspectj.lang.ProceedingJoinPoint
import org.aspectj.lang.annotation._
@@ -33,7 +34,7 @@ class RemotingInstrumentation {
// Attach the TraceContext info, if available.
if (!TraceRecorder.currentContext.isEmpty) {
val context = TraceRecorder.currentContext
- val relativeStartMilliTime = System.currentTimeMillis - ((System.nanoTime - context.nanoTimestamp) / 1000000)
+ val relativeStartMilliTime = System.currentTimeMillis - ((System.nanoTime - context.startRelativeTimestamp.nanos) / 1000000)
envelopeBuilder.setTraceContext(RemoteTraceContext.newBuilder()
.setTraceName(context.name)
@@ -87,7 +88,7 @@ class RemotingInstrumentation {
val ctx = TraceRecorder.joinRemoteTraceContext(
remoteTraceContext.getTraceName(),
remoteTraceContext.getTraceToken(),
- remoteTraceContext.getStartMilliTime(),
+ new MilliTimestamp(remoteTraceContext.getStartMilliTime()),
remoteTraceContext.getIsOpen(),
system)