From 1d0548cb8281202738d8d48cbe9cdd62cf209e21 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Mon, 19 Jun 2017 20:09:35 +0200 Subject: handle null SpanContext when building a span --- kamon-core/src/main/scala/kamon/trace/Tracer.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 = -- cgit v1.2.3