From aa4cd4da8bd5d218fafbe926f1e76dce5db44c94 Mon Sep 17 00:00:00 2001
From: Diego <diegolparra@gmail.com>
Date: Wed, 6 Aug 2014 23:13:33 -0300
Subject: ! core: use the inline variant of TraceRecorder.withTraceContext via
 macros

---
 .../scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala   | 2 +-
 .../kamon/instrumentation/akka/ActorLoggingInstrumentation.scala      | 2 +-
 .../instrumentation/akka/ActorSystemMessageInstrumentation.scala      | 4 ++--
 .../main/scala/spray/can/client/ClientRequestInstrumentation.scala    | 4 ++--
 kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

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 446bc487..235f5143 100644
--- a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala
+++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala
@@ -52,7 +52,7 @@ class ActorCellInstrumentation {
     val cellWithMetrics = cell.asInstanceOf[ActorCellMetrics]
 
     try {
-      TraceRecorder.withTraceContext(contextAndTimestamp.traceContext) {
+      TraceRecorder.withInlineTraceContextReplacement(contextAndTimestamp.traceContext) {
         pjp.proceed()
       }
     } finally {
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 ee9d442f..82b8304d 100644
--- a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala
+++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorLoggingInstrumentation.scala
@@ -40,7 +40,7 @@ class ActorLoggingInstrumentation {
 
   @Around("withMdcInvocation(logSource, logEvent, logStatement)")
   def aroundWithMdcInvocation(pjp: ProceedingJoinPoint, logSource: String, logEvent: TraceContextAware, logStatement: () ⇒ _): Unit = {
-    TraceRecorder.withTraceContext(logEvent.traceContext) {
+    TraceRecorder.withInlineTraceContextReplacement(logEvent.traceContext) {
       pjp.proceed()
     }
   }
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 9b6b6866..7845e90d 100644
--- a/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentation.scala
+++ b/kamon-core/src/main/scala/kamon/instrumentation/akka/ActorSystemMessageInstrumentation.scala
@@ -31,7 +31,7 @@ class ActorSystemMessageInstrumentation {
   def aroundSystemMessageInvoke(pjp: ProceedingJoinPoint, messages: EarliestFirstSystemMessageList): Any = {
     if (messages.nonEmpty) {
       val ctx = messages.head.asInstanceOf[TraceContextAware].traceContext
-      TraceRecorder.withTraceContext(ctx)(pjp.proceed())
+      TraceRecorder.withInlineTraceContextReplacement(ctx)(pjp.proceed())
 
     } else pjp.proceed()
   }
@@ -73,7 +73,7 @@ class TraceContextIntoRepointableActorRefMixin {
 
   @Around("repointableActorRefCreation(repointableActorRef)")
   def afterRepointableActorRefCreation(pjp: ProceedingJoinPoint, repointableActorRef: TraceContextAware): Any = {
-    TraceRecorder.withTraceContext(repointableActorRef.traceContext) {
+    TraceRecorder.withInlineTraceContextReplacement(repointableActorRef.traceContext) {
       pjp.proceed()
     }
   }
diff --git a/kamon-spray/src/main/scala/spray/can/client/ClientRequestInstrumentation.scala b/kamon-spray/src/main/scala/spray/can/client/ClientRequestInstrumentation.scala
index d787bda4..df1d2b59 100644
--- a/kamon-spray/src/main/scala/spray/can/client/ClientRequestInstrumentation.scala
+++ b/kamon-spray/src/main/scala/spray/can/client/ClientRequestInstrumentation.scala
@@ -63,7 +63,7 @@ class ClientRequestInstrumentation {
 
   @Around("copyingRequestContext(old)")
   def aroundCopyingRequestContext(pjp: ProceedingJoinPoint, old: SegmentCompletionHandleAware): Any = {
-    TraceRecorder.withTraceContext(old.traceContext) {
+    TraceRecorder.withInlineTraceContextReplacement(old.traceContext) {
       pjp.proceed()
     }
   }
@@ -75,7 +75,7 @@ class ClientRequestInstrumentation {
   def aroundDispatchToCommander(pjp: ProceedingJoinPoint, requestContext: SegmentCompletionHandleAware, message: Any) = {
     requestContext.traceContext match {
       case ctx @ Some(_) ⇒
-        TraceRecorder.withTraceContext(ctx) {
+        TraceRecorder.withInlineTraceContextReplacement(ctx) {
           if (message.isInstanceOf[HttpMessageEnd])
             requestContext.segmentCompletionHandle.map(_.finish(Map.empty))
 
diff --git a/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala b/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala
index de867035..5bfb85be 100644
--- a/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala
+++ b/kamon-testkit/src/main/scala/testkit/TestProbeInstrumentation.scala
@@ -46,7 +46,7 @@ class TestProbeInstrumentation {
       case _                ⇒ None
     }
 
-    TraceRecorder.withTraceContext(traceContext) {
+    TraceRecorder.withInlineTraceContextReplacement(traceContext) {
       pjp.proceed
     }
   }
-- 
cgit v1.2.3