From ce5b8b212df2e69bd4bac178855e3f5478c87209 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Thu, 30 Nov 2023 14:08:53 -0800 Subject: [PATCH] Revert "Add b3 default extraction" This reverts commit a08db1a3fe9c26547150fb507ea7ffc0b3c14f74. --- lib/datadog/tracing/configuration/settings.rb | 2 -- spec/datadog/tracing/configuration/settings_spec.rb | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/datadog/tracing/configuration/settings.rb b/lib/datadog/tracing/configuration/settings.rb index cfd9accb6f6..01e09c75f80 100644 --- 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 index 94675c2867d..bf36c4cb76d 100644 --- 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