aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Stefaniak <lustefaniak@gmail.com>2018-06-01 15:59:24 +0100
committerGitHub <noreply@github.com>2018-06-01 15:59:24 +0100
commitcf89b27d7937af64abd8741398b0aa982312cef8 (patch)
tree25b3fe7b731afaf4effb0d0582b0955222c7a210
parent62e2c1bf213b9fedba850262600229f5aa0c2705 (diff)
downloadKamon-cf89b27d7937af64abd8741398b0aa982312cef8.tar.gz
Kamon-cf89b27d7937af64abd8741398b0aa982312cef8.tar.bz2
Kamon-cf89b27d7937af64abd8741398b0aa982312cef8.zip
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.
-rw-r--r--kamon-core/src/main/scala/kamon/trace/SpanCodec.scala6
1 files 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
+}