Skip to content

Commit 97c91f0

Browse files
authored
Fix precedence for tracing.propagation_style_extract and inject when set through tracing.propagation_style config (#4963)
1 parent 4191a24 commit 97c91f0

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

lib/datadog/tracing/configuration/settings.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def self.extended(base)
9696
# Note: Alias (DD_TRACE_PROPAGATION_STYLE) defined in supported-configurations.json
9797
o.env Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE
9898
o.default []
99-
o.after_set do |styles|
99+
o.after_set do |styles, _, precedence|
100100
next if styles.empty?
101101

102102
# Make values case-insensitive
@@ -110,8 +110,8 @@ def self.extended(base)
110110
false
111111
end
112112
end
113-
set_option(:propagation_style_extract, styles)
114-
set_option(:propagation_style_inject, styles)
113+
set_option(:propagation_style_extract, styles, precedence: precedence)
114+
set_option(:propagation_style_inject, styles, precedence: precedence)
115115
end
116116
end
117117

spec/datadog/tracing/configuration/settings_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,12 @@ def propagation_style_inject
191191

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

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

200202
context 'with a mixed case value' do

0 commit comments

Comments
 (0)