update contrib tests for 128-bit default trace_ids

spec/datadog/opentelemetry_spec.rb

@@ -339,18 +339,21 @@
       describe '#inject' do
         subject(:inject) { ::OpenTelemetry.propagation.inject(carrier) }
         let(:carrier) { {} }
-
+        let(:headers) do
+          {
+            'x-datadog-parent-id' => Datadog::Tracing.active_span.id.to_s,
+            'x-datadog-sampling-priority' => '1',
+            'x-datadog-tags' => '_dd.p.dm=-0,_dd.p.tid=' +
+              Datadog::Tracing::Utils::TraceId.to_high_order(Datadog::Tracing.active_trace.id).to_s(16),
+            'x-datadog-trace-id' => Datadog::Tracing::Utils::TraceId.to_low_order(Datadog::Tracing.active_trace.id).to_s,
+          }
+        end
         context 'with an active span' do
           before { otel_tracer.start_span('existing-active-span') }
 
           it 'injects Datadog headers' do
             inject
-            expect(carrier).to eq(
-              'x-datadog-parent-id' => Datadog::Tracing.active_span.id.to_s,
-              'x-datadog-sampling-priority' => '1',
-              'x-datadog-tags' => '_dd.p.dm=-0',
-              'x-datadog-trace-id' => Datadog::Tracing.active_trace.id.to_s,
-            )
+            expect(carrier).to eq(headers)
           end
         end
 
@@ -359,12 +362,7 @@
 
           it 'injects Datadog headers' do
             inject
-            expect(carrier).to eq(
-              'x-datadog-parent-id' => Datadog::Tracing.active_span.id.to_s,
-              'x-datadog-sampling-priority' => '1',
-              'x-datadog-tags' => '_dd.p.dm=-0',
-              'x-datadog-trace-id' => Datadog::Tracing.active_trace.id.to_s,
-            )
+            expect(carrier).to eq(headers)
           end
         end
       end

spec/datadog/opentracer/propagation_integration_spec.rb

@@ -378,7 +378,7 @@ def baggage_to_carrier_format(baggage)
 
       it do
         expect(@origin_carrier).to include(
-          'x-datadog-trace-id' => origin_datadog_span.trace_id.to_s,
+          'x-datadog-trace-id' => Datadog::Tracing::Utils::TraceId.to_low_order(origin_datadog_span.trace_id).to_s,
           'x-datadog-parent-id' => origin_datadog_span.span_id.to_s,
           'x-datadog-sampling-priority' => '1',
           'x-datadog-origin' => 'synthetics',
@@ -388,7 +388,7 @@ def baggage_to_carrier_format(baggage)
 
       it do
         expect(@intermediate_carrier).to include(
-          'x-datadog-trace-id' => intermediate_datadog_span.trace_id.to_s,
+          'x-datadog-trace-id' => Datadog::Tracing::Utils::TraceId.to_low_order(intermediate_datadog_span.trace_id).to_s,
           'x-datadog-parent-id' => intermediate_datadog_span.span_id.to_s,
           'x-datadog-sampling-priority' => '1',
           'x-datadog-origin' => 'synthetics',

spec/datadog/opentracer/rack_propagator_spec.rb

@@ -29,15 +29,15 @@
 
       # Expect carrier to be set with Datadog trace properties
       expect(carrier).to receive(:[]=)
-        .with('x-datadog-trace-id', trace_id.to_s)
+        .with('x-datadog-trace-id', Datadog::Tracing::Utils::TraceId.to_low_order(trace_id).to_s)
       expect(carrier).to receive(:[]=)
         .with('x-datadog-parent-id', span_id.to_s)
       expect(carrier).to receive(:[]=)
         .with('x-datadog-sampling-priority', sampling_priority.to_s)
       expect(carrier).to receive(:[]=)
         .with('x-datadog-origin', origin.to_s)
       expect(carrier).to receive(:[]=)
-        .with('x-datadog-tags', '_dd.p.key=value,_dd.p.dm=-1')
+        .with('x-datadog-tags', "_dd.p.key=value,_dd.p.dm=-1,_dd.p.tid=#{Datadog::Tracing::Utils::TraceId.to_high_order(trace_id).to_s(16)}")
 
       # Expect carrier to be set with OpenTracing baggage
       baggage.each do |key, value|

spec/datadog/tracing/contrib/ethon/shared_examples.rb

@@ -161,7 +161,7 @@
           headers = JSON.parse(response.body)['headers']
           distributed_tracing_headers = {
             'x-datadog-parent-id' => [span.span_id.to_s],
-            'x-datadog-trace-id' => [span.trace_id.to_s]
+            'x-datadog-trace-id' => [low_order_trace_id(span.trace_id).to_s]
           }
 
           expect(headers).to include(distributed_tracing_headers)

spec/datadog/tracing/contrib/excon/instrumentation_spec.rb

@@ -266,7 +266,7 @@
             span = datum[:datadog_span]
             headers = datum[:headers]
             expect(headers).to include(
-              'x-datadog-trace-id' => span.trace_id.to_s,
+              'x-datadog-trace-id' => low_order_trace_id(span.trace_id).to_s,
               'x-datadog-parent-id' => span.span_id.to_s
             )
 

spec/datadog/tracing/contrib/faraday/middleware_spec.rb

@@ -362,7 +362,7 @@
 
     it do
       expect(headers).to include(
-        'x-datadog-trace-id' => span.trace_id.to_s,
+        'x-datadog-trace-id' => low_order_trace_id(span.trace_id).to_s,
         'x-datadog-parent-id' => span.span_id.to_s
       )
     end

spec/datadog/tracing/contrib/http/request_spec.rb

@@ -377,7 +377,7 @@ def expect_request_without_distributed_headers
         let(:distributed_tracing_headers) do
           {
             'x-datadog-parent-id' => span.span_id,
-            'x-datadog-trace-id' => span.trace_id,
+            'x-datadog-trace-id' => low_order_trace_id(span.trace_id),
             'x-datadog-sampling-priority' => sampling_priority
           }
         end
@@ -423,7 +423,7 @@ def expect_request_without_distributed_headers
         let(:distributed_tracing_headers) do
           {
             'x-datadog-parent-id' => span.span_id,
-            'x-datadog-trace-id' => span.trace_id,
+            'x-datadog-trace-id' => low_order_trace_id(span.trace_id),
             'x-datadog-sampling-priority' => sampling_priority
           }
         end

spec/datadog/tracing/contrib/httpclient/instrumentation_spec.rb

@@ -231,7 +231,7 @@
           end
 
           it 'propogrates the trace id header' do
-            expect(http_response.headers['X-Datadog-Trace-Id']).to eq(span.trace_id.to_s)
+            expect(http_response.headers['X-Datadog-Trace-Id']).to eq(low_order_trace_id(span.trace_id).to_s)
           end
         end
 

spec/datadog/tracing/contrib/httprb/instrumentation_spec.rb

@@ -233,8 +233,8 @@
             expect(http_response.headers['x-datadog-parent-id']).to eq(span.span_id.to_s)
           end
 
-          it 'propogrates the trace id header' do
-            expect(http_response.headers['x-datadog-trace-id']).to eq(span.trace_id.to_s)
+          it 'propagates the trace id header' do
+            expect(http_response.headers['x-datadog-trace-id']).to eq(low_order_trace_id(span.trace_id).to_s)
           end
         end
 

spec/datadog/tracing/contrib/rails/rails_active_job_spec.rb

@@ -210,7 +210,7 @@ def perform(test_retry: false, test_discard: false)
         it 'injects trace correlation' do
           perform_later
           expect(output).to include('my-log')
-          expect(output).to include(span.trace_id.to_s)
+          expect(output).to include(low_order_trace_id(span.trace_id).to_s)
         end
       end