Merge pull request #4398 from DataDog/anmarchenko/fix_rack_distribute…

…d_trace_propagation rack instrumentation: continue trace from distributed trace digest only when distributed trace is present
DataDog · Feb 18, 2025 · 5e20f11 · 5e20f11
2 parents c6d1822 + a5be9df
commit 5e20f11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/datadog/tracing/contrib/rack/middlewares.rb b/lib/datadog/tracing/contrib/rack/middlewares.rb
@@ -43,7 +43,7 @@ def call(env)
             # so that all spans will be added to the distributed trace.
             if configuration[:distributed_tracing]
               trace_digest = Contrib::HTTP.extract(env)
-              Tracing.continue_trace!(trace_digest)
+              Tracing.continue_trace!(trace_digest) if trace_digest
             end
 
             TraceProxyMiddleware.call(env, configuration) do

diff --git a/spec/datadog/tracing/contrib/rack/distributed_spec.rb b/spec/datadog/tracing/contrib/rack/distributed_spec.rb
@@ -69,6 +69,8 @@
 
   shared_examples_for 'a Rack request without distributed tracing' do
     it 'produces a non-distributed Rack trace' do
+      expect(Datadog::Tracing).not_to receive(:continue_trace!)
+
       is_expected.to be_ok
       expect(span).to_not be nil
       expect(span.name).to eq('rack.request')