Merge pull request #3293 from DataDog/remove-b3-default

DataDog · Dec 1, 2023 · 1b46fe7 · 1b46fe7
2 parents 08a0d56 + ce5b8b2
commit 1b46fe7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/lib/datadog/tracing/configuration/settings.rb b/lib/datadog/tracing/configuration/settings.rb
@@ -61,8 +61,6 @@ def self.extended(base)
                   o.default(
                     [
                       Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG,
-                      Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_MULTI_HEADER,
-                      Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_SINGLE_HEADER,
                       Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT,
                     ]
                   )

diff --git a/spec/datadog/tracing/configuration/settings_spec.rb b/spec/datadog/tracing/configuration/settings_spec.rb
@@ -76,8 +76,6 @@
             it do
               is_expected.to contain_exactly(
                 Datadog::Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG,
-                Datadog::Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_MULTI_HEADER,
-                Datadog::Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_SINGLE_HEADER,
                 Datadog::Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT
               )
             end
@@ -218,9 +216,7 @@ def propagation_inject_style
             it { is_expected.to eq [] }
 
             it 'does not change propagation_extract_style' do
-              expect { propagation_style }.to_not change { propagation_extract_style }.from(
-                %w[Datadog b3multi b3 tracecontext]
-              )
+              expect { propagation_style }.to_not change { propagation_extract_style }.from(%w[Datadog tracecontext])
             end
 
             it 'does not change propagation_inject_style' do