diff options
Diffstat (limited to 'kamon-core/src/main/scala/kamon/trace')
-rw-r--r-- | kamon-core/src/main/scala/kamon/trace/Span.scala | 4 | ||||
-rw-r--r-- | kamon-core/src/main/scala/kamon/trace/SpanCodec.scala | 55 | ||||
-rw-r--r-- | kamon-core/src/main/scala/kamon/trace/SpanCustomizer.scala | 4 |
3 files changed, 31 insertions, 32 deletions
diff --git a/kamon-core/src/main/scala/kamon/trace/Span.scala b/kamon-core/src/main/scala/kamon/trace/Span.scala index 43391af7..6015e350 100644 --- a/kamon-core/src/main/scala/kamon/trace/Span.scala +++ b/kamon-core/src/main/scala/kamon/trace/Span.scala @@ -19,7 +19,7 @@ package trace import java.time.Instant import kamon.ReporterRegistry.SpanSink -import kamon.context.Key +import kamon.context.Context import kamon.metric.MeasurementUnit import kamon.trace.SpanContext.SamplingDecision import kamon.util.Clock @@ -66,7 +66,7 @@ sealed abstract class Span { object Span { - val ContextKey = Key.broadcast[Span]("span", Span.Empty) + val ContextKey = Context.key[Span]("span", Span.Empty) object Empty extends Span { override val context: SpanContext = SpanContext.EmptySpanContext diff --git a/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala b/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala index 14b28d54..7d707c9f 100644 --- a/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala +++ b/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala @@ -19,54 +19,35 @@ import java.net.{URLDecoder, URLEncoder} import java.nio.ByteBuffer import kamon.Kamon -import kamon.context.{Codecs, Context, TextMap} +import kamon.context.{Codecs, Context, HttpPropagation, TextMap} import kamon.context.generated.binary.span.{Span => ColferSpan} +import kamon.context.HttpPropagation.Direction import kamon.trace.SpanContext.SamplingDecision object SpanCodec { - class B3 extends Codecs.ForEntry[TextMap] { + class B3 extends HttpPropagation.EntryReader with HttpPropagation.EntryWriter { import B3.Headers - override def encode(context: Context): TextMap = { - val span = context.get(Span.ContextKey) - val carrier = TextMap.Default() - - if(span.nonEmpty()) { - val spanContext = span.context() - carrier.put(Headers.TraceIdentifier, urlEncode(spanContext.traceID.string)) - carrier.put(Headers.SpanIdentifier, urlEncode(spanContext.spanID.string)) - - if(spanContext.parentID != IdentityProvider.NoIdentifier) - carrier.put(Headers.ParentSpanIdentifier, urlEncode(spanContext.parentID.string)) - - encodeSamplingDecision(spanContext.samplingDecision).foreach { samplingDecision => - carrier.put(Headers.Sampled, samplingDecision) - } - } - - carrier - } - - override def decode(carrier: TextMap, context: Context): Context = { + override def read(reader: HttpPropagation.HeaderReader, context: Context): Context = { val identityProvider = Kamon.tracer.identityProvider - val traceID = carrier.get(Headers.TraceIdentifier) + val traceID = reader.read(Headers.TraceIdentifier) .map(id => identityProvider.traceIdGenerator().from(urlDecode(id))) .getOrElse(IdentityProvider.NoIdentifier) - val spanID = carrier.get(Headers.SpanIdentifier) + val spanID = reader.read(Headers.SpanIdentifier) .map(id => identityProvider.spanIdGenerator().from(urlDecode(id))) .getOrElse(IdentityProvider.NoIdentifier) if(traceID != IdentityProvider.NoIdentifier && spanID != IdentityProvider.NoIdentifier) { - val parentID = carrier.get(Headers.ParentSpanIdentifier) + val parentID = reader.read(Headers.ParentSpanIdentifier) .map(id => identityProvider.spanIdGenerator().from(urlDecode(id))) .getOrElse(IdentityProvider.NoIdentifier) - val flags = carrier.get(Headers.Flags) + val flags = reader.read(Headers.Flags) - val samplingDecision = flags.orElse(carrier.get(Headers.Sampled)) match { + val samplingDecision = flags.orElse(reader.read(Headers.Sampled)) match { case Some(sampled) if sampled == "1" => SamplingDecision.Sample case Some(sampled) if sampled == "0" => SamplingDecision.DoNotSample case _ => SamplingDecision.Unknown @@ -77,6 +58,24 @@ object SpanCodec { } else context } + + override def write(context: Context, writer: HttpPropagation.HeaderWriter, direction: Direction.Write): Unit = { + val span = context.get(Span.ContextKey) + + if(span.nonEmpty()) { + val spanContext = span.context() + writer.write(Headers.TraceIdentifier, urlEncode(spanContext.traceID.string)) + writer.write(Headers.SpanIdentifier, urlEncode(spanContext.spanID.string)) + + if(spanContext.parentID != IdentityProvider.NoIdentifier) + writer.write(Headers.ParentSpanIdentifier, urlEncode(spanContext.parentID.string)) + + encodeSamplingDecision(spanContext.samplingDecision).foreach { samplingDecision => + writer.write(Headers.Sampled, samplingDecision) + } + } + } + private def encodeSamplingDecision(samplingDecision: SamplingDecision): Option[String] = samplingDecision match { case SamplingDecision.Sample => Some("1") case SamplingDecision.DoNotSample => Some("0") diff --git a/kamon-core/src/main/scala/kamon/trace/SpanCustomizer.scala b/kamon-core/src/main/scala/kamon/trace/SpanCustomizer.scala index 2a8e2271..ed329ef7 100644 --- a/kamon-core/src/main/scala/kamon/trace/SpanCustomizer.scala +++ b/kamon-core/src/main/scala/kamon/trace/SpanCustomizer.scala @@ -15,7 +15,7 @@ package kamon.trace -import kamon.context.Key +import kamon.context.{Context} import kamon.trace.Tracer.SpanBuilder /** @@ -39,7 +39,7 @@ object SpanCustomizer { override def customize(spanBuilder: SpanBuilder): SpanBuilder = spanBuilder } - val ContextKey = Key.local[SpanCustomizer]("span-customizer", Noop) + val ContextKey = Context.key[SpanCustomizer]("span-customizer", Noop) def forOperationName(operationName: String): SpanCustomizer = new SpanCustomizer { override def customize(spanBuilder: SpanBuilder): SpanBuilder = |