aboutsummaryrefslogtreecommitdiff
path: root/kamon-scala/src/main
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2015-02-15 11:16:21 +0100
committerIvan Topolnjak <ivantopo@gmail.com>2015-02-15 11:16:21 +0100
commitcd300053cfec39dc75c1ea47b08ab5c78fe3f4bb (patch)
tree0f07e794e6fb88e180913a10f57ffaa4e2fa03cc /kamon-scala/src/main
parent8a532fc8c95a5700721248b6b4f558d9a1dcebcb (diff)
downloadKamon-cd300053cfec39dc75c1ea47b08ab5c78fe3f4bb.tar.gz
Kamon-cd300053cfec39dc75c1ea47b08ab5c78fe3f4bb.tar.bz2
Kamon-cd300053cfec39dc75c1ea47b08ab5c78fe3f4bb.zip
! core: move the TraceContext manipulation API to the Tracer companion object.
Diffstat (limited to 'kamon-scala/src/main')
-rw-r--r--kamon-scala/src/main/scala/kamon/scala/instrumentation/FutureInstrumentation.scala4
-rw-r--r--kamon-scala/src/main/scala/kamon/scalaz/instrumentation/FutureInstrumentation.scala4
2 files changed, 4 insertions, 4 deletions
diff --git a/kamon-scala/src/main/scala/kamon/scala/instrumentation/FutureInstrumentation.scala b/kamon-scala/src/main/scala/kamon/scala/instrumentation/FutureInstrumentation.scala
index 01514869..18ca58be 100644
--- a/kamon-scala/src/main/scala/kamon/scala/instrumentation/FutureInstrumentation.scala
+++ b/kamon-scala/src/main/scala/kamon/scala/instrumentation/FutureInstrumentation.scala
@@ -16,7 +16,7 @@
package kamon.scala.instrumentation
-import kamon.trace.{ TraceContext, TraceContextAware }
+import kamon.trace.{ Tracer, TraceContextAware }
import org.aspectj.lang.ProceedingJoinPoint
import org.aspectj.lang.annotation._
@@ -40,7 +40,7 @@ class FutureInstrumentation {
@Around("futureRelatedRunnableExecution(runnable)")
def aroundExecution(pjp: ProceedingJoinPoint, runnable: TraceContextAware): Any = {
- TraceContext.withContext(runnable.traceContext) {
+ Tracer.withContext(runnable.traceContext) {
pjp.proceed()
}
}
diff --git a/kamon-scala/src/main/scala/kamon/scalaz/instrumentation/FutureInstrumentation.scala b/kamon-scala/src/main/scala/kamon/scalaz/instrumentation/FutureInstrumentation.scala
index b5aadbd3..862d7fdd 100644
--- a/kamon-scala/src/main/scala/kamon/scalaz/instrumentation/FutureInstrumentation.scala
+++ b/kamon-scala/src/main/scala/kamon/scalaz/instrumentation/FutureInstrumentation.scala
@@ -16,7 +16,7 @@
package kamon.scalaz.instrumentation
-import kamon.trace.{ TraceContext, TraceContextAware }
+import kamon.trace.{ Tracer, TraceContextAware }
import org.aspectj.lang.ProceedingJoinPoint
import org.aspectj.lang.annotation._
@@ -40,7 +40,7 @@ class FutureInstrumentation {
@Around("futureRelatedCallableExecution(callable)")
def aroundExecution(pjp: ProceedingJoinPoint, callable: TraceContextAware): Any =
- TraceContext.withContext(callable.traceContext) {
+ Tracer.withContext(callable.traceContext) {
pjp.proceed()
}