fix propagator usages in tests

DataDog · Oct 21, 2024 · c2e67f9 · c2e67f9
1 parent c752bb4
commit c2e67f9
Show file tree

Hide file tree

Showing 12 changed files with 830 additions and 658 deletions.
diff --git a/....ClrProfiler.Managed.Tests/AutoInstrumentation/AWS/EventBridge/ContextPropagationTests.cs b/....ClrProfiler.Managed.Tests/AutoInstrumentation/AWS/EventBridge/ContextPropagationTests.cs
@@ -11,6 +11,7 @@
 using Amazon.EventBridge.Model;
 using Datadog.Trace.ClrProfiler.AutoInstrumentation.AWS.EventBridge;
 using Datadog.Trace.DuckTyping;
+using Datadog.Trace.Propagators;
 using Datadog.Trace.Vendors.Newtonsoft.Json;
 using FluentAssertions;
 using Xunit;
@@ -46,7 +47,7 @@ public void InjectTracingContext_EmptyDetail_AddsTraceContext()
 
         var proxy = request.DuckCast<IPutEventsRequest>();
 
-        ContextPropagation.InjectTracingContext(proxy, _spanContext);
+        ContextPropagation.InjectContext(proxy, new PropagationContext(_spanContext, baggage: null));
 
         var entries = (IList)proxy.Entries.Value!;
         entries.Count.Should().Be(1);
@@ -79,7 +80,7 @@ public void InjectTracingContext_ExistingDetail_AddsTraceContext()
 
         var proxy = request.DuckCast<IPutEventsRequest>();
 
-        ContextPropagation.InjectTracingContext(proxy, _spanContext);
+        ContextPropagation.InjectContext(proxy, new PropagationContext(_spanContext, baggage: null));
 
         var entries = (IList)proxy.Entries.Value!;
         entries.Count.Should().Be(1);
@@ -113,7 +114,7 @@ public void InjectTracingContext_NullDetail_AddsTraceContext()
 
         var proxy = request.DuckCast<IPutEventsRequest>();
 
-        ContextPropagation.InjectTracingContext(proxy, _spanContext);
+        ContextPropagation.InjectContext(proxy, new PropagationContext(_spanContext, baggage: null));
 
         var entries = (IList)proxy.Entries.Value!;
         entries.Count.Should().Be(1);
@@ -146,7 +147,7 @@ public void InjectTracingContext_InvalidDetail_DoesNotAddTraceContext()
 
         var proxy = request.DuckCast<IPutEventsRequest>();
 
-        ContextPropagation.InjectTracingContext(proxy, _spanContext);
+        ContextPropagation.InjectContext(proxy, new PropagationContext(_spanContext, baggage: null));
 
         var entries = (IList)proxy.Entries.Value!;
         entries.Count.Should().Be(1);
@@ -165,7 +166,7 @@ public void InjectTracingContext_MultipleEntries_AddsTraceContextToAll()
 
         var proxy = request.DuckCast<IPutEventsRequest>();
 
-        ContextPropagation.InjectTracingContext(proxy, _spanContext);
+        ContextPropagation.InjectContext(proxy, new PropagationContext(_spanContext, baggage: null));
 
         var entries = (IList)proxy.Entries.Value!;
         entries.Count.Should().Be(2);
@@ -201,7 +202,7 @@ public void InjectTracingContext_NullEventBusName_OmitsResourceName()
 
         var proxy = request.DuckCast<IPutEventsRequest>();
 
-        ContextPropagation.InjectTracingContext(proxy, _spanContext);
+        ContextPropagation.InjectContext(proxy, new PropagationContext(_spanContext, baggage: null));
 
         var entries = (IList)proxy.Entries.Value!;
         entries.Count.Should().Be(1);
@@ -235,7 +236,7 @@ public void InjectTracingContext_PayloadTooLarge_DoesNotAddTraceContext()
 
         var proxy = request.DuckCast<IPutEventsRequest>();
 
-        ContextPropagation.InjectTracingContext(proxy, _spanContext);
+        ContextPropagation.InjectContext(proxy, new PropagationContext(_spanContext, baggage: null));
 
         var entries = (IList)proxy.Entries.Value!;
         entries.Count.Should().Be(1);
@@ -255,7 +256,7 @@ public void InjectTracingContext_PayloadJustUnderLimit_AddsTraceContext()
 
         var proxy = request.DuckCast<IPutEventsRequest>();
 
-        ContextPropagation.InjectTracingContext(proxy, _spanContext);
+        ContextPropagation.InjectContext(proxy, new PropagationContext(_spanContext, baggage: null));
 
         var entries = (IList)proxy.Entries.Value!;
         entries.Count.Should().Be(1);

diff --git a/...race.ClrProfiler.Managed.Tests/AutoInstrumentation/AWS/Kinesis/ContextPropagationTests.cs b/...race.ClrProfiler.Managed.Tests/AutoInstrumentation/AWS/Kinesis/ContextPropagationTests.cs
@@ -10,6 +10,7 @@
 using Amazon.Kinesis.Model;
 using Datadog.Trace.ClrProfiler.AutoInstrumentation.AWS.Kinesis;
 using Datadog.Trace.DuckTyping;
+using Datadog.Trace.Propagators;
 using FluentAssertions;
 using Newtonsoft.Json;
 using Xunit;
@@ -74,7 +75,7 @@ public void InjectTraceIntoRecords_WithJsonString_AddsTraceContext()
 
         var proxy = request.DuckCast<IPutRecordsRequest>();
 
-        ContextPropagation.InjectTraceIntoRecords(proxy, _spanContext);
+        ContextPropagation.InjectTraceIntoRecords(proxy, new PropagationContext(_spanContext, baggage: null));
 
         var firstRecord = proxy.Records[0].DuckCast<IContainsData>();
 
@@ -105,7 +106,7 @@ public void InjectTraceIntoRecords_WithString_SkipsAddingTraceContext()
 
         var proxy = request.DuckCast<IPutRecordsRequest>();
 
-        ContextPropagation.InjectTraceIntoRecords(proxy, _spanContext);
+        ContextPropagation.InjectTraceIntoRecords(proxy, new PropagationContext(_spanContext, baggage: null));
 
         var firstRecord = proxy.Records[0].DuckCast<IContainsData>();
 
@@ -124,7 +125,7 @@ public void InjectTraceIntoData_WithJsonString_AddsTraceContext()
 
         var proxy = request.DuckCast<IPutRecordRequest>();
 
-        ContextPropagation.InjectTraceIntoData(proxy, _spanContext);
+        ContextPropagation.InjectTraceIntoData(proxy, new PropagationContext(_spanContext, baggage: null));
 
         // Naively deserialize in order to not use tracer extraction logic
         var jsonString = Encoding.UTF8.GetString(proxy.Data.ToArray());
@@ -155,7 +156,7 @@ public void InjectTraceIntoData_WithLargeJsonString_SkipsAddingTraceContext()
 
         var proxy = request.DuckCast<IPutRecordRequest>();
 
-        ContextPropagation.InjectTraceIntoData(proxy, _spanContext);
+        ContextPropagation.InjectTraceIntoData(proxy, new PropagationContext(_spanContext, baggage: null));
 
         var data = proxy.Data;
 

diff --git a/...og.Trace.ClrProfiler.Managed.Tests/AutoInstrumentation/AWS/SNS/ContextPropagationTests.cs b/...og.Trace.ClrProfiler.Managed.Tests/AutoInstrumentation/AWS/SNS/ContextPropagationTests.cs
@@ -10,6 +10,7 @@
 using Amazon.SimpleNotificationService.Model;
 using Datadog.Trace.ClrProfiler.AutoInstrumentation.AWS.SNS;
 using Datadog.Trace.DuckTyping;
+using Datadog.Trace.Propagators;
 using Datadog.Trace.Vendors.Newtonsoft.Json;
 using FluentAssertions;
 using Xunit;
@@ -81,7 +82,9 @@ public void InjectHeadersIntoBatch_EmptyMessageAttributes_AddsTraceContext()
 
         var proxy = request.DuckCast<IPublishBatchRequest>();
 
-        ContextPropagation.InjectHeadersIntoBatch<PublishBatchRequest, IPublishBatchRequest>(proxy, _spanContext);
+        ContextPropagation.InjectHeadersIntoBatch<PublishBatchRequest, IPublishBatchRequest>(
+            proxy,
+            new PropagationContext(_spanContext, baggage: null));
 
         for (int i = 0; i < proxy.PublishBatchRequestEntries.Count; i++)
         {
@@ -126,7 +129,9 @@ public void InjectHeadersIntoBatch_WithMessageAttributes_AddsTraceContext()
 
         var proxy = request.DuckCast<IPublishBatchRequest>();
 
-        ContextPropagation.InjectHeadersIntoBatch<PublishBatchRequest, IPublishBatchRequest>(proxy, _spanContext);
+        ContextPropagation.InjectHeadersIntoBatch<PublishBatchRequest, IPublishBatchRequest>(
+            proxy,
+            new PropagationContext(_spanContext, baggage: null));
 
         for (int i = 0; i < proxy.PublishBatchRequestEntries.Count; i++)
         {
@@ -170,7 +175,9 @@ public void InjectHeadersIntoBatch_FullMessageAttributes_SkipsAddingTraceContext
             });
 
         var proxy = request.DuckCast<IPublishBatchRequest>();
-        ContextPropagation.InjectHeadersIntoBatch<PublishBatchRequest, IPublishBatchRequest>(proxy, _spanContext);
+        ContextPropagation.InjectHeadersIntoBatch<PublishBatchRequest, IPublishBatchRequest>(
+            proxy,
+            new PropagationContext(_spanContext, baggage: null));
 
         for (int i = 0; i < proxy.PublishBatchRequestEntries.Count; i++)
         {
@@ -199,7 +206,9 @@ public void InjectHeadersIntoMessage_EmptyMessageAttributes_AddsTraceContext()
 
         var proxy = request.DuckCast<IPublishRequest>();
 
-        ContextPropagation.InjectHeadersIntoMessage<PublishRequest, IPublishRequest>(proxy, _spanContext);
+        ContextPropagation.InjectHeadersIntoMessage<PublishRequest, IPublishRequest>(
+            proxy,
+            new PropagationContext(_spanContext, baggage: null));
 
         // Hard-casting into PublishBatchRequestEntry because trace context assertion is needed
         var messageAttributes = (Dictionary<string, MessageAttributeValue>)proxy.MessageAttributes;
@@ -229,7 +238,9 @@ public void InjectHeadersIntoMessage_WithMessageAttributes_AddsTraceContext()
 
         var proxy = request.DuckCast<IPublishRequest>();
 
-        ContextPropagation.InjectHeadersIntoMessage<PublishRequest, IPublishRequest>(proxy, _spanContext);
+        ContextPropagation.InjectHeadersIntoMessage<PublishRequest, IPublishRequest>(
+            proxy,
+            new PropagationContext(_spanContext, baggage: null));
 
         // Hard-casting into PublishBatchRequestEntry because trace context assertion is needed
         var messageAttributes = (Dictionary<string, MessageAttributeValue>)proxy.MessageAttributes;
@@ -259,7 +270,9 @@ public void InjectHeadersIntoMessage_FullMessageAttributes_AddsTraceContext()
 
         var proxy = request.DuckCast<IPublishRequest>();
 
-        ContextPropagation.InjectHeadersIntoMessage<PublishRequest, IPublishRequest>(proxy, _spanContext);
+        ContextPropagation.InjectHeadersIntoMessage<PublishRequest, IPublishRequest>(
+            proxy,
+            new PropagationContext(_spanContext, baggage: null));
 
         // Hard-casting into PublishBatchRequestEntry because trace context assertion is needed
         var messageAttributes = (Dictionary<string, MessageAttributeValue>)proxy.MessageAttributes;

diff --git a/tracer/test/Datadog.Trace.IntegrationTests/Sampling/DelaySamplingDecisionTests.cs b/tracer/test/Datadog.Trace.IntegrationTests/Sampling/DelaySamplingDecisionTests.cs
@@ -77,7 +77,9 @@ public void SamplingDecisionIsMadeWhenPropagating()
             traceContext.SamplingPriority.Should().BeNull();
 
             var headers = new NameValueCollection();
-            SpanContextPropagator.Instance.Inject(scope1.Span.Context, headers.Wrap());
+            SpanContextPropagator.Instance.Inject(
+                new PropagationContext(scope1.Span.Context, baggage: null),
+                headers.Wrap());
 
             // sampling decision IS taken before propagating
             sampler.Verify(s => s.MakeSamplingDecision(It.IsAny<Span>()), Times.Once);

diff --git a/tracer/test/Datadog.Trace.Tests/DistributedTracer/AutomaticTracerTests.cs b/tracer/test/Datadog.Trace.Tests/DistributedTracer/AutomaticTracerTests.cs
@@ -89,7 +89,8 @@ public void GetDistributedTrace()
 
             using (var scope = Tracer.Instance.StartActive("Test"))
             {
-                var spanContext = SpanContextPropagator.Instance.Extract(automaticTracer.GetDistributedTrace());
+                var context = SpanContextPropagator.Instance.Extract(automaticTracer.GetDistributedTrace());
+                var spanContext = context.SpanContext!;
 
                 spanContext.Should().NotBeNull();
                 spanContext.TraceId128.Should().Be(((Scope)scope).Span.TraceId128);