From cf89b27d7937af64abd8741398b0aa982312cef8 Mon Sep 17 00:00:00 2001 From: Lukasz Stefaniak Date: Fri, 1 Jun 2018 15:59:24 +0100 Subject: Use spanIdGenerator for decoding spans in SpanCodec.Colfer Right now `traceIdGenerator` is used for all decoding, which causes problems when `traceId` and `spanId` are in different format. This works fine in `SpanCodec.B3` so is probably a mistake. --- kamon-core/src/main/scala/kamon/trace/SpanCodec.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala b/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala index 093257c0..14b28d54 100644 --- a/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala +++ b/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala @@ -137,8 +137,8 @@ object SpanCodec { val spanContext = SpanContext( traceID = identityProvider.traceIdGenerator().from(colferSpan.traceID), - spanID = identityProvider.traceIdGenerator().from(colferSpan.spanID), - parentID = identityProvider.traceIdGenerator().from(colferSpan.parentID), + spanID = identityProvider.spanIdGenerator().from(colferSpan.spanID), + parentID = identityProvider.spanIdGenerator().from(colferSpan.parentID), samplingDecision = byteToSamplingDecision(colferSpan.samplingDecision) ) @@ -165,4 +165,4 @@ object SpanCodec { override def initialValue(): Array[Byte] = Array.ofDim[Byte](256) } } -} \ No newline at end of file +} -- cgit v1.2.3