aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2014-07-03 13:48:24 -0300
committerIvan Topolnjak <ivantopo@gmail.com>2014-07-03 13:48:24 -0300
commitb0df3654cb82d87971fa67ff56a2e183dc93358f (patch)
treec2ab91b00751c4967ce3aa066c1428a70eb514cf /kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala
parent8bf93c1f26453ef298d965aaa8b9cb932f8b2a64 (diff)
parent69dbbb558737f482a1003fe35b19da7e8bd35309 (diff)
downloadKamon-b0df3654cb82d87971fa67ff56a2e183dc93358f.tar.gz
Kamon-b0df3654cb82d87971fa67ff56a2e183dc93358f.tar.bz2
Kamon-b0df3654cb82d87971fa67ff56a2e183dc93358f.zip
Merge remote-tracking branch 'crypticmind/master'
Diffstat (limited to 'kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala')
-rw-r--r--kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala b/kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala
index 634c94a1..b9424579 100644
--- a/kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala
+++ b/kamon-core/src/main/scala/kamon/instrumentation/FutureTracing.scala
@@ -39,9 +39,9 @@ class FutureTracing {
@Around("futureRelatedRunnableExecution(runnable)")
def aroundExecution(pjp: ProceedingJoinPoint, runnable: TraceContextAware): Any = {
- TraceRecorder.withTraceContext(runnable.traceContext) {
+ TraceRecorder.withInlineTraceContextReplacement(runnable.traceContext) {
pjp.proceed()
}
}
-} \ No newline at end of file
+}