From 3076d7b7a499d1d7d3d2bc447d989e383dbb1b40 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Wed, 19 Jul 2017 10:17:23 +0200 Subject: add tests for active span management --- kamon-core/src/test/scala/kamon/testkit/SpanInspector.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kamon-core/src/test/scala/kamon/testkit') diff --git a/kamon-core/src/test/scala/kamon/testkit/SpanInspector.scala b/kamon-core/src/test/scala/kamon/testkit/SpanInspector.scala index 3ef1012b..e00c8b26 100644 --- a/kamon-core/src/test/scala/kamon/testkit/SpanInspector.scala +++ b/kamon-core/src/test/scala/kamon/testkit/SpanInspector.scala @@ -8,7 +8,7 @@ import scala.reflect.ClassTag import scala.util.Try class SpanInspector(span: Span) { - private val (realSpan, spanData) = { + private val (realSpan, spanData) = Try { val realSpan = span match { case _: Span.Real => span case a: ActiveSpan => @@ -17,10 +17,10 @@ class SpanInspector(span: Span) { val spanData = invoke[Span.Real, FinishedSpan](realSpan, "toFinishedSpan", classOf[Long] -> Long.box(Clock.microTimestamp())) (realSpan, spanData) - } + }.getOrElse((null, null)) - def nonEmpty: Boolean = - !span.isInstanceOf[Span.Empty] + def isEmpty: Boolean = + realSpan == null def spanTag(key: String): Option[Span.TagValue] = spanData.tags.get(key) -- cgit v1.2.3