Skip to content

[NO-TICKET] Fix precedence for tracing.propagation_style_extract and inject when set through tracing.propagation_style #4963

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

Merged
merged 3 commits into from
Oct 13, 2025
Merged

[NO-TICKET] Fix precedence for tracing.propagation_style_extract and inject when set through tracing.propagation_style #4963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b1f11c
Fix precedence for `tracing.propagation_style_extract` and `inject` w…
vpellan Oct 9, 2025
2b578a0
Merge branch 'master' into vpellan/fix-telemetry-precedence-propagati…
vpellan Oct 9, 2025
92a6129
Merge branch 'master' into vpellan/fix-telemetry-precedence-propagati…
vpellan Oct 13, 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
6 changes: 3 additions & 3 deletions lib/datadog/tracing/configuration/settings.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def self.extended(base)
# Note: Alias (DD_TRACE_PROPAGATION_STYLE) defined in supported-configurations.json
o.env Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE
o.default []
o.after_set do |styles|
o.after_set do |styles, _, precedence|
next if styles.empty?

# Make values case-insensitive
Expand All @@ -110,8 +110,8 @@ def self.extended(base)
false
end
end
set_option(:propagation_style_extract, styles)
set_option(:propagation_style_inject, styles)
set_option(:propagation_style_extract, styles, precedence: precedence)
set_option(:propagation_style_inject, styles, precedence: precedence)
end
end

Expand Down
2 changes: 2 additions & 0 deletions spec/datadog/tracing/configuration/settings_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,12 @@ def propagation_style_inject

it 'sets propagation_style_extract' do
expect { propagation_style }.to change { propagation_style_extract }.to(%w[b3multi b3])
expect(settings.tracing.send(:resolve_option, :propagation_style_extract).precedence_set).to eq(Datadog::Core::Configuration::Option::Precedence::ENVIRONMENT)
end

it 'sets propagation_style_inject' do
expect { propagation_style }.to change { propagation_style_inject }.to(%w[b3multi b3])
expect(settings.tracing.send(:resolve_option, :propagation_style_inject).precedence_set).to eq(Datadog::Core::Configuration::Option::Precedence::ENVIRONMENT)
end

context 'with a mixed case value' do
Expand Down