Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/OpenTelemetry/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Notes](../../RELEASENOTES.md).
buffer estimate. Such content is now truncated.
([#7543](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7543))

* Fixed activity creation throwing when multiple tracer providers return a
sampler attribute with the same key.
([#7558](https://github.com/open-telemetry/opentelemetry-dotnet/pull/7558))

## 1.17.0

Released 2026-Jul-16
Expand Down
2 changes: 1 addition & 1 deletion src/OpenTelemetry/Trace/TracerProviderSdk.cs
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ private static ActivitySamplingResult ComputeActivitySamplingResult(
{
foreach (var att in attributes)
{
options.SamplingTags.Add(att.Key, att.Value);
options.SamplingTags[att.Key] = att.Value;
}
}
}
Expand Down
34 changes: 34 additions & 0 deletions test/OpenTelemetry.Tests/Trace/TracerProviderSdkTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,40 @@ public void TracerProviderSdkSamplerAttributesAreAppliedToActivity(SamplingDecis
}
}

[Fact]
public void TracerProviderSdkDuplicateSamplerAttributesUseLastValue()
{
const string attributeKey = "duplicate-sampler-attribute";
var firstSampler = new TestSampler
{
SamplingAction = _ => new SamplingResult(
SamplingDecision.RecordAndSample,
[new(attributeKey, "first")]),
};
var secondSampler = new TestSampler
{
SamplingAction = _ => new SamplingResult(
SamplingDecision.RecordAndSample,
[new(attributeKey, "second")]),
};

var activitySourceName = Utils.GetCurrentMethodName();
using var activitySource = new ActivitySource(activitySourceName);
using var firstProvider = Sdk.CreateTracerProviderBuilder()
.AddSource(activitySourceName)
.SetSampler(firstSampler)
.Build();
using var secondProvider = Sdk.CreateTracerProviderBuilder()
.AddSource(activitySourceName)
.SetSampler(secondSampler)
.Build();

using var activity = activitySource.StartActivity("root");

Assert.NotNull(activity);
Assert.Equal("second", activity.GetTagItem(attributeKey));
}

[Fact]
public void TracerSdkSetsActivitySamplingResultAsPropagationWhenParentIsRemote()
{
Expand Down