diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-08-13 20:41:30 -0400 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-08-13 20:41:30 -0400 |
| commit | 653ceaa3de4944c7c4788577c61ce8597ce9a8ae (patch) | |
| tree | b580e2aca6dd8b68004893b66e49305e950bc1c4 /kamon-spray/src | |
| parent | f774c4736545e1584f74b87c0a7d74d2ba6a07aa (diff) | |
| parent | 79ccffe3fff870d8a9338576eff6caad7ed69992 (diff) | |
| download | Kamon-653ceaa3de4944c7c4788577c61ce8597ce9a8ae.tar.gz Kamon-653ceaa3de4944c7c4788577c61ce8597ce9a8ae.tar.bz2 Kamon-653ceaa3de4944c7c4788577c61ce8597ce9a8ae.zip | |
Merge branch 'master' into release-0.2
Conflicts:
kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala
version.sbt
Diffstat (limited to 'kamon-spray/src')
| -rw-r--r-- | kamon-spray/src/main/scala/spray/can/client/ClientRequestInstrumentation.scala | 4 |
1 files changed, 2 insertions, 2 deletions
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)) |