From 1b2bc32d62e5955fae291ed7daaa57b48c0de48e Mon Sep 17 00:00:00 2001 From: Ivan Topolnak Date: Fri, 24 May 2013 15:28:30 -0300 Subject: Added a simple test of futures instrumentation --- src/main/scala/kamon/TraceContext.scala | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/main/scala/kamon/TraceContext.scala') diff --git a/src/main/scala/kamon/TraceContext.scala b/src/main/scala/kamon/TraceContext.scala index 18a91145..5787167b 100644 --- a/src/main/scala/kamon/TraceContext.scala +++ b/src/main/scala/kamon/TraceContext.scala @@ -10,19 +10,15 @@ case class TraceContext(id: UUID, entries: List[TraceEntry]) { } object TraceContext { - private val context = new ThreadLocal[TraceContext] - - def current = { - val ctx = context.get() - if(ctx ne null) - Some(ctx) - else - None + private val context = new ThreadLocal[Option[TraceContext]] { + override def initialValue(): Option[TraceContext] = None } - def clear = context.remove() + def current = context.get - def set(ctx: TraceContext) = context.set(ctx) + def clear = context.remove + + def set(ctx: TraceContext) = context.set(Some(ctx)) def start = set(TraceContext(UUID.randomUUID(), Nil)) } -- cgit v1.2.3