wip

DataDog · Oct 11, 2024 · 6b5fc0d · 6b5fc0d
1 parent 9d57071
commit 6b5fc0d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/tracer/src/Datadog.Trace/SpanContextExtractor.cs b/tracer/src/Datadog.Trace/SpanContextExtractor.cs
@@ -80,7 +80,8 @@ internal SpanContextExtractor(bool unusedParamNotToUsePublicApi)
  if (messageType != null && source == null) { ThrowHelper.ThrowArgumentNullException(nameof(source)); }
  else if (messageType == null && source != null) { ThrowHelper.ThrowArgumentNullException(nameof(messageType)); }
 
- var spanContext = SpanContextPropagator.Instance.Extract(carrier, getter);
+ var context = SpanContextPropagator.Instance.Extract(carrier, getter);
+ var spanContext = context.SpanContext;
 
  if (spanContext is not null
  && Tracer.Instance.TracerManager.DataStreamsManager is { IsEnabled: true } dsm)

diff --git a/tracer/src/Datadog.Trace/SpanContextInjector.cs b/tracer/src/Datadog.Trace/SpanContextInjector.cs
@@ -74,7 +74,11 @@ internal static void InjectInternal<TCarrier>(TCarrier carrier, Action<TCarrier,
 
  if (context is SpanContext spanContext)
  {
- SpanContextPropagator.Instance.Inject(spanContext, carrier, setter);
+ // TODO: should this silently inject Baggage.Current?
+ SpanContextPropagator.Instance.Inject(
+ new PropagationContext(spanContext, baggage: null),
+ carrier,
+ setter);
 
  if (string.IsNullOrEmpty(messageType) || string.IsNullOrEmpty(target))
  {