aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon/instrumentation
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
commit9133663dd5f34bb60cb2d431fa4852f4f339cda0 (patch)
tree32e7a10b0583d881c95ba9b11bf8c7d01c0bd614 /kamon-core/src/main/scala/kamon/instrumentation
parent6d7970c6dd5b96b512c846181771bb11a43bc82a (diff)
parent49945353319a2c11fa136512359738c5b854a788 (diff)
downloadKamon-9133663dd5f34bb60cb2d431fa4852f4f339cda0.tar.gz
Kamon-9133663dd5f34bb60cb2d431fa4852f4f339cda0.tar.bz2
Kamon-9133663dd5f34bb60cb2d431fa4852f4f339cda0.zip
Merge remote-tracking branch 'crypticmind/master'
Diffstat (limited to 'kamon-core/src/main/scala/kamon/instrumentation')
-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
+}