aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2017-06-19 20:09:35 +0200
committerIvan Topolnjak <ivantopo@gmail.com>2017-06-19 20:09:35 +0200
commit1d0548cb8281202738d8d48cbe9cdd62cf209e21 (patch)
tree6d133784fd968312e870e72d10152870c946409c
parent7aeeedad6f6684f8aae018fbf433557b2a587172 (diff)
downloadKamon-1d0548cb8281202738d8d48cbe9cdd62cf209e21.tar.gz
Kamon-1d0548cb8281202738d8d48cbe9cdd62cf209e21.tar.bz2
Kamon-1d0548cb8281202738d8d48cbe9cdd62cf209e21.zip
handle null SpanContext when building a span
-rw-r--r--kamon-core/src/main/scala/kamon/trace/Tracer.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/kamon-core/src/main/scala/kamon/trace/Tracer.scala b/kamon-core/src/main/scala/kamon/trace/Tracer.scala
index 3aeb968f..0c4c1c82 100644
--- a/kamon-core/src/main/scala/kamon/trace/Tracer.scala
+++ b/kamon-core/src/main/scala/kamon/trace/Tracer.scala
@@ -76,7 +76,8 @@ class Tracer(metrics: MetricLookup, reporterRegistry: ReporterRegistryImpl, init
case spanContext: kamon.trace.SpanContext =>
this.parentContext = spanContext
this
- case _ => logger.error("Can't extract the parent ID from a non-Kamon SpanContext"); this
+ case null => this
+ case _ => logger.error("Can't extract the parent ID from a non-Kamon SpanContext"); this
}
override def asChildOf(parent: io.opentracing.BaseSpan[_]): io.opentracing.Tracer.SpanBuilder =