aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2018-04-05 21:20:34 +0200
committerIvan Topolnjak <ivantopo@gmail.com>2018-04-05 21:33:15 +0200
commit2f05b3b4823f98a94de5c4b49fb5efeb0f2b0e2d (patch)
treeb09a7ae7cb2159c285fbd0a89cb9096a7f8e03fc /kamon-core/src
parente711bb0170f0939f9054cea76da0ce09005ccef3 (diff)
downloadKamon-2f05b3b4823f98a94de5c4b49fb5efeb0f2b0e2d.tar.gz
Kamon-2f05b3b4823f98a94de5c4b49fb5efeb0f2b0e2d.tar.bz2
Kamon-2f05b3b4823f98a94de5c4b49fb5efeb0f2b0e2d.zip
do not encode ParentID on B3 headers if not present, fixes kamon-io/kamon-akka-http#35
Diffstat (limited to 'kamon-core/src')
-rw-r--r--kamon-core/src/main/scala/kamon/trace/SpanCodec.scala4
1 files changed, 3 insertions, 1 deletions
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)