From 1fdf926cfe64831098fb26927c004553efc7a99b Mon Sep 17 00:00:00 2001 From: ZStriker19 Date: Wed, 12 Feb 2025 15:27:48 -0500 Subject: [PATCH] include in already existing tests --- spec/datadog/core/telemetry/event_spec.rb | 4 ++-- .../contrib/grpc/distributed/propagation_spec.rb | 11 +++++++++-- .../contrib/http/distributed/propagation_spec.rb | 11 +++++++++-- spec/datadog/tracing/distributed/propagation_spec.rb | 5 +++-- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/spec/datadog/core/telemetry/event_spec.rb b/spec/datadog/core/telemetry/event_spec.rb index 5d8ab543157..79dbaa91360 100644 --- a/spec/datadog/core/telemetry/event_spec.rb +++ b/spec/datadog/core/telemetry/event_spec.rb @@ -67,8 +67,8 @@ def contain_configuration(*array) ['profiling.enabled', false], ['runtime_metrics.enabled', false], ['tracing.analytics.enabled', true], - ['tracing.propagation_style_extract', '["datadog", "tracecontext"]'], - ['tracing.propagation_style_inject', '["datadog", "tracecontext"]'], + ['tracing.propagation_style_extract', '["datadog", "tracecontext", "baggage"]'], + ['tracing.propagation_style_inject', '["datadog", "tracecontext", "baggage"]'], ['tracing.enabled', true], ['tracing.log_injection', true], ['tracing.partial_flush.enabled', false], diff --git a/spec/datadog/tracing/contrib/grpc/distributed/propagation_spec.rb b/spec/datadog/tracing/contrib/grpc/distributed/propagation_spec.rb index 59656bd1012..ea1c1fcd3bf 100644 --- a/spec/datadog/tracing/contrib/grpc/distributed/propagation_spec.rb +++ b/spec/datadog/tracing/contrib/grpc/distributed/propagation_spec.rb @@ -17,8 +17,8 @@ ) end - let(:propagation_style_inject) { ['datadog', 'tracecontext'] } - let(:propagation_style_extract) { ['datadog', 'tracecontext'] } + let(:propagation_style_inject) { ['datadog', 'tracecontext', 'baggage'] } + let(:propagation_style_extract) { ['datadog', 'tracecontext', 'baggage'] } let(:propagation_extract_first) { false } it_behaves_like 'Distributed tracing propagator' do @@ -82,4 +82,11 @@ let(:datadog) { propagation } end end + + context 'for Baggage' do + it_behaves_like 'Baggage distributed format' do + before { Datadog.configure { |c| c.tracing.propagation_style = ['baggage'] } } + let(:datadog) { propagation } + end + end end diff --git a/spec/datadog/tracing/contrib/http/distributed/propagation_spec.rb b/spec/datadog/tracing/contrib/http/distributed/propagation_spec.rb index 3d3187eeba5..e8a8938f754 100644 --- a/spec/datadog/tracing/contrib/http/distributed/propagation_spec.rb +++ b/spec/datadog/tracing/contrib/http/distributed/propagation_spec.rb @@ -19,8 +19,8 @@ ) end - let(:propagation_style_inject) { ['datadog', 'tracecontext'] } - let(:propagation_style_extract) { ['datadog', 'tracecontext'] } + let(:propagation_style_inject) { ['datadog', 'tracecontext', 'baggage'] } + let(:propagation_style_extract) { ['datadog', 'tracecontext', 'baggage'] } let(:propagation_extract_first) { false } let(:prepare_key) { RackSupport.method(:header_to_rack) } @@ -67,4 +67,11 @@ let(:datadog) { propagation } end end + + context 'for Baggage' do + it_behaves_like 'Baggage distributed format' do + before { Datadog.configure { |c| c.tracing.propagation_style = ['baggage'] } } + let(:datadog) { propagation } + end + end end diff --git a/spec/datadog/tracing/distributed/propagation_spec.rb b/spec/datadog/tracing/distributed/propagation_spec.rb index dd0605a1007..edd1a22b069 100644 --- a/spec/datadog/tracing/distributed/propagation_spec.rb +++ b/spec/datadog/tracing/distributed/propagation_spec.rb @@ -19,12 +19,13 @@ { 'datadog' => Datadog::Tracing::Distributed::Datadog.new(fetcher: fetcher_class), 'tracecontext' => Datadog::Tracing::Distributed::TraceContext.new(fetcher: fetcher_class), + 'baggage' => Datadog::Tracing::Distributed::Baggage.new(fetcher: fetcher_class), } end let(:fetcher_class) { Datadog::Tracing::Distributed::Fetcher } - let(:propagation_style_inject) { ['datadog', 'tracecontext'] } - let(:propagation_style_extract) { ['datadog', 'tracecontext'] } + let(:propagation_style_inject) { ['datadog', 'tracecontext', 'baggage'] } + let(:propagation_style_extract) { ['datadog', 'tracecontext', 'baggage'] } let(:propagation_extract_first) { false } let(:prepare_key) { defined?(super) ? super() : proc { |key| key } }