File tree Expand file tree Collapse file tree 2 files changed +5
-3
lines changed
lib/datadog/tracing/configuration
spec/datadog/tracing/configuration Expand file tree Collapse file tree 2 files changed +5
-3
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments