From ddb000a4510dfce20f7090ac92ea9144403addd6 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Sat, 23 Nov 2013 21:58:28 -0300 Subject: Change withValue to withContext, seems more explicit --- kamon-trace/src/main/scala/kamon/trace/Trace.scala | 2 +- .../scala/kamon/trace/instrumentation/ActorMessagePassingTracing.scala | 2 +- .../src/main/scala/kamon/trace/instrumentation/FutureTracing.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kamon-trace/src/main') diff --git a/kamon-trace/src/main/scala/kamon/trace/Trace.scala b/kamon-trace/src/main/scala/kamon/trace/Trace.scala index fbd4ea8b..ac380cd1 100644 --- a/kamon-trace/src/main/scala/kamon/trace/Trace.scala +++ b/kamon-trace/src/main/scala/kamon/trace/Trace.scala @@ -35,7 +35,7 @@ object Trace extends ExtensionId[TraceExtension] with ExtensionIdProvider { ctx } - def withValue[T](ctx: Option[TraceContext])(thunk: => T): T = traceContext.withValue(ctx)(thunk) + def withContext[T](ctx: Option[TraceContext])(thunk: => T): T = traceContext.withValue(ctx)(thunk) def transformContext(f: TraceContext => TraceContext): Unit = { context.map(f).foreach(set(_)) diff --git a/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorMessagePassingTracing.scala b/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorMessagePassingTracing.scala index 9eb0a7f9..7c7c8b12 100644 --- a/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorMessagePassingTracing.scala +++ b/kamon-trace/src/main/scala/kamon/trace/instrumentation/ActorMessagePassingTracing.scala @@ -22,7 +22,7 @@ class BehaviourInvokeTracing { //safe cast val ctxInMessage = envelope.asInstanceOf[ContextAware].traceContext - Trace.withValue(ctxInMessage) { + Trace.withContext(ctxInMessage) { pjp.proceed() } } diff --git a/kamon-trace/src/main/scala/kamon/trace/instrumentation/FutureTracing.scala b/kamon-trace/src/main/scala/kamon/trace/instrumentation/FutureTracing.scala index 10daa2da..fe32a04c 100644 --- a/kamon-trace/src/main/scala/kamon/trace/instrumentation/FutureTracing.scala +++ b/kamon-trace/src/main/scala/kamon/trace/instrumentation/FutureTracing.scala @@ -32,7 +32,7 @@ class FutureTracing { def around(pjp: ProceedingJoinPoint, runnable: ContextAware): Any = { import pjp._ - Trace.withValue(runnable.traceContext) { + Trace.withContext(runnable.traceContext) { proceed() } } -- cgit v1.2.3