Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tracing] Improve unit tests to assert baggage values when using multiple propagators #6471

Merged
merged 10 commits into from
Jan 2, 2025
Merged

[Tracing] Improve unit tests to assert baggage values when using multiple propagators #6471

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
80e9f3a
SpanLink API Update: Remove DecoratedSpan property so that we only op…
zacharycmontoya Nov 22, 2024
342b5fc
Update Span.AddSpanLink API to accept a SpanLink instead of a Span. T…
zacharycmontoya Nov 20, 2024
274ca46
Updates to make the SpanLink API more similar to the Activity API:
zacharycmontoya Nov 22, 2024
56fbd23
Add small doc comment for new Span return
zacharycmontoya Nov 22, 2024
f5451ff
Delete SpanLink constructor that accepts a Span
zacharycmontoya Dec 3, 2024
57db143
Re-organize unit tests somewhat
zacharycmontoya Dec 3, 2024
0ac1b57
Standalone: Improve unit tests to assert baggage values when using mu…
zacharycmontoya Dec 19, 2024
6b8c817
Merge branch 'master' into zach.montoya/update-unit-tests-baggage
zacharycmontoya Dec 20, 2024
8bd77bb
Merge branch 'master' into zach.montoya/update-unit-tests-baggage
zacharycmontoya Jan 2, 2025
a998790
Merge branch 'master' into zach.montoya/update-unit-tests-baggage
zacharycmontoya Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions tracer/test/Datadog.Trace.Tests/Propagators/MultiSpanContextPropagatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ static MultiSpanContextPropagatorTests()
ContextPropagationHeaderStyle.Datadog,
ContextPropagationHeaderStyle.B3MultipleHeaders,
ContextPropagationHeaderStyle.B3SingleHeader,
ContextPropagationHeaderStyle.W3CBaggage,
};

Propagator = SpanContextPropagatorFactory.GetSpanContextPropagator(names, names, propagationExtractFirst: true);
Expand All @@ -62,11 +63,13 @@ static MultiSpanContextPropagatorTests()
{
ContextPropagationHeaderStyle.W3CTraceContext,
ContextPropagationHeaderStyle.Datadog,
ContextPropagationHeaderStyle.W3CBaggage,
},
new[]
{
ContextPropagationHeaderStyle.W3CTraceContext,
ContextPropagationHeaderStyle.Datadog,
ContextPropagationHeaderStyle.W3CBaggage,
},
propagationExtractFirst: true);

Expand All @@ -76,11 +79,13 @@ static MultiSpanContextPropagatorTests()
{
ContextPropagationHeaderStyle.Datadog,
ContextPropagationHeaderStyle.W3CTraceContext,
ContextPropagationHeaderStyle.W3CBaggage,
},
new[]
{
ContextPropagationHeaderStyle.Datadog,
ContextPropagationHeaderStyle.W3CTraceContext,
ContextPropagationHeaderStyle.W3CBaggage,
},
propagationExtractFirst: true);

Expand All @@ -90,11 +95,13 @@ static MultiSpanContextPropagatorTests()
{
ContextPropagationHeaderStyle.W3CTraceContext,
ContextPropagationHeaderStyle.Datadog,
ContextPropagationHeaderStyle.W3CBaggage,
},
new[]
{
ContextPropagationHeaderStyle.W3CTraceContext,
ContextPropagationHeaderStyle.Datadog,
ContextPropagationHeaderStyle.W3CBaggage,
},
propagationExtractFirst: false);

Expand All @@ -104,11 +111,13 @@ static MultiSpanContextPropagatorTests()
{
ContextPropagationHeaderStyle.Datadog,
ContextPropagationHeaderStyle.W3CTraceContext,
ContextPropagationHeaderStyle.W3CBaggage,
},
new[]
{
ContextPropagationHeaderStyle.Datadog,
ContextPropagationHeaderStyle.W3CTraceContext,
ContextPropagationHeaderStyle.W3CBaggage,
},
false);

Expand All @@ -118,11 +127,13 @@ static MultiSpanContextPropagatorTests()
{
ContextPropagationHeaderStyle.Datadog,
ContextPropagationHeaderStyle.B3MultipleHeaders,
ContextPropagationHeaderStyle.W3CBaggage,
},
new[]
{
ContextPropagationHeaderStyle.Datadog,
ContextPropagationHeaderStyle.B3MultipleHeaders,
ContextPropagationHeaderStyle.W3CBaggage,
},
propagationExtractFirst: false);

Expand All @@ -132,11 +143,13 @@ static MultiSpanContextPropagatorTests()
{
ContextPropagationHeaderStyle.B3MultipleHeaders,
ContextPropagationHeaderStyle.W3CTraceContext,
ContextPropagationHeaderStyle.W3CBaggage,
},
new[]
{
ContextPropagationHeaderStyle.B3MultipleHeaders,
ContextPropagationHeaderStyle.W3CTraceContext,
ContextPropagationHeaderStyle.W3CBaggage,
},
propagationExtractFirst: false);

Expand Down Expand Up @@ -181,6 +194,8 @@ public void Inject_All_IHeadersCollection()
headers.Verify(h => h.Set("traceparent", "00-000000000000000000000000075bcd15-000000003ade68b1-01"), Times.Once());
headers.Verify(h => h.Set("tracestate", "dd=s:2;o:rum;p:000000003ade68b1;t.key1:value1;t.key2:value2"), Times.Once());

headers.Verify(h => h.Set("baggage", "key1=value1,key2=value2"), Times.Once());

headers.VerifyNoOtherCalls();
}

Expand Down Expand Up @@ -223,6 +238,8 @@ public void Inject_All_IHeadersCollection_128Bit_TraceId()
headers.Verify(h => h.Set("traceparent", "00-1234567890abcdef1122334455667788-0000000000000001-01"), Times.Once());
headers.Verify(h => h.Set("tracestate", "dd=s:2;o:rum;p:0000000000000001;t.key1:value1;t.key2:value2"), Times.Once());

headers.Verify(h => h.Set("baggage", "key1=value1,key2=value2"), Times.Once());

headers.VerifyNoOtherCalls();
}

Expand Down Expand Up @@ -264,6 +281,7 @@ public void Inject_All_CarrierAndDelegate()
headers.Verify(h => h.Set("traceparent", "00-000000000000000000000000075bcd15-000000003ade68b1-01"), Times.Once());
headers.Verify(h => h.Set("tracestate", "dd=s:2;o:rum;p:000000003ade68b1;t.key1:value1;t.key2:value2"), Times.Once());

headers.Verify(h => h.Set("baggage", "key1=value1,key2=value2"), Times.Once());
headers.VerifyNoOtherCalls();
}

Expand Down Expand Up @@ -309,6 +327,8 @@ public void Inject_All_CarrierAndDelegate_128Bit_TraceId()
headers.Verify(h => h.Set("traceparent", "00-1234567890abcdef1122334455667788-0000000000000001-01"), Times.Once());
headers.Verify(h => h.Set("tracestate", "dd=s:2;o:rum;p:0000000000000001;t.key1:value1;t.key2:value2"), Times.Once());

headers.Verify(h => h.Set("baggage", "key1=value1,key2=value2"), Times.Once());

headers.VerifyNoOtherCalls();
}

Expand Down Expand Up @@ -420,7 +440,7 @@ public void Extract_W3C_IHeadersCollection_traceparent()
[Fact]
public void Extract_W3C_IHeadersCollection_traceparent_tracestate()
{
var headers = new Mock<IHeadersCollection>(MockBehavior.Strict);
var headers = new Mock<IHeadersCollection>();

headers.Setup(h => h.GetValues("traceparent"))
.Returns(new[] { "00-000000000000000000000000075bcd15-000000003ade68b1-01" });
Expand All @@ -432,7 +452,7 @@ public void Extract_W3C_IHeadersCollection_traceparent_tracestate()

headers.Verify(h => h.GetValues("traceparent"), Times.Once());
headers.Verify(h => h.GetValues("tracestate"), Times.Once());
headers.VerifyNoOtherCalls();
headers.Verify(h => h.GetValues("baggage"), Times.Once());

result.SpanContext
.Should()
Expand Down Expand Up @@ -841,6 +861,8 @@ public void TraceContextPrecedence_ConsistentBehaviour_WithDifferentTraceIds(boo
.Returns(new[] { "00-11111111111111110000000000000005-000000003ade68b1-01" });
headers.Setup(h => h.GetValues("tracestate"))
.Returns(new[] { "foo=1" });
headers.Setup(h => h.GetValues("baggage"))
.Returns(new[] { "usr=customer" });
headers.Setup(h => h.GetValues("x-datadog-trace-id"))
.Returns(new[] { "3541" });
headers.Setup(h => h.GetValues("x-datadog-parent-id"))
Expand Down Expand Up @@ -881,6 +903,8 @@ public void TraceContextPrecedence_ConsistentBehaviour_WithDifferentTraceIds(boo
IsRemote = true,
LastParentId = w3CHeaderFirst ? ZeroLastParentId : null,
});

result.Baggage.Should().BeEquivalentTo(new Baggage([new KeyValuePair<string, string>("usr", "customer")]));
}

[Theory]
Expand Down
Loading