From 2f05b3b4823f98a94de5c4b49fb5efeb0f2b0e2d Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Thu, 5 Apr 2018 21:20:34 +0200 Subject: do not encode ParentID on B3 headers if not present, fixes kamon-io/kamon-akka-http#35 --- kamon-core/src/main/scala/kamon/trace/SpanCodec.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'kamon-core/src/main/scala/kamon') diff --git a/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala b/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala index ae78ee67..093257c0 100644 --- a/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala +++ b/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala @@ -37,7 +37,9 @@ object SpanCodec { val spanContext = span.context() carrier.put(Headers.TraceIdentifier, urlEncode(spanContext.traceID.string)) carrier.put(Headers.SpanIdentifier, urlEncode(spanContext.spanID.string)) - carrier.put(Headers.ParentSpanIdentifier, urlEncode(spanContext.parentID.string)) + + if(spanContext.parentID != IdentityProvider.NoIdentifier) + carrier.put(Headers.ParentSpanIdentifier, urlEncode(spanContext.parentID.string)) encodeSamplingDecision(spanContext.samplingDecision).foreach { samplingDecision => carrier.put(Headers.Sampled, samplingDecision) -- cgit v1.2.3