From dc106cf46a904424fa11581f1f0312450c4886a4 Mon Sep 17 00:00:00 2001
From: Munir Abdinur <munir_abdinur@hotmail.com>
Date: Thu, 20 Mar 2025 16:31:45 -0400
Subject: [PATCH 01/11] update default

---
 lib/datadog/tracing/configuration/settings.rb       | 2 +-
 spec/datadog/tracing/configuration/settings_spec.rb | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/datadog/tracing/configuration/settings.rb b/lib/datadog/tracing/configuration/settings.rb
index 12f40fee764..eaa29c11a42 100644
--- a/lib/datadog/tracing/configuration/settings.rb
+++ b/lib/datadog/tracing/configuration/settings.rb
@@ -188,7 +188,7 @@ def self.extended(base)
               # It is not supported by our backend yet. Do not enable it.
               option :trace_id_128_bit_logging_enabled do |o|
                 o.env Tracing::Configuration::Ext::Correlation::ENV_TRACE_ID_128_BIT_LOGGING_ENABLED
-                o.default false
+                o.default true
                 o.type :bool
               end
 
diff --git a/spec/datadog/tracing/configuration/settings_spec.rb b/spec/datadog/tracing/configuration/settings_spec.rb
index cff6abe37b9..9da347a653c 100644
--- a/spec/datadog/tracing/configuration/settings_spec.rb
+++ b/spec/datadog/tracing/configuration/settings_spec.rb
@@ -944,7 +944,7 @@ def propagation_style_inject
         context 'is not defined' do
           let(:env_var) { nil }
 
-          it { is_expected.to eq(false) }
+          it { is_expected.to eq(true) }
         end
 
         context 'is `true`' do
@@ -964,10 +964,10 @@ def propagation_style_inject
     describe '#trace_id_128_bit_logging_enabled=' do
       it 'updates the #trace_id_128_bit_logging_enabled setting' do
         expect do
-          settings.tracing.trace_id_128_bit_logging_enabled = true
+          settings.tracing.trace_id_128_bit_logging_enabled = false
         end.to change { settings.tracing.trace_id_128_bit_logging_enabled }
-          .from(false)
-          .to(true)
+          .from(true)
+          .to(false)
       end
     end
 

From d685456952259d6d3101307dcedfd694eb434f19 Mon Sep 17 00:00:00 2001
From: Munir Abdinur <munir_abdinur@hotmail.com>
Date: Fri, 21 Mar 2025 10:59:38 -0400
Subject: [PATCH 02/11] fix failing tests

---
 spec/datadog/opentelemetry_spec.rb            |   2 +-
 .../tracing/contrib/ethon/shared_examples.rb  |   2 +-
 .../contrib/excon/instrumentation_spec.rb     |   2 +-
 .../contrib/faraday/middleware_spec.rb        |   2 +-
 .../tracing/contrib/http/request_spec.rb      |   4 +-
 .../httpclient/instrumentation_spec.rb        |   2 +-
 .../contrib/httprb/instrumentation_spec.rb    |   2 +-
 .../contrib/lograge/instrumentation_spec.rb   |   2 +-
 .../contrib/rails/rails_active_job_spec.rb    |   2 +-
 .../rails/rails_log_auto_injection_spec.rb    | 112 +++++++++---------
 ...ils_semantic_logger_auto_injection_spec.rb |   8 +-
 .../contrib/rest_client/request_patch_spec.rb |   2 +-
 .../semantic_logger/instrumentation_spec.rb   |   8 +-
 .../sidekiq/distributed_tracing_spec.rb       |   4 +-
 spec/datadog/tracing/correlation_spec.rb      |   6 +-
 spec/datadog/tracing/trace_operation_spec.rb  |  18 +--
 spec/datadog/tracing/tracer_spec.rb           |   2 +-
 spec/support/tracer_helpers.rb                |  11 +-
 18 files changed, 101 insertions(+), 90 deletions(-)

diff --git a/spec/datadog/opentelemetry_spec.rb b/spec/datadog/opentelemetry_spec.rb
index 45f82db3781..10ff04bbe36 100644
--- a/spec/datadog/opentelemetry_spec.rb
+++ b/spec/datadog/opentelemetry_spec.rb
@@ -835,7 +835,7 @@ def headers
             'x-datadog-tags' => '_dd.p.dm=-0' + (
               trace_id < 2**64 ? '' : ",_dd.p.tid=#{high_order_hex_trace_id(Datadog::Tracing.active_trace.id)}"
             ),
-            'x-datadog-trace-id' => low_order_trace_id(Datadog::Tracing.active_trace.id).to_s,
+            'x-datadog-trace-id' => log_injection_trace_id_128(Datadog::Tracing.active_trace.id).to_s,
           }
         end
 
diff --git a/spec/datadog/tracing/contrib/ethon/shared_examples.rb b/spec/datadog/tracing/contrib/ethon/shared_examples.rb
index 69edc1b1a26..6e231555b58 100644
--- a/spec/datadog/tracing/contrib/ethon/shared_examples.rb
+++ b/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.id.to_s],
-            'x-datadog-trace-id' => [low_order_trace_id(span.trace_id).to_s]
+            'x-datadog-trace-id' => [log_injection_trace_id_128(span.trace_id).to_s]
           }
 
           expect(headers).to include(distributed_tracing_headers)
diff --git a/spec/datadog/tracing/contrib/excon/instrumentation_spec.rb b/spec/datadog/tracing/contrib/excon/instrumentation_spec.rb
index 411abc43d8e..50980e237e6 100644
--- a/spec/datadog/tracing/contrib/excon/instrumentation_spec.rb
+++ b/spec/datadog/tracing/contrib/excon/instrumentation_spec.rb
@@ -289,7 +289,7 @@
             span = datum[:datadog_span]
             headers = datum[:headers]
             expect(headers).to include(
-              'x-datadog-trace-id' => low_order_trace_id(span.trace_id).to_s,
+              'x-datadog-trace-id' => log_injection_trace_id_128(span.trace_id).to_s,
               'x-datadog-parent-id' => span.id.to_s
             )
 
diff --git a/spec/datadog/tracing/contrib/faraday/middleware_spec.rb b/spec/datadog/tracing/contrib/faraday/middleware_spec.rb
index 808d4e8cd82..279c915714f 100644
--- a/spec/datadog/tracing/contrib/faraday/middleware_spec.rb
+++ b/spec/datadog/tracing/contrib/faraday/middleware_spec.rb
@@ -382,7 +382,7 @@
 
     it do
       expect(headers).to include(
-        'x-datadog-trace-id' => low_order_trace_id(span.trace_id).to_s,
+        'x-datadog-trace-id' => log_injection_trace_id_128(span.trace_id).to_s,
         'x-datadog-parent-id' => span.id.to_s
       )
     end
diff --git a/spec/datadog/tracing/contrib/http/request_spec.rb b/spec/datadog/tracing/contrib/http/request_spec.rb
index 356c40c28de..34a41a7d53b 100644
--- a/spec/datadog/tracing/contrib/http/request_spec.rb
+++ b/spec/datadog/tracing/contrib/http/request_spec.rb
@@ -338,7 +338,7 @@ def expect_request_without_distributed_headers
         let(:distributed_tracing_headers) do
           {
             'x-datadog-parent-id' => span.id,
-            'x-datadog-trace-id' => low_order_trace_id(span.trace_id),
+            'x-datadog-trace-id' => log_injection_trace_id_128(span.trace_id),
             'x-datadog-sampling-priority' => sampling_priority
           }
         end
@@ -384,7 +384,7 @@ def expect_request_without_distributed_headers
         let(:distributed_tracing_headers) do
           {
             'x-datadog-parent-id' => span.id,
-            'x-datadog-trace-id' => low_order_trace_id(span.trace_id),
+            'x-datadog-trace-id' => log_injection_trace_id_128(span.trace_id),
             'x-datadog-sampling-priority' => sampling_priority
           }
         end
diff --git a/spec/datadog/tracing/contrib/httpclient/instrumentation_spec.rb b/spec/datadog/tracing/contrib/httpclient/instrumentation_spec.rb
index 4405748fbac..35f11ebde71 100644
--- a/spec/datadog/tracing/contrib/httpclient/instrumentation_spec.rb
+++ b/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(low_order_trace_id(span.trace_id).to_s)
+            expect(http_response.headers['X-Datadog-Trace-Id']).to eq(log_injection_trace_id_128(span.trace_id).to_s)
           end
         end
 
diff --git a/spec/datadog/tracing/contrib/httprb/instrumentation_spec.rb b/spec/datadog/tracing/contrib/httprb/instrumentation_spec.rb
index 485c599fa53..de46d8d024f 100644
--- a/spec/datadog/tracing/contrib/httprb/instrumentation_spec.rb
+++ b/spec/datadog/tracing/contrib/httprb/instrumentation_spec.rb
@@ -234,7 +234,7 @@
           end
 
           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)
+            expect(http_response.headers['x-datadog-trace-id']).to eq(log_injection_trace_id_128(span.trace_id).to_s)
           end
         end
 
diff --git a/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb b/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb
index b761e299d5e..7fc85724aaa 100644
--- a/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb
+++ b/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb
@@ -50,7 +50,7 @@
               env: 'env',
               service: 'service',
               span_id: span_id.to_s,
-              trace_id: low_order_trace_id(trace_id).to_s,
+              trace_id: log_injection_trace_id_128(trace_id).to_s,
               version: 'version'
             },
             ddsource: 'ruby' }
diff --git a/spec/datadog/tracing/contrib/rails/rails_active_job_spec.rb b/spec/datadog/tracing/contrib/rails/rails_active_job_spec.rb
index 2ec462e0a3b..f4b69d16d78 100644
--- a/spec/datadog/tracing/contrib/rails/rails_active_job_spec.rb
+++ b/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(low_order_trace_id(span.trace_id).to_s)
+          expect(output).to include(log_injection_trace_id_128(span.trace_id).to_s)
         end
       end
 
diff --git a/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb b/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
index a71cb0e1e0a..d859adab5a0 100644
--- a/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
+++ b/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
@@ -89,9 +89,9 @@ def index
         expect(log_entries).to have(2).items
         rack_rails_logger_entry, my_entry = log_entries
 
-        expect(rack_rails_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+        expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-        expect(my_entry).not_to include low_order_trace_id(trace.id).to_s
+        expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
       end
     end
 
@@ -109,9 +109,9 @@ def index
           expect(log_entries).to have(2).items
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).to include "dd.trace_id=#{low_order_trace_id(trace.id)}"
+          expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
 
-          expect(my_entry).to include low_order_trace_id(trace.id).to_s
+          expect(my_entry).to include log_injection_trace_id_128(trace.id).to_s
         end
       end
 
@@ -128,11 +128,11 @@ def index
           expect(log_entries).to have(2).items
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).to include "dd.trace_id=#{low_order_trace_id(trace.id)}"
+          expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
           expect(rack_rails_logger_entry).to include '[some_info]'
           expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-          expect(my_entry).to include low_order_trace_id(trace.id).to_s
+          expect(my_entry).to include log_injection_trace_id_128(trace.id).to_s
           expect(my_entry).to include '[some_info]'
           expect(my_entry).to include '[some_other_info]'
         end
@@ -158,12 +158,14 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-              expect(controller_logger_entry).to include low_order_trace_id(low_order_trace_id(trace.id)).to_s
+              expect(controller_logger_entry).to include log_injection_trace_id_128(
+                log_injection_trace_id_128(trace.id)
+              ).to_s
               expect(controller_logger_entry).to include 'ddsource=ruby'
 
-              expect(my_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
             end
           end
 
@@ -185,14 +187,14 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-              expect(controller_logger_entry).to include low_order_trace_id(trace.id).to_s
+              expect(controller_logger_entry).to include log_injection_trace_id_128(trace.id).to_s
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_hash_info=test_hash_value'
               expect(controller_logger_entry).to include 'some_other_hash_info=other_test_hash_value'
 
-              expect(my_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
             end
           end
 
@@ -216,14 +218,16 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include low_order_trace_id(low_order_trace_id(trace.id)).to_s
+              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(
+                log_injection_trace_id_128(trace.id)
+              ).to_s
 
-              expect(controller_logger_entry).to include low_order_trace_id(trace.id).to_s
+              expect(controller_logger_entry).to include log_injection_trace_id_128(trace.id).to_s
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_lambda_info=test_lambda_value'
               expect(controller_logger_entry).to include 'some_other_lambda_info=other_test_lambda_value'
 
-              expect(my_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
             end
           end
         end
@@ -241,11 +245,11 @@ def index
 
             rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-            expect(rack_rails_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+            expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-            expect(my_entry).not_to include low_order_trace_id(trace.id).to_s
+            expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-            expect(controller_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+            expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
           end
         end
       end
@@ -272,11 +276,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{low_order_trace_id(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
 
-              expect(my_entry).to include "dd.trace_id=#{low_order_trace_id(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
 
-              expect(controller_logger_entry.scan(low_order_trace_id(trace.id).to_s)).to have(2).times
+              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id).to_s)).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
             end
           end
@@ -292,15 +296,15 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{low_order_trace_id(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
               expect(rack_rails_logger_entry).to include '[some_info]'
               expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-              expect(my_entry).to include "dd.trace_id=#{low_order_trace_id(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
               expect(my_entry).to include '[some_info]'
               expect(my_entry).to include '[some_other_info]'
 
-              expect(controller_logger_entry.scan(low_order_trace_id(trace.id).to_s)).to have(2).times
+              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id).to_s)).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include '[some_info]'
               expect(controller_logger_entry).to include '[some_other_info]'
@@ -325,11 +329,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{low_order_trace_id(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
 
-              expect(my_entry).to include "dd.trace_id=#{low_order_trace_id(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
 
-              expect(controller_logger_entry.scan(low_order_trace_id(trace.id).to_s)).to have(2).times
+              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id).to_s)).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_hash_info=test_hash_value'
               expect(controller_logger_entry).to include 'some_other_hash_info=other_test_hash_value'
@@ -356,11 +360,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{low_order_trace_id(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
 
-              expect(my_entry).to include "dd.trace_id=#{low_order_trace_id(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
 
-              expect(controller_logger_entry.scan(low_order_trace_id(trace.id).to_s)).to have(2).times
+              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id).to_s)).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_lambda_info=test_lambda_value'
               expect(controller_logger_entry).to include 'some_other_lambda_info=other_test_lambda_value'
@@ -387,15 +391,15 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{low_order_trace_id(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
               expect(rack_rails_logger_entry).to include '[some_info]'
               expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-              expect(my_entry).to include "dd.trace_id=#{low_order_trace_id(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
               expect(my_entry).to include '[some_info]'
               expect(my_entry).to include '[some_other_info]'
 
-              expect(controller_logger_entry.scan(low_order_trace_id(trace.id).to_s)).to have(2).times
+              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id).to_s)).to have(2).times
               expect(controller_logger_entry).to include '[some_info]'
               expect(controller_logger_entry).to include '[some_other_info]'
               expect(controller_logger_entry).to include 'ddsource=ruby'
@@ -420,9 +424,9 @@ def index
         expect(log_entries).to have(2).item
         rack_rails_logger_entry, my_entry = log_entries
 
-        expect(rack_rails_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+        expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-        expect(my_entry).not_to include low_order_trace_id(trace.id).to_s
+        expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
       end
     end
 
@@ -440,9 +444,9 @@ def index
 
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+          expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-          expect(my_entry).not_to include low_order_trace_id(trace.id).to_s
+          expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
         end
       end
 
@@ -457,11 +461,11 @@ def index
 
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+          expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
           expect(rack_rails_logger_entry).to include '[some_info]'
           expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-          expect(my_entry).not_to include low_order_trace_id(trace.id).to_s
+          expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
           expect(my_entry).to include '[some_info]'
           expect(my_entry).to include '[some_other_info]'
         end
@@ -481,8 +485,10 @@ def index
             expect(log_entries).to have(2).items
 
             rack_rails_logger_entry, my_entry = log_entries
-            expect(rack_rails_logger_entry).to include "dd.trace_id=#{low_order_trace_id(low_order_trace_id(trace.id))}"
-            expect(my_entry).to include "dd.trace_id=#{low_order_trace_id(low_order_trace_id(trace.id))}"
+            expect(rack_rails_logger_entry).to include "dd.trace_id=#{
+              log_injection_trace_id_128(log_injection_trace_id_128(trace.id))
+            }"
+            expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(log_injection_trace_id_128(trace.id))}"
           end
         end
       end
@@ -507,11 +513,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-              expect(my_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-              expect(controller_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
             end
           end
 
@@ -533,11 +539,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-              expect(my_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-              expect(controller_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
               expect(controller_logger_entry).to include 'some_hash_info=test_hash_value'
               expect(controller_logger_entry).to include 'some_other_hash_info=other_test_hash_value'
             end
@@ -563,11 +569,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-              expect(my_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-              expect(controller_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+              expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
               expect(controller_logger_entry).to include 'some_lambda_info=test_lambda_value'
               expect(controller_logger_entry).to include 'some_other_lambda_info=other_test_lambda_value'
             end
@@ -587,11 +593,11 @@ def index
 
             rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-            expect(rack_rails_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+            expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-            expect(my_entry).not_to include low_order_trace_id(trace.id).to_s
+            expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
 
-            expect(controller_logger_entry).not_to include low_order_trace_id(trace.id).to_s
+            expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
           end
         end
       end
diff --git a/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb b/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb
index 26636716afc..1d6acedfd04 100644
--- a/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb
+++ b/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb
@@ -88,7 +88,7 @@ def index
 
             if defined?(RailsSemanticLogger::ActionView::LogSubscriber) || Rails.version >= '5'
               expect(log_entries).to have(6).items
-              expect(log_entries).to all include low_order_trace_id(trace.id).to_s
+              expect(log_entries).to all include log_injection_trace_id_128(trace.id).to_s
               expect(log_entries).to all include 'ddsource: ruby'
 
               rack_started_entry,
@@ -119,7 +119,7 @@ def index
             else
               expect(log_entries).to have(5).items
 
-              expect(log_entries).to all include low_order_trace_id(trace.id).to_s
+              expect(log_entries).to all include log_injection_trace_id_128(trace.id).to_s
               expect(log_entries).to all include 'ddsource: ruby'
             end
           end
@@ -138,7 +138,7 @@ def index
             if defined?(RailsSemanticLogger::ActionView::LogSubscriber) || Rails.version >= '5'
               expect(log_entries).to have(6).items
 
-              expect(log_entries).to all include(low_order_trace_id(trace.id).to_s)
+              expect(log_entries).to all include(log_injection_trace_id_128(trace.id).to_s)
               expect(log_entries).to all include('ddsource: ruby')
               expect(log_entries).to all include('some_tag')
               expect(log_entries).to all include('some_value')
@@ -171,7 +171,7 @@ def index
             else
               expect(log_entries).to have(5).items
 
-              expect(log_entries).to all include(low_order_trace_id(trace.id).to_s)
+              expect(log_entries).to all include(log_injection_trace_id_128(trace.id).to_s)
               expect(log_entries).to all include('ddsource: ruby')
               expect(log_entries).to all include('some_tag')
               expect(log_entries).to all include('some_value')
diff --git a/spec/datadog/tracing/contrib/rest_client/request_patch_spec.rb b/spec/datadog/tracing/contrib/rest_client/request_patch_spec.rb
index 889363cf201..665ccb694b3 100644
--- a/spec/datadog/tracing/contrib/rest_client/request_patch_spec.rb
+++ b/spec/datadog/tracing/contrib/rest_client/request_patch_spec.rb
@@ -300,7 +300,7 @@
           request
 
           distributed_tracing_headers = { 'X-Datadog-Parent-Id' => span.id.to_s,
-                                          'X-Datadog-Trace-Id' => low_order_trace_id(span.trace_id).to_s }
+                                          'X-Datadog-Trace-Id' => log_injection_trace_id_128(span.trace_id).to_s }
 
           expect(a_request(:get, url).with(headers: distributed_tracing_headers)).to have_been_made
         end
diff --git a/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb b/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb
index 55b53888b4d..6b5a8f877b2 100644
--- a/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb
+++ b/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb
@@ -71,7 +71,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).to include 'original: tag'
 
-        expect(log_entry).to include low_order_trace_id(trace_id).to_s
+        expect(log_entry).to include log_injection_trace_id_128(trace_id).to_s
         expect(log_entry).to include span_id.to_s
         expect(log_entry).to include 'production'
         expect(log_entry).to include 'MyService'
@@ -91,7 +91,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).to include 'original: tag'
 
-        expect(log_entry).not_to include low_order_trace_id(trace_id).to_s
+        expect(log_entry).not_to include log_injection_trace_id_128(trace_id).to_s
         expect(log_entry).not_to include span_id.to_s
         expect(log_entry).not_to include 'production'
         expect(log_entry).not_to include 'MyService'
@@ -111,7 +111,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).to include 'original: tag'
 
-        expect(log_entry).not_to include low_order_trace_id(trace_id).to_s
+        expect(log_entry).not_to include log_injection_trace_id_128(trace_id).to_s
         expect(log_entry).not_to include span_id.to_s
         expect(log_entry).not_to include 'production'
         expect(log_entry).not_to include 'MyService'
@@ -137,7 +137,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).not_to include 'original: tag'
 
-        expect(log_entry).to include low_order_trace_id(trace_id).to_s
+        expect(log_entry).to include log_injection_trace_id_128(trace_id).to_s
         expect(log_entry).to include span_id.to_s
         expect(log_entry).to include 'production'
         expect(log_entry).to include 'MyService'
diff --git a/spec/datadog/tracing/contrib/sidekiq/distributed_tracing_spec.rb b/spec/datadog/tracing/contrib/sidekiq/distributed_tracing_spec.rb
index 15d7575585b..b7dea0a5cee 100644
--- a/spec/datadog/tracing/contrib/sidekiq/distributed_tracing_spec.rb
+++ b/spec/datadog/tracing/contrib/sidekiq/distributed_tracing_spec.rb
@@ -57,7 +57,7 @@ def perform; end
         expect(span.get_tag('operation')).to eq('push')
         expect(span.get_tag('span.kind')).to eq('producer')
 
-        expect(job['x-datadog-trace-id']).to eq(low_order_trace_id(span.trace_id).to_s)
+        expect(job['x-datadog-trace-id']).to eq(log_injection_trace_id_128(span.trace_id).to_s)
         expect(job['x-datadog-parent-id']).to eq(span.id.to_s)
         expect(job['x-datadog-sampling-priority']).to eq('1')
         expect(job['x-datadog-tags']).to eq("_dd.p.dm=-0,_dd.p.tid=#{high_order_hex_trace_id(span.trace_id)}")
@@ -78,7 +78,7 @@ def perform; end
             'args' => [],
             'class' => EmptyWorker.to_s,
             'jid' => jid,
-            'x-datadog-trace-id' => low_order_trace_id(trace_id).to_s,
+            'x-datadog-trace-id' => log_injection_trace_id_128(trace_id).to_s,
             'x-datadog-parent-id' => span_id.to_s,
             'x-datadog-sampling-priority' => '2',
             'x-datadog-tags' => "_dd.p.dm=-99,_dd.p.tid=#{high_order_hex_trace_id(trace_id)}",
diff --git a/spec/datadog/tracing/correlation_spec.rb b/spec/datadog/tracing/correlation_spec.rb
index 9b0946499fe..6c7dc7fc5cd 100644
--- a/spec/datadog/tracing/correlation_spec.rb
+++ b/spec/datadog/tracing/correlation_spec.rb
@@ -68,7 +68,7 @@
           env: default_env,
           service: default_service,
           span_id: span_id.to_s,
-          trace_id: low_order_trace_id(trace_id).to_s,
+          trace_id: log_injection_trace_id_128(trace_id).to_s,
           version: default_version
         )
       end
@@ -189,7 +189,7 @@
             env: env,
             service: service,
             span_id: span_id.to_s,
-            trace_id: low_order_trace_id(trace_id).to_s,
+            trace_id: log_injection_trace_id_128(trace_id).to_s,
             version: version
           )
         end
@@ -222,7 +222,7 @@
                 env: 'dev',
                 service: 'acme-api',
                 version: '1.0',
-                trace_id: low_order_trace_id(trace_id).to_s,
+                trace_id: log_injection_trace_id_128(trace_id).to_s,
                 span_id: span_id.to_s
               },
               ddsource: 'ruby'
diff --git a/spec/datadog/tracing/trace_operation_spec.rb b/spec/datadog/tracing/trace_operation_spec.rb
index d168a99f73c..0c9650cb3cd 100644
--- a/spec/datadog/tracing/trace_operation_spec.rb
+++ b/spec/datadog/tracing/trace_operation_spec.rb
@@ -2155,7 +2155,7 @@ def span
         it do
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: low_order_trace_id(trace_op.id).to_s,
+            trace_id: log_injection_trace_id_128(trace_op.id).to_s,
           )
         end
       end
@@ -2168,7 +2168,7 @@ def span
       it do
         expect(trace_op.to_correlation).to have_attributes(
           span_id: parent_span_id.to_s,
-          trace_id: low_order_trace_id(trace_op.id).to_s
+          trace_id: log_injection_trace_id_128(trace_op.id).to_s
         )
       end
     end
@@ -2187,7 +2187,7 @@ def span
 
         expect(correlation).to have_attributes(
           span_id: parent_id.to_s,
-          trace_id: low_order_trace_id(trace_op.id).to_s
+          trace_id: log_injection_trace_id_128(trace_op.id).to_s
         )
       end
 
@@ -2208,7 +2208,7 @@ def span
 
           expect(correlation).to have_attributes(
             span_id: parent_id.to_s,
-            trace_id: low_order_trace_id(trace_op.id).to_s
+            trace_id: log_injection_trace_id_128(trace_op.id).to_s
           )
         end
       end
@@ -2221,7 +2221,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: low_order_trace_id(trace_op.id).to_s,
+            trace_id: log_injection_trace_id_128(trace_op.id).to_s,
           )
         end
       end
@@ -2232,7 +2232,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: span.id.to_s,
-            trace_id: low_order_trace_id(trace_op.id).to_s,
+            trace_id: log_injection_trace_id_128(trace_op.id).to_s,
           )
         end
       end
@@ -2243,7 +2243,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: low_order_trace_id(trace_op.id).to_s,
+            trace_id: log_injection_trace_id_128(trace_op.id).to_s,
           )
         end
       end
@@ -2258,7 +2258,7 @@ def span
 
         expect(trace_op.to_correlation).to have_attributes(
           span_id: '0',
-          trace_id: low_order_trace_id(trace_op.id).to_s
+          trace_id: log_injection_trace_id_128(trace_op.id).to_s
         )
       end
 
@@ -2274,7 +2274,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: low_order_trace_id(trace_op.id).to_s
+            trace_id: log_injection_trace_id_128(trace_op.id).to_s
           )
         end
       end
diff --git a/spec/datadog/tracing/tracer_spec.rb b/spec/datadog/tracing/tracer_spec.rb
index 991b4def5a8..863a09b7b5d 100644
--- a/spec/datadog/tracing/tracer_spec.rb
+++ b/spec/datadog/tracing/tracer_spec.rb
@@ -750,7 +750,7 @@
       it 'produces an Identifier with data' do
         is_expected.to be_a_kind_of(Datadog::Tracing::Correlation::Identifier)
         expect(active_correlation.trace_id)
-          .to eq(low_order_trace_id(span.trace_id).to_s)
+          .to eq(log_injection_trace_id_128(span.trace_id).to_s)
         expect(active_correlation.span_id).to eq(span.id.to_s)
       end
     end
diff --git a/spec/support/tracer_helpers.rb b/spec/support/tracer_helpers.rb
index 3cd3864a5cd..c608e30b908 100644
--- a/spec/support/tracer_helpers.rb
+++ b/spec/support/tracer_helpers.rb
@@ -1,6 +1,7 @@
 require 'datadog/tracing/tracer'
 require 'datadog/tracing/trace_operation'
 require 'support/faux_writer'
+require 'datadog/tracing/utils'
 
 module TracerHelpers
   # Return a test tracer instance with a faux writer.
@@ -118,9 +119,13 @@ def tracer_shutdown!
     without_warnings { Datadog.send(:reset!) }
   end
 
-  # Wraps call to Tracing::Utils::TraceId.to_low_order for better test readability
-  def low_order_trace_id(trace_id)
-    Datadog::Tracing::Utils::TraceId.to_low_order(trace_id)
+  # Ensures the given trace ID is always formatted using the 128-bit logging format
+  # by wrapping Tracing::Correlation.format_trace_id(trace_id)
+  def log_injection_trace_id_128(trace_id)
+    RSpec::Mocks.with_temporary_scope do
+      allow(Datadog.configuration.tracing).to receive(:trace_id_128_bit_logging_enabled).and_return(true)
+      Datadog::Tracing::Correlation.format_trace_id(trace_id)
+    end
   end
 
   # Wraps call to Tracing::Utils::TraceId.to_high_order and converts to hex

From ce1292d5ded30a3ad97f1d3ab796644a416a5a5d Mon Sep 17 00:00:00 2001
From: Munir Abdinur <munir_abdinur@hotmail.com>
Date: Fri, 21 Mar 2025 13:38:11 -0400
Subject: [PATCH 03/11] fix failing tests

---
 spec/datadog/opentelemetry_spec.rb                           | 2 +-
 spec/datadog/tracing/contrib/excon/instrumentation_spec.rb   | 2 +-
 spec/datadog/tracing/contrib/faraday/middleware_spec.rb      | 2 +-
 spec/datadog/tracing/contrib/http/request_spec.rb            | 4 ++--
 .../tracing/contrib/httpclient/instrumentation_spec.rb       | 2 +-
 spec/datadog/tracing/contrib/httprb/instrumentation_spec.rb  | 2 +-
 .../tracing/contrib/rest_client/request_patch_spec.rb        | 2 +-
 .../tracing/contrib/sidekiq/distributed_tracing_spec.rb      | 4 ++--
 spec/support/tracer_helpers.rb                               | 5 +++++
 9 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/spec/datadog/opentelemetry_spec.rb b/spec/datadog/opentelemetry_spec.rb
index 10ff04bbe36..45f82db3781 100644
--- a/spec/datadog/opentelemetry_spec.rb
+++ b/spec/datadog/opentelemetry_spec.rb
@@ -835,7 +835,7 @@ def headers
             'x-datadog-tags' => '_dd.p.dm=-0' + (
               trace_id < 2**64 ? '' : ",_dd.p.tid=#{high_order_hex_trace_id(Datadog::Tracing.active_trace.id)}"
             ),
-            'x-datadog-trace-id' => log_injection_trace_id_128(Datadog::Tracing.active_trace.id).to_s,
+            'x-datadog-trace-id' => low_order_trace_id(Datadog::Tracing.active_trace.id).to_s,
           }
         end
 
diff --git a/spec/datadog/tracing/contrib/excon/instrumentation_spec.rb b/spec/datadog/tracing/contrib/excon/instrumentation_spec.rb
index 50980e237e6..411abc43d8e 100644
--- a/spec/datadog/tracing/contrib/excon/instrumentation_spec.rb
+++ b/spec/datadog/tracing/contrib/excon/instrumentation_spec.rb
@@ -289,7 +289,7 @@
             span = datum[:datadog_span]
             headers = datum[:headers]
             expect(headers).to include(
-              'x-datadog-trace-id' => log_injection_trace_id_128(span.trace_id).to_s,
+              'x-datadog-trace-id' => low_order_trace_id(span.trace_id).to_s,
               'x-datadog-parent-id' => span.id.to_s
             )
 
diff --git a/spec/datadog/tracing/contrib/faraday/middleware_spec.rb b/spec/datadog/tracing/contrib/faraday/middleware_spec.rb
index 279c915714f..808d4e8cd82 100644
--- a/spec/datadog/tracing/contrib/faraday/middleware_spec.rb
+++ b/spec/datadog/tracing/contrib/faraday/middleware_spec.rb
@@ -382,7 +382,7 @@
 
     it do
       expect(headers).to include(
-        'x-datadog-trace-id' => log_injection_trace_id_128(span.trace_id).to_s,
+        'x-datadog-trace-id' => low_order_trace_id(span.trace_id).to_s,
         'x-datadog-parent-id' => span.id.to_s
       )
     end
diff --git a/spec/datadog/tracing/contrib/http/request_spec.rb b/spec/datadog/tracing/contrib/http/request_spec.rb
index 34a41a7d53b..356c40c28de 100644
--- a/spec/datadog/tracing/contrib/http/request_spec.rb
+++ b/spec/datadog/tracing/contrib/http/request_spec.rb
@@ -338,7 +338,7 @@ def expect_request_without_distributed_headers
         let(:distributed_tracing_headers) do
           {
             'x-datadog-parent-id' => span.id,
-            'x-datadog-trace-id' => log_injection_trace_id_128(span.trace_id),
+            'x-datadog-trace-id' => low_order_trace_id(span.trace_id),
             'x-datadog-sampling-priority' => sampling_priority
           }
         end
@@ -384,7 +384,7 @@ def expect_request_without_distributed_headers
         let(:distributed_tracing_headers) do
           {
             'x-datadog-parent-id' => span.id,
-            'x-datadog-trace-id' => log_injection_trace_id_128(span.trace_id),
+            'x-datadog-trace-id' => low_order_trace_id(span.trace_id),
             'x-datadog-sampling-priority' => sampling_priority
           }
         end
diff --git a/spec/datadog/tracing/contrib/httpclient/instrumentation_spec.rb b/spec/datadog/tracing/contrib/httpclient/instrumentation_spec.rb
index 35f11ebde71..4405748fbac 100644
--- a/spec/datadog/tracing/contrib/httpclient/instrumentation_spec.rb
+++ b/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(log_injection_trace_id_128(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
 
diff --git a/spec/datadog/tracing/contrib/httprb/instrumentation_spec.rb b/spec/datadog/tracing/contrib/httprb/instrumentation_spec.rb
index de46d8d024f..485c599fa53 100644
--- a/spec/datadog/tracing/contrib/httprb/instrumentation_spec.rb
+++ b/spec/datadog/tracing/contrib/httprb/instrumentation_spec.rb
@@ -234,7 +234,7 @@
           end
 
           it 'propagates the trace id header' do
-            expect(http_response.headers['x-datadog-trace-id']).to eq(log_injection_trace_id_128(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
 
diff --git a/spec/datadog/tracing/contrib/rest_client/request_patch_spec.rb b/spec/datadog/tracing/contrib/rest_client/request_patch_spec.rb
index 665ccb694b3..889363cf201 100644
--- a/spec/datadog/tracing/contrib/rest_client/request_patch_spec.rb
+++ b/spec/datadog/tracing/contrib/rest_client/request_patch_spec.rb
@@ -300,7 +300,7 @@
           request
 
           distributed_tracing_headers = { 'X-Datadog-Parent-Id' => span.id.to_s,
-                                          'X-Datadog-Trace-Id' => log_injection_trace_id_128(span.trace_id).to_s }
+                                          'X-Datadog-Trace-Id' => low_order_trace_id(span.trace_id).to_s }
 
           expect(a_request(:get, url).with(headers: distributed_tracing_headers)).to have_been_made
         end
diff --git a/spec/datadog/tracing/contrib/sidekiq/distributed_tracing_spec.rb b/spec/datadog/tracing/contrib/sidekiq/distributed_tracing_spec.rb
index b7dea0a5cee..15d7575585b 100644
--- a/spec/datadog/tracing/contrib/sidekiq/distributed_tracing_spec.rb
+++ b/spec/datadog/tracing/contrib/sidekiq/distributed_tracing_spec.rb
@@ -57,7 +57,7 @@ def perform; end
         expect(span.get_tag('operation')).to eq('push')
         expect(span.get_tag('span.kind')).to eq('producer')
 
-        expect(job['x-datadog-trace-id']).to eq(log_injection_trace_id_128(span.trace_id).to_s)
+        expect(job['x-datadog-trace-id']).to eq(low_order_trace_id(span.trace_id).to_s)
         expect(job['x-datadog-parent-id']).to eq(span.id.to_s)
         expect(job['x-datadog-sampling-priority']).to eq('1')
         expect(job['x-datadog-tags']).to eq("_dd.p.dm=-0,_dd.p.tid=#{high_order_hex_trace_id(span.trace_id)}")
@@ -78,7 +78,7 @@ def perform; end
             'args' => [],
             'class' => EmptyWorker.to_s,
             'jid' => jid,
-            'x-datadog-trace-id' => log_injection_trace_id_128(trace_id).to_s,
+            'x-datadog-trace-id' => low_order_trace_id(trace_id).to_s,
             'x-datadog-parent-id' => span_id.to_s,
             'x-datadog-sampling-priority' => '2',
             'x-datadog-tags' => "_dd.p.dm=-99,_dd.p.tid=#{high_order_hex_trace_id(trace_id)}",
diff --git a/spec/support/tracer_helpers.rb b/spec/support/tracer_helpers.rb
index c608e30b908..3d02f01a39c 100644
--- a/spec/support/tracer_helpers.rb
+++ b/spec/support/tracer_helpers.rb
@@ -119,6 +119,11 @@ def tracer_shutdown!
     without_warnings { Datadog.send(:reset!) }
   end
 
+  # Wraps call to Tracing::Utils::TraceId.to_low_order for better test readability
+  def low_order_trace_id
+    Datadog::Tracing::Utils::TraceId.to_low_order(trace_id)
+  end
+
   # Ensures the given trace ID is always formatted using the 128-bit logging format
   # by wrapping Tracing::Correlation.format_trace_id(trace_id)
   def log_injection_trace_id_128(trace_id)

From 460f9e02325fad7f459cbc1191ecede3ac97db68 Mon Sep 17 00:00:00 2001
From: Munir Abdinur <munir_abdinur@hotmail.com>
Date: Fri, 21 Mar 2025 13:39:25 -0400
Subject: [PATCH 04/11] update one more test

---
 spec/datadog/tracing/contrib/ethon/shared_examples.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/datadog/tracing/contrib/ethon/shared_examples.rb b/spec/datadog/tracing/contrib/ethon/shared_examples.rb
index 6e231555b58..69edc1b1a26 100644
--- a/spec/datadog/tracing/contrib/ethon/shared_examples.rb
+++ b/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.id.to_s],
-            'x-datadog-trace-id' => [log_injection_trace_id_128(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)

From 5dae125e6ea437f3cb31c6df310aeb6f0cd43078 Mon Sep 17 00:00:00 2001
From: Munir Abdinur <munir_abdinur@hotmail.com>
Date: Fri, 21 Mar 2025 13:40:00 -0400
Subject: [PATCH 05/11] fix helper

---
 spec/support/tracer_helpers.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/support/tracer_helpers.rb b/spec/support/tracer_helpers.rb
index 3d02f01a39c..70fac92349a 100644
--- a/spec/support/tracer_helpers.rb
+++ b/spec/support/tracer_helpers.rb
@@ -120,7 +120,7 @@ def tracer_shutdown!
   end
 
   # Wraps call to Tracing::Utils::TraceId.to_low_order for better test readability
-  def low_order_trace_id
+  def low_order_trace_id(trace_id)
     Datadog::Tracing::Utils::TraceId.to_low_order(trace_id)
   end
 

From 4c220bec07d5d80fe12662fd75156e8abd561e93 Mon Sep 17 00:00:00 2001
From: Munir Abdinur <munir_abdinur@hotmail.com>
Date: Fri, 21 Mar 2025 14:58:54 -0400
Subject: [PATCH 06/11] fix double wrap

---
 .../tracing/contrib/rails/rails_log_auto_injection_spec.rb    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb b/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
index d859adab5a0..e6cd9de8b46 100644
--- a/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
+++ b/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
@@ -486,9 +486,9 @@ def index
 
             rack_rails_logger_entry, my_entry = log_entries
             expect(rack_rails_logger_entry).to include "dd.trace_id=#{
-              log_injection_trace_id_128(log_injection_trace_id_128(trace.id))
+              log_injection_trace_id_128(trace.id)
             }"
-            expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(log_injection_trace_id_128(trace.id))}"
+            expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
           end
         end
       end

From 785c64b59e4e37676be30112a18aac4f2815d873 Mon Sep 17 00:00:00 2001
From: Munir Abdinur <munir_abdinur@hotmail.com>
Date: Fri, 21 Mar 2025 15:03:04 -0400
Subject: [PATCH 07/11] remove redundant to_s

---
 .../contrib/lograge/instrumentation_spec.rb   |  2 +-
 .../contrib/rails/rails_active_job_spec.rb    |  2 +-
 .../rails/rails_log_auto_injection_spec.rb    | 74 +++++++++----------
 ...ils_semantic_logger_auto_injection_spec.rb |  8 +-
 .../semantic_logger/instrumentation_spec.rb   |  8 +-
 spec/datadog/tracing/correlation_spec.rb      |  6 +-
 spec/datadog/tracing/trace_operation_spec.rb  | 18 ++---
 spec/datadog/tracing/tracer_spec.rb           |  2 +-
 8 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb b/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb
index 7fc85724aaa..30d0903ee68 100644
--- a/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb
+++ b/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb
@@ -50,7 +50,7 @@
               env: 'env',
               service: 'service',
               span_id: span_id.to_s,
-              trace_id: log_injection_trace_id_128(trace_id).to_s,
+              trace_id: log_injection_trace_id_128(trace_id),
               version: 'version'
             },
             ddsource: 'ruby' }
diff --git a/spec/datadog/tracing/contrib/rails/rails_active_job_spec.rb b/spec/datadog/tracing/contrib/rails/rails_active_job_spec.rb
index f4b69d16d78..172ab9d9894 100644
--- a/spec/datadog/tracing/contrib/rails/rails_active_job_spec.rb
+++ b/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(log_injection_trace_id_128(span.trace_id).to_s)
+          expect(output).to include(log_injection_trace_id_128(span.trace_id))
         end
       end
 
diff --git a/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb b/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
index e6cd9de8b46..253389df6a0 100644
--- a/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
+++ b/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
@@ -89,9 +89,9 @@ def index
         expect(log_entries).to have(2).items
         rack_rails_logger_entry, my_entry = log_entries
 
-        expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+        expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
 
-        expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+        expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
       end
     end
 
@@ -111,7 +111,7 @@ def index
 
           expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
 
-          expect(my_entry).to include log_injection_trace_id_128(trace.id).to_s
+          expect(my_entry).to include log_injection_trace_id_128(trace.id)
         end
       end
 
@@ -132,7 +132,7 @@ def index
           expect(rack_rails_logger_entry).to include '[some_info]'
           expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-          expect(my_entry).to include log_injection_trace_id_128(trace.id).to_s
+          expect(my_entry).to include log_injection_trace_id_128(trace.id)
           expect(my_entry).to include '[some_info]'
           expect(my_entry).to include '[some_other_info]'
         end
@@ -158,14 +158,14 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
 
               expect(controller_logger_entry).to include log_injection_trace_id_128(
                 log_injection_trace_id_128(trace.id)
               ).to_s
               expect(controller_logger_entry).to include 'ddsource=ruby'
 
-              expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
             end
           end
 
@@ -187,14 +187,14 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
 
-              expect(controller_logger_entry).to include log_injection_trace_id_128(trace.id).to_s
+              expect(controller_logger_entry).to include log_injection_trace_id_128(trace.id)
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_hash_info=test_hash_value'
               expect(controller_logger_entry).to include 'some_other_hash_info=other_test_hash_value'
 
-              expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
             end
           end
 
@@ -222,12 +222,12 @@ def index
                 log_injection_trace_id_128(trace.id)
               ).to_s
 
-              expect(controller_logger_entry).to include log_injection_trace_id_128(trace.id).to_s
+              expect(controller_logger_entry).to include log_injection_trace_id_128(trace.id)
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_lambda_info=test_lambda_value'
               expect(controller_logger_entry).to include 'some_other_lambda_info=other_test_lambda_value'
 
-              expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
             end
           end
         end
@@ -245,11 +245,11 @@ def index
 
             rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-            expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+            expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
 
-            expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+            expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
 
-            expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+            expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id)
           end
         end
       end
@@ -280,7 +280,7 @@ def index
 
               expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
 
-              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id).to_s)).to have(2).times
+              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id))).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
             end
           end
@@ -304,7 +304,7 @@ def index
               expect(my_entry).to include '[some_info]'
               expect(my_entry).to include '[some_other_info]'
 
-              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id).to_s)).to have(2).times
+              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id))).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include '[some_info]'
               expect(controller_logger_entry).to include '[some_other_info]'
@@ -333,7 +333,7 @@ def index
 
               expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
 
-              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id).to_s)).to have(2).times
+              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id))).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_hash_info=test_hash_value'
               expect(controller_logger_entry).to include 'some_other_hash_info=other_test_hash_value'
@@ -364,7 +364,7 @@ def index
 
               expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
 
-              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id).to_s)).to have(2).times
+              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id))).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_lambda_info=test_lambda_value'
               expect(controller_logger_entry).to include 'some_other_lambda_info=other_test_lambda_value'
@@ -399,7 +399,7 @@ def index
               expect(my_entry).to include '[some_info]'
               expect(my_entry).to include '[some_other_info]'
 
-              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id).to_s)).to have(2).times
+              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id))).to have(2).times
               expect(controller_logger_entry).to include '[some_info]'
               expect(controller_logger_entry).to include '[some_other_info]'
               expect(controller_logger_entry).to include 'ddsource=ruby'
@@ -424,9 +424,9 @@ def index
         expect(log_entries).to have(2).item
         rack_rails_logger_entry, my_entry = log_entries
 
-        expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+        expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
 
-        expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+        expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
       end
     end
 
@@ -444,9 +444,9 @@ def index
 
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+          expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
 
-          expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+          expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
         end
       end
 
@@ -461,11 +461,11 @@ def index
 
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+          expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
           expect(rack_rails_logger_entry).to include '[some_info]'
           expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-          expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+          expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
           expect(my_entry).to include '[some_info]'
           expect(my_entry).to include '[some_other_info]'
         end
@@ -513,11 +513,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
 
-              expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
 
-              expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id)
             end
           end
 
@@ -539,11 +539,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
 
-              expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
 
-              expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id)
               expect(controller_logger_entry).to include 'some_hash_info=test_hash_value'
               expect(controller_logger_entry).to include 'some_other_hash_info=other_test_hash_value'
             end
@@ -569,11 +569,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
 
-              expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
 
-              expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+              expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id)
               expect(controller_logger_entry).to include 'some_lambda_info=test_lambda_value'
               expect(controller_logger_entry).to include 'some_other_lambda_info=other_test_lambda_value'
             end
@@ -593,11 +593,11 @@ def index
 
             rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-            expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+            expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
 
-            expect(my_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+            expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
 
-            expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id).to_s
+            expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id)
           end
         end
       end
diff --git a/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb b/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb
index 1d6acedfd04..13441477663 100644
--- a/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb
+++ b/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb
@@ -88,7 +88,7 @@ def index
 
             if defined?(RailsSemanticLogger::ActionView::LogSubscriber) || Rails.version >= '5'
               expect(log_entries).to have(6).items
-              expect(log_entries).to all include log_injection_trace_id_128(trace.id).to_s
+              expect(log_entries).to all include log_injection_trace_id_128(trace.id)
               expect(log_entries).to all include 'ddsource: ruby'
 
               rack_started_entry,
@@ -119,7 +119,7 @@ def index
             else
               expect(log_entries).to have(5).items
 
-              expect(log_entries).to all include log_injection_trace_id_128(trace.id).to_s
+              expect(log_entries).to all include log_injection_trace_id_128(trace.id)
               expect(log_entries).to all include 'ddsource: ruby'
             end
           end
@@ -138,7 +138,7 @@ def index
             if defined?(RailsSemanticLogger::ActionView::LogSubscriber) || Rails.version >= '5'
               expect(log_entries).to have(6).items
 
-              expect(log_entries).to all include(log_injection_trace_id_128(trace.id).to_s)
+              expect(log_entries).to all include(log_injection_trace_id_128(trace.id))
               expect(log_entries).to all include('ddsource: ruby')
               expect(log_entries).to all include('some_tag')
               expect(log_entries).to all include('some_value')
@@ -171,7 +171,7 @@ def index
             else
               expect(log_entries).to have(5).items
 
-              expect(log_entries).to all include(log_injection_trace_id_128(trace.id).to_s)
+              expect(log_entries).to all include(log_injection_trace_id_128(trace.id))
               expect(log_entries).to all include('ddsource: ruby')
               expect(log_entries).to all include('some_tag')
               expect(log_entries).to all include('some_value')
diff --git a/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb b/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb
index 6b5a8f877b2..47b1ac7e9af 100644
--- a/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb
+++ b/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb
@@ -71,7 +71,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).to include 'original: tag'
 
-        expect(log_entry).to include log_injection_trace_id_128(trace_id).to_s
+        expect(log_entry).to include log_injection_trace_id_128(trace_id)
         expect(log_entry).to include span_id.to_s
         expect(log_entry).to include 'production'
         expect(log_entry).to include 'MyService'
@@ -91,7 +91,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).to include 'original: tag'
 
-        expect(log_entry).not_to include log_injection_trace_id_128(trace_id).to_s
+        expect(log_entry).not_to include log_injection_trace_id_128(trace_id)
         expect(log_entry).not_to include span_id.to_s
         expect(log_entry).not_to include 'production'
         expect(log_entry).not_to include 'MyService'
@@ -111,7 +111,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).to include 'original: tag'
 
-        expect(log_entry).not_to include log_injection_trace_id_128(trace_id).to_s
+        expect(log_entry).not_to include log_injection_trace_id_128(trace_id)
         expect(log_entry).not_to include span_id.to_s
         expect(log_entry).not_to include 'production'
         expect(log_entry).not_to include 'MyService'
@@ -137,7 +137,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).not_to include 'original: tag'
 
-        expect(log_entry).to include log_injection_trace_id_128(trace_id).to_s
+        expect(log_entry).to include log_injection_trace_id_128(trace_id)
         expect(log_entry).to include span_id.to_s
         expect(log_entry).to include 'production'
         expect(log_entry).to include 'MyService'
diff --git a/spec/datadog/tracing/correlation_spec.rb b/spec/datadog/tracing/correlation_spec.rb
index 6c7dc7fc5cd..16e4eca862f 100644
--- a/spec/datadog/tracing/correlation_spec.rb
+++ b/spec/datadog/tracing/correlation_spec.rb
@@ -68,7 +68,7 @@
           env: default_env,
           service: default_service,
           span_id: span_id.to_s,
-          trace_id: log_injection_trace_id_128(trace_id).to_s,
+          trace_id: log_injection_trace_id_128(trace_id),
           version: default_version
         )
       end
@@ -189,7 +189,7 @@
             env: env,
             service: service,
             span_id: span_id.to_s,
-            trace_id: log_injection_trace_id_128(trace_id).to_s,
+            trace_id: log_injection_trace_id_128(trace_id),
             version: version
           )
         end
@@ -222,7 +222,7 @@
                 env: 'dev',
                 service: 'acme-api',
                 version: '1.0',
-                trace_id: log_injection_trace_id_128(trace_id).to_s,
+                trace_id: log_injection_trace_id_128(trace_id),
                 span_id: span_id.to_s
               },
               ddsource: 'ruby'
diff --git a/spec/datadog/tracing/trace_operation_spec.rb b/spec/datadog/tracing/trace_operation_spec.rb
index 0c9650cb3cd..dab42a0724b 100644
--- a/spec/datadog/tracing/trace_operation_spec.rb
+++ b/spec/datadog/tracing/trace_operation_spec.rb
@@ -2155,7 +2155,7 @@ def span
         it do
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: log_injection_trace_id_128(trace_op.id).to_s,
+            trace_id: log_injection_trace_id_128(trace_op.id),
           )
         end
       end
@@ -2168,7 +2168,7 @@ def span
       it do
         expect(trace_op.to_correlation).to have_attributes(
           span_id: parent_span_id.to_s,
-          trace_id: log_injection_trace_id_128(trace_op.id).to_s
+          trace_id: log_injection_trace_id_128(trace_op.id)
         )
       end
     end
@@ -2187,7 +2187,7 @@ def span
 
         expect(correlation).to have_attributes(
           span_id: parent_id.to_s,
-          trace_id: log_injection_trace_id_128(trace_op.id).to_s
+          trace_id: log_injection_trace_id_128(trace_op.id)
         )
       end
 
@@ -2208,7 +2208,7 @@ def span
 
           expect(correlation).to have_attributes(
             span_id: parent_id.to_s,
-            trace_id: log_injection_trace_id_128(trace_op.id).to_s
+            trace_id: log_injection_trace_id_128(trace_op.id)
           )
         end
       end
@@ -2221,7 +2221,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: log_injection_trace_id_128(trace_op.id).to_s,
+            trace_id: log_injection_trace_id_128(trace_op.id),
           )
         end
       end
@@ -2232,7 +2232,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: span.id.to_s,
-            trace_id: log_injection_trace_id_128(trace_op.id).to_s,
+            trace_id: log_injection_trace_id_128(trace_op.id),
           )
         end
       end
@@ -2243,7 +2243,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: log_injection_trace_id_128(trace_op.id).to_s,
+            trace_id: log_injection_trace_id_128(trace_op.id),
           )
         end
       end
@@ -2258,7 +2258,7 @@ def span
 
         expect(trace_op.to_correlation).to have_attributes(
           span_id: '0',
-          trace_id: log_injection_trace_id_128(trace_op.id).to_s
+          trace_id: log_injection_trace_id_128(trace_op.id)
         )
       end
 
@@ -2274,7 +2274,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: log_injection_trace_id_128(trace_op.id).to_s
+            trace_id: log_injection_trace_id_128(trace_op.id)
           )
         end
       end
diff --git a/spec/datadog/tracing/tracer_spec.rb b/spec/datadog/tracing/tracer_spec.rb
index 863a09b7b5d..64b4bdc889c 100644
--- a/spec/datadog/tracing/tracer_spec.rb
+++ b/spec/datadog/tracing/tracer_spec.rb
@@ -750,7 +750,7 @@
       it 'produces an Identifier with data' do
         is_expected.to be_a_kind_of(Datadog::Tracing::Correlation::Identifier)
         expect(active_correlation.trace_id)
-          .to eq(log_injection_trace_id_128(span.trace_id).to_s)
+          .to eq(log_injection_trace_id_128(span.trace_id))
         expect(active_correlation.span_id).to eq(span.id.to_s)
       end
     end

From 02deec36894a9e958b550d6c97dbc37b6714a23a Mon Sep 17 00:00:00 2001
From: Munir Abdinur <munir_abdinur@hotmail.com>
Date: Fri, 21 Mar 2025 15:04:17 -0400
Subject: [PATCH 08/11] rename function

---
 .../contrib/lograge/instrumentation_spec.rb   |   2 +-
 .../contrib/rails/rails_active_job_spec.rb    |   2 +-
 .../rails/rails_log_auto_injection_spec.rb    | 110 +++++++++---------
 ...ils_semantic_logger_auto_injection_spec.rb |   8 +-
 .../semantic_logger/instrumentation_spec.rb   |   8 +-
 spec/datadog/tracing/correlation_spec.rb      |   6 +-
 spec/datadog/tracing/trace_operation_spec.rb  |  18 +--
 spec/datadog/tracing/tracer_spec.rb           |   2 +-
 spec/support/tracer_helpers.rb                |   2 +-
 9 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb b/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb
index 30d0903ee68..250b1afadde 100644
--- a/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb
+++ b/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb
@@ -50,7 +50,7 @@
               env: 'env',
               service: 'service',
               span_id: span_id.to_s,
-              trace_id: log_injection_trace_id_128(trace_id),
+              trace_id: trace_id_128_log_injection(trace_id),
               version: 'version'
             },
             ddsource: 'ruby' }
diff --git a/spec/datadog/tracing/contrib/rails/rails_active_job_spec.rb b/spec/datadog/tracing/contrib/rails/rails_active_job_spec.rb
index 172ab9d9894..b8ffe6944cf 100644
--- a/spec/datadog/tracing/contrib/rails/rails_active_job_spec.rb
+++ b/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(log_injection_trace_id_128(span.trace_id))
+          expect(output).to include(trace_id_128_log_injection(span.trace_id))
         end
       end
 
diff --git a/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb b/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
index 253389df6a0..ec9acde0f5b 100644
--- a/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
+++ b/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
@@ -89,9 +89,9 @@ def index
         expect(log_entries).to have(2).items
         rack_rails_logger_entry, my_entry = log_entries
 
-        expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+        expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
 
-        expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
+        expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
       end
     end
 
@@ -109,9 +109,9 @@ def index
           expect(log_entries).to have(2).items
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
+          expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
 
-          expect(my_entry).to include log_injection_trace_id_128(trace.id)
+          expect(my_entry).to include trace_id_128_log_injection(trace.id)
         end
       end
 
@@ -128,11 +128,11 @@ def index
           expect(log_entries).to have(2).items
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
+          expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
           expect(rack_rails_logger_entry).to include '[some_info]'
           expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-          expect(my_entry).to include log_injection_trace_id_128(trace.id)
+          expect(my_entry).to include trace_id_128_log_injection(trace.id)
           expect(my_entry).to include '[some_info]'
           expect(my_entry).to include '[some_other_info]'
         end
@@ -158,14 +158,14 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
 
-              expect(controller_logger_entry).to include log_injection_trace_id_128(
-                log_injection_trace_id_128(trace.id)
+              expect(controller_logger_entry).to include trace_id_128_log_injection(
+                trace_id_128_log_injection(trace.id)
               ).to_s
               expect(controller_logger_entry).to include 'ddsource=ruby'
 
-              expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
             end
           end
 
@@ -187,14 +187,14 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
 
-              expect(controller_logger_entry).to include log_injection_trace_id_128(trace.id)
+              expect(controller_logger_entry).to include trace_id_128_log_injection(trace.id)
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_hash_info=test_hash_value'
               expect(controller_logger_entry).to include 'some_other_hash_info=other_test_hash_value'
 
-              expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
             end
           end
 
@@ -218,16 +218,16 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(
-                log_injection_trace_id_128(trace.id)
+              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(
+                trace_id_128_log_injection(trace.id)
               ).to_s
 
-              expect(controller_logger_entry).to include log_injection_trace_id_128(trace.id)
+              expect(controller_logger_entry).to include trace_id_128_log_injection(trace.id)
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_lambda_info=test_lambda_value'
               expect(controller_logger_entry).to include 'some_other_lambda_info=other_test_lambda_value'
 
-              expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
             end
           end
         end
@@ -245,11 +245,11 @@ def index
 
             rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-            expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+            expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
 
-            expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
+            expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
 
-            expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+            expect(controller_logger_entry).not_to include trace_id_128_log_injection(trace.id)
           end
         end
       end
@@ -276,11 +276,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
 
-              expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
 
-              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id))).to have(2).times
+              expect(controller_logger_entry.scan(trace_id_128_log_injection(trace.id))).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
             end
           end
@@ -296,15 +296,15 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
               expect(rack_rails_logger_entry).to include '[some_info]'
               expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-              expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
               expect(my_entry).to include '[some_info]'
               expect(my_entry).to include '[some_other_info]'
 
-              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id))).to have(2).times
+              expect(controller_logger_entry.scan(trace_id_128_log_injection(trace.id))).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include '[some_info]'
               expect(controller_logger_entry).to include '[some_other_info]'
@@ -329,11 +329,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
 
-              expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
 
-              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id))).to have(2).times
+              expect(controller_logger_entry.scan(trace_id_128_log_injection(trace.id))).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_hash_info=test_hash_value'
               expect(controller_logger_entry).to include 'some_other_hash_info=other_test_hash_value'
@@ -360,11 +360,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
 
-              expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
 
-              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id))).to have(2).times
+              expect(controller_logger_entry.scan(trace_id_128_log_injection(trace.id))).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_lambda_info=test_lambda_value'
               expect(controller_logger_entry).to include 'some_other_lambda_info=other_test_lambda_value'
@@ -391,15 +391,15 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
               expect(rack_rails_logger_entry).to include '[some_info]'
               expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-              expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
               expect(my_entry).to include '[some_info]'
               expect(my_entry).to include '[some_other_info]'
 
-              expect(controller_logger_entry.scan(log_injection_trace_id_128(trace.id))).to have(2).times
+              expect(controller_logger_entry.scan(trace_id_128_log_injection(trace.id))).to have(2).times
               expect(controller_logger_entry).to include '[some_info]'
               expect(controller_logger_entry).to include '[some_other_info]'
               expect(controller_logger_entry).to include 'ddsource=ruby'
@@ -424,9 +424,9 @@ def index
         expect(log_entries).to have(2).item
         rack_rails_logger_entry, my_entry = log_entries
 
-        expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+        expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
 
-        expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
+        expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
       end
     end
 
@@ -444,9 +444,9 @@ def index
 
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+          expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
 
-          expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
+          expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
         end
       end
 
@@ -461,11 +461,11 @@ def index
 
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+          expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
           expect(rack_rails_logger_entry).to include '[some_info]'
           expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-          expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
+          expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
           expect(my_entry).to include '[some_info]'
           expect(my_entry).to include '[some_other_info]'
         end
@@ -486,9 +486,9 @@ def index
 
             rack_rails_logger_entry, my_entry = log_entries
             expect(rack_rails_logger_entry).to include "dd.trace_id=#{
-              log_injection_trace_id_128(trace.id)
+              trace_id_128_log_injection(trace.id)
             }"
-            expect(my_entry).to include "dd.trace_id=#{log_injection_trace_id_128(trace.id)}"
+            expect(my_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
           end
         end
       end
@@ -513,11 +513,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
 
-              expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
 
-              expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(controller_logger_entry).not_to include trace_id_128_log_injection(trace.id)
             end
           end
 
@@ -539,11 +539,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
 
-              expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
 
-              expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(controller_logger_entry).not_to include trace_id_128_log_injection(trace.id)
               expect(controller_logger_entry).to include 'some_hash_info=test_hash_value'
               expect(controller_logger_entry).to include 'some_other_hash_info=other_test_hash_value'
             end
@@ -569,11 +569,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
 
-              expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
 
-              expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+              expect(controller_logger_entry).not_to include trace_id_128_log_injection(trace.id)
               expect(controller_logger_entry).to include 'some_lambda_info=test_lambda_value'
               expect(controller_logger_entry).to include 'some_other_lambda_info=other_test_lambda_value'
             end
@@ -593,11 +593,11 @@ def index
 
             rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-            expect(rack_rails_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+            expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
 
-            expect(my_entry).not_to include log_injection_trace_id_128(trace.id)
+            expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
 
-            expect(controller_logger_entry).not_to include log_injection_trace_id_128(trace.id)
+            expect(controller_logger_entry).not_to include trace_id_128_log_injection(trace.id)
           end
         end
       end
diff --git a/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb b/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb
index 13441477663..5d6c6358634 100644
--- a/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb
+++ b/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb
@@ -88,7 +88,7 @@ def index
 
             if defined?(RailsSemanticLogger::ActionView::LogSubscriber) || Rails.version >= '5'
               expect(log_entries).to have(6).items
-              expect(log_entries).to all include log_injection_trace_id_128(trace.id)
+              expect(log_entries).to all include trace_id_128_log_injection(trace.id)
               expect(log_entries).to all include 'ddsource: ruby'
 
               rack_started_entry,
@@ -119,7 +119,7 @@ def index
             else
               expect(log_entries).to have(5).items
 
-              expect(log_entries).to all include log_injection_trace_id_128(trace.id)
+              expect(log_entries).to all include trace_id_128_log_injection(trace.id)
               expect(log_entries).to all include 'ddsource: ruby'
             end
           end
@@ -138,7 +138,7 @@ def index
             if defined?(RailsSemanticLogger::ActionView::LogSubscriber) || Rails.version >= '5'
               expect(log_entries).to have(6).items
 
-              expect(log_entries).to all include(log_injection_trace_id_128(trace.id))
+              expect(log_entries).to all include(trace_id_128_log_injection(trace.id))
               expect(log_entries).to all include('ddsource: ruby')
               expect(log_entries).to all include('some_tag')
               expect(log_entries).to all include('some_value')
@@ -171,7 +171,7 @@ def index
             else
               expect(log_entries).to have(5).items
 
-              expect(log_entries).to all include(log_injection_trace_id_128(trace.id))
+              expect(log_entries).to all include(trace_id_128_log_injection(trace.id))
               expect(log_entries).to all include('ddsource: ruby')
               expect(log_entries).to all include('some_tag')
               expect(log_entries).to all include('some_value')
diff --git a/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb b/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb
index 47b1ac7e9af..5922368743d 100644
--- a/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb
+++ b/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb
@@ -71,7 +71,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).to include 'original: tag'
 
-        expect(log_entry).to include log_injection_trace_id_128(trace_id)
+        expect(log_entry).to include trace_id_128_log_injection(trace_id)
         expect(log_entry).to include span_id.to_s
         expect(log_entry).to include 'production'
         expect(log_entry).to include 'MyService'
@@ -91,7 +91,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).to include 'original: tag'
 
-        expect(log_entry).not_to include log_injection_trace_id_128(trace_id)
+        expect(log_entry).not_to include trace_id_128_log_injection(trace_id)
         expect(log_entry).not_to include span_id.to_s
         expect(log_entry).not_to include 'production'
         expect(log_entry).not_to include 'MyService'
@@ -111,7 +111,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).to include 'original: tag'
 
-        expect(log_entry).not_to include log_injection_trace_id_128(trace_id)
+        expect(log_entry).not_to include trace_id_128_log_injection(trace_id)
         expect(log_entry).not_to include span_id.to_s
         expect(log_entry).not_to include 'production'
         expect(log_entry).not_to include 'MyService'
@@ -137,7 +137,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).not_to include 'original: tag'
 
-        expect(log_entry).to include log_injection_trace_id_128(trace_id)
+        expect(log_entry).to include trace_id_128_log_injection(trace_id)
         expect(log_entry).to include span_id.to_s
         expect(log_entry).to include 'production'
         expect(log_entry).to include 'MyService'
diff --git a/spec/datadog/tracing/correlation_spec.rb b/spec/datadog/tracing/correlation_spec.rb
index 16e4eca862f..4456ceb8a2a 100644
--- a/spec/datadog/tracing/correlation_spec.rb
+++ b/spec/datadog/tracing/correlation_spec.rb
@@ -68,7 +68,7 @@
           env: default_env,
           service: default_service,
           span_id: span_id.to_s,
-          trace_id: log_injection_trace_id_128(trace_id),
+          trace_id: trace_id_128_log_injection(trace_id),
           version: default_version
         )
       end
@@ -189,7 +189,7 @@
             env: env,
             service: service,
             span_id: span_id.to_s,
-            trace_id: log_injection_trace_id_128(trace_id),
+            trace_id: trace_id_128_log_injection(trace_id),
             version: version
           )
         end
@@ -222,7 +222,7 @@
                 env: 'dev',
                 service: 'acme-api',
                 version: '1.0',
-                trace_id: log_injection_trace_id_128(trace_id),
+                trace_id: trace_id_128_log_injection(trace_id),
                 span_id: span_id.to_s
               },
               ddsource: 'ruby'
diff --git a/spec/datadog/tracing/trace_operation_spec.rb b/spec/datadog/tracing/trace_operation_spec.rb
index dab42a0724b..7abce34670a 100644
--- a/spec/datadog/tracing/trace_operation_spec.rb
+++ b/spec/datadog/tracing/trace_operation_spec.rb
@@ -2155,7 +2155,7 @@ def span
         it do
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: log_injection_trace_id_128(trace_op.id),
+            trace_id: trace_id_128_log_injection(trace_op.id),
           )
         end
       end
@@ -2168,7 +2168,7 @@ def span
       it do
         expect(trace_op.to_correlation).to have_attributes(
           span_id: parent_span_id.to_s,
-          trace_id: log_injection_trace_id_128(trace_op.id)
+          trace_id: trace_id_128_log_injection(trace_op.id)
         )
       end
     end
@@ -2187,7 +2187,7 @@ def span
 
         expect(correlation).to have_attributes(
           span_id: parent_id.to_s,
-          trace_id: log_injection_trace_id_128(trace_op.id)
+          trace_id: trace_id_128_log_injection(trace_op.id)
         )
       end
 
@@ -2208,7 +2208,7 @@ def span
 
           expect(correlation).to have_attributes(
             span_id: parent_id.to_s,
-            trace_id: log_injection_trace_id_128(trace_op.id)
+            trace_id: trace_id_128_log_injection(trace_op.id)
           )
         end
       end
@@ -2221,7 +2221,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: log_injection_trace_id_128(trace_op.id),
+            trace_id: trace_id_128_log_injection(trace_op.id),
           )
         end
       end
@@ -2232,7 +2232,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: span.id.to_s,
-            trace_id: log_injection_trace_id_128(trace_op.id),
+            trace_id: trace_id_128_log_injection(trace_op.id),
           )
         end
       end
@@ -2243,7 +2243,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: log_injection_trace_id_128(trace_op.id),
+            trace_id: trace_id_128_log_injection(trace_op.id),
           )
         end
       end
@@ -2258,7 +2258,7 @@ def span
 
         expect(trace_op.to_correlation).to have_attributes(
           span_id: '0',
-          trace_id: log_injection_trace_id_128(trace_op.id)
+          trace_id: trace_id_128_log_injection(trace_op.id)
         )
       end
 
@@ -2274,7 +2274,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: log_injection_trace_id_128(trace_op.id)
+            trace_id: trace_id_128_log_injection(trace_op.id)
           )
         end
       end
diff --git a/spec/datadog/tracing/tracer_spec.rb b/spec/datadog/tracing/tracer_spec.rb
index 64b4bdc889c..c12810edb9b 100644
--- a/spec/datadog/tracing/tracer_spec.rb
+++ b/spec/datadog/tracing/tracer_spec.rb
@@ -750,7 +750,7 @@
       it 'produces an Identifier with data' do
         is_expected.to be_a_kind_of(Datadog::Tracing::Correlation::Identifier)
         expect(active_correlation.trace_id)
-          .to eq(log_injection_trace_id_128(span.trace_id))
+          .to eq(trace_id_128_log_injection(span.trace_id))
         expect(active_correlation.span_id).to eq(span.id.to_s)
       end
     end
diff --git a/spec/support/tracer_helpers.rb b/spec/support/tracer_helpers.rb
index 70fac92349a..16f379f5caf 100644
--- a/spec/support/tracer_helpers.rb
+++ b/spec/support/tracer_helpers.rb
@@ -126,7 +126,7 @@ def low_order_trace_id(trace_id)
 
   # Ensures the given trace ID is always formatted using the 128-bit logging format
   # by wrapping Tracing::Correlation.format_trace_id(trace_id)
-  def log_injection_trace_id_128(trace_id)
+  def trace_id_128_log_injection(trace_id)
     RSpec::Mocks.with_temporary_scope do
       allow(Datadog.configuration.tracing).to receive(:trace_id_128_bit_logging_enabled).and_return(true)
       Datadog::Tracing::Correlation.format_trace_id(trace_id)

From 41d76f41f4d62b5efa8762a0a99a50aa9c53e1b0 Mon Sep 17 00:00:00 2001
From: Munir Abdinur <munir_abdinur@hotmail.com>
Date: Mon, 24 Mar 2025 09:28:22 -0400
Subject: [PATCH 09/11] fix broken logger test

---
 .../contrib/rails/rails_log_auto_injection_spec.rb        | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb b/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
index ec9acde0f5b..6259424693d 100644
--- a/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
+++ b/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
@@ -160,9 +160,7 @@ def index
 
               expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
 
-              expect(controller_logger_entry).to include trace_id_128_log_injection(
-                trace_id_128_log_injection(trace.id)
-              ).to_s
+              expect(controller_logger_entry).to include trace_id_128_log_injection(trace.id)
               expect(controller_logger_entry).to include 'ddsource=ruby'
 
               expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
@@ -218,9 +216,7 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(
-                trace_id_128_log_injection(trace.id)
-              ).to_s
+              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
 
               expect(controller_logger_entry).to include trace_id_128_log_injection(trace.id)
               expect(controller_logger_entry).to include 'ddsource=ruby'

From 20fc9359698ffdcd79ab22e401c9cd1ae40ffaa5 Mon Sep 17 00:00:00 2001
From: Munir Abdinur <munir_abdinur@hotmail.com>
Date: Thu, 27 Mar 2025 13:05:56 -0400
Subject: [PATCH 10/11] remove spec mocking

---
 lib/datadog/tracing/correlation.rb | 11 +++++++++--
 spec/support/tracer_helpers.rb     |  9 +++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lib/datadog/tracing/correlation.rb b/lib/datadog/tracing/correlation.rb
index 831608c83d0..ec6ca828f6f 100644
--- a/lib/datadog/tracing/correlation.rb
+++ b/lib/datadog/tracing/correlation.rb
@@ -94,8 +94,15 @@ def identifier_from_digest(digest)
       end
 
       def format_trace_id(trace_id)
-        if Datadog.configuration.tracing.trace_id_128_bit_logging_enabled &&
-            !Tracing::Utils::TraceId.to_high_order(trace_id).zero?
+        if Datadog.configuration.tracing.trace_id_128_bit_logging_enabled
+          format_trace_id_128(trace_id)
+        else
+          Tracing::Utils::TraceId.to_low_order(trace_id).to_s
+        end
+      end
+
+      def format_trace_id_128(trace_id)
+        if !Tracing::Utils::TraceId.to_high_order(trace_id).zero?
           Kernel.format('%032x', trace_id)
         else
           Tracing::Utils::TraceId.to_low_order(trace_id).to_s
diff --git a/spec/support/tracer_helpers.rb b/spec/support/tracer_helpers.rb
index 16f379f5caf..547bf928476 100644
--- a/spec/support/tracer_helpers.rb
+++ b/spec/support/tracer_helpers.rb
@@ -1,4 +1,5 @@
 require 'datadog/tracing/tracer'
+require 'datadog/tracing/correlation'
 require 'datadog/tracing/trace_operation'
 require 'support/faux_writer'
 require 'datadog/tracing/utils'
@@ -124,13 +125,9 @@ def low_order_trace_id(trace_id)
     Datadog::Tracing::Utils::TraceId.to_low_order(trace_id)
   end
 
-  # Ensures the given trace ID is always formatted using the 128-bit logging format
-  # by wrapping Tracing::Correlation.format_trace_id(trace_id)
+  ## Wraps call to Datadog::Tracing::Correlation.format_trace_id_128 for better test readability
   def trace_id_128_log_injection(trace_id)
-    RSpec::Mocks.with_temporary_scope do
-      allow(Datadog.configuration.tracing).to receive(:trace_id_128_bit_logging_enabled).and_return(true)
-      Datadog::Tracing::Correlation.format_trace_id(trace_id)
-    end
+    Datadog::Tracing::Correlation.format_trace_id_128(trace_id)
   end
 
   # Wraps call to Tracing::Utils::TraceId.to_high_order and converts to hex

From 5c65c0cf24d9f97255f76f5df599e5a8dfab892f Mon Sep 17 00:00:00 2001
From: Munir Abdinur <munir_abdinur@hotmail.com>
Date: Thu, 27 Mar 2025 14:32:27 -0400
Subject: [PATCH 11/11] format for correlation

---
 .../contrib/lograge/instrumentation_spec.rb   |   2 +-
 .../contrib/rails/rails_active_job_spec.rb    |   2 +-
 .../rails/rails_log_auto_injection_spec.rb    | 106 +++++++++---------
 ...ils_semantic_logger_auto_injection_spec.rb |   8 +-
 .../semantic_logger/instrumentation_spec.rb   |   8 +-
 spec/datadog/tracing/correlation_spec.rb      |   6 +-
 spec/datadog/tracing/trace_operation_spec.rb  |  18 +--
 spec/datadog/tracing/tracer_spec.rb           |   2 +-
 spec/support/tracer_helpers.rb                |   2 +-
 9 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb b/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb
index 250b1afadde..ad5fa0eb99c 100644
--- a/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb
+++ b/spec/datadog/tracing/contrib/lograge/instrumentation_spec.rb
@@ -50,7 +50,7 @@
               env: 'env',
               service: 'service',
               span_id: span_id.to_s,
-              trace_id: trace_id_128_log_injection(trace_id),
+              trace_id: format_for_correlation(trace_id),
               version: 'version'
             },
             ddsource: 'ruby' }
diff --git a/spec/datadog/tracing/contrib/rails/rails_active_job_spec.rb b/spec/datadog/tracing/contrib/rails/rails_active_job_spec.rb
index b8ffe6944cf..08bf470fa58 100644
--- a/spec/datadog/tracing/contrib/rails/rails_active_job_spec.rb
+++ b/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(trace_id_128_log_injection(span.trace_id))
+          expect(output).to include(format_for_correlation(span.trace_id))
         end
       end
 
diff --git a/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb b/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
index 6259424693d..d3dfbffbf6b 100644
--- a/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
+++ b/spec/datadog/tracing/contrib/rails/rails_log_auto_injection_spec.rb
@@ -89,9 +89,9 @@ def index
         expect(log_entries).to have(2).items
         rack_rails_logger_entry, my_entry = log_entries
 
-        expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+        expect(rack_rails_logger_entry).not_to include format_for_correlation(trace.id)
 
-        expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
+        expect(my_entry).not_to include format_for_correlation(trace.id)
       end
     end
 
@@ -109,9 +109,9 @@ def index
           expect(log_entries).to have(2).items
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
+          expect(rack_rails_logger_entry).to include "dd.trace_id=#{format_for_correlation(trace.id)}"
 
-          expect(my_entry).to include trace_id_128_log_injection(trace.id)
+          expect(my_entry).to include format_for_correlation(trace.id)
         end
       end
 
@@ -128,11 +128,11 @@ def index
           expect(log_entries).to have(2).items
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
+          expect(rack_rails_logger_entry).to include "dd.trace_id=#{format_for_correlation(trace.id)}"
           expect(rack_rails_logger_entry).to include '[some_info]'
           expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-          expect(my_entry).to include trace_id_128_log_injection(trace.id)
+          expect(my_entry).to include format_for_correlation(trace.id)
           expect(my_entry).to include '[some_info]'
           expect(my_entry).to include '[some_other_info]'
         end
@@ -158,12 +158,12 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(rack_rails_logger_entry).not_to include format_for_correlation(trace.id)
 
-              expect(controller_logger_entry).to include trace_id_128_log_injection(trace.id)
+              expect(controller_logger_entry).to include format_for_correlation(trace.id)
               expect(controller_logger_entry).to include 'ddsource=ruby'
 
-              expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(my_entry).not_to include format_for_correlation(trace.id)
             end
           end
 
@@ -185,14 +185,14 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(rack_rails_logger_entry).not_to include format_for_correlation(trace.id)
 
-              expect(controller_logger_entry).to include trace_id_128_log_injection(trace.id)
+              expect(controller_logger_entry).to include format_for_correlation(trace.id)
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_hash_info=test_hash_value'
               expect(controller_logger_entry).to include 'some_other_hash_info=other_test_hash_value'
 
-              expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(my_entry).not_to include format_for_correlation(trace.id)
             end
           end
 
@@ -216,14 +216,14 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(rack_rails_logger_entry).not_to include format_for_correlation(trace.id)
 
-              expect(controller_logger_entry).to include trace_id_128_log_injection(trace.id)
+              expect(controller_logger_entry).to include format_for_correlation(trace.id)
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_lambda_info=test_lambda_value'
               expect(controller_logger_entry).to include 'some_other_lambda_info=other_test_lambda_value'
 
-              expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(my_entry).not_to include format_for_correlation(trace.id)
             end
           end
         end
@@ -241,11 +241,11 @@ def index
 
             rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-            expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+            expect(rack_rails_logger_entry).not_to include format_for_correlation(trace.id)
 
-            expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
+            expect(my_entry).not_to include format_for_correlation(trace.id)
 
-            expect(controller_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+            expect(controller_logger_entry).not_to include format_for_correlation(trace.id)
           end
         end
       end
@@ -272,11 +272,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{format_for_correlation(trace.id)}"
 
-              expect(my_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{format_for_correlation(trace.id)}"
 
-              expect(controller_logger_entry.scan(trace_id_128_log_injection(trace.id))).to have(2).times
+              expect(controller_logger_entry.scan(format_for_correlation(trace.id))).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
             end
           end
@@ -292,15 +292,15 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{format_for_correlation(trace.id)}"
               expect(rack_rails_logger_entry).to include '[some_info]'
               expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-              expect(my_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{format_for_correlation(trace.id)}"
               expect(my_entry).to include '[some_info]'
               expect(my_entry).to include '[some_other_info]'
 
-              expect(controller_logger_entry.scan(trace_id_128_log_injection(trace.id))).to have(2).times
+              expect(controller_logger_entry.scan(format_for_correlation(trace.id))).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include '[some_info]'
               expect(controller_logger_entry).to include '[some_other_info]'
@@ -325,11 +325,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{format_for_correlation(trace.id)}"
 
-              expect(my_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{format_for_correlation(trace.id)}"
 
-              expect(controller_logger_entry.scan(trace_id_128_log_injection(trace.id))).to have(2).times
+              expect(controller_logger_entry.scan(format_for_correlation(trace.id))).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_hash_info=test_hash_value'
               expect(controller_logger_entry).to include 'some_other_hash_info=other_test_hash_value'
@@ -356,11 +356,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{format_for_correlation(trace.id)}"
 
-              expect(my_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{format_for_correlation(trace.id)}"
 
-              expect(controller_logger_entry.scan(trace_id_128_log_injection(trace.id))).to have(2).times
+              expect(controller_logger_entry.scan(format_for_correlation(trace.id))).to have(2).times
               expect(controller_logger_entry).to include 'ddsource=ruby'
               expect(controller_logger_entry).to include 'some_lambda_info=test_lambda_value'
               expect(controller_logger_entry).to include 'some_other_lambda_info=other_test_lambda_value'
@@ -387,15 +387,15 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
+              expect(rack_rails_logger_entry).to include "dd.trace_id=#{format_for_correlation(trace.id)}"
               expect(rack_rails_logger_entry).to include '[some_info]'
               expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-              expect(my_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
+              expect(my_entry).to include "dd.trace_id=#{format_for_correlation(trace.id)}"
               expect(my_entry).to include '[some_info]'
               expect(my_entry).to include '[some_other_info]'
 
-              expect(controller_logger_entry.scan(trace_id_128_log_injection(trace.id))).to have(2).times
+              expect(controller_logger_entry.scan(format_for_correlation(trace.id))).to have(2).times
               expect(controller_logger_entry).to include '[some_info]'
               expect(controller_logger_entry).to include '[some_other_info]'
               expect(controller_logger_entry).to include 'ddsource=ruby'
@@ -420,9 +420,9 @@ def index
         expect(log_entries).to have(2).item
         rack_rails_logger_entry, my_entry = log_entries
 
-        expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+        expect(rack_rails_logger_entry).not_to include format_for_correlation(trace.id)
 
-        expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
+        expect(my_entry).not_to include format_for_correlation(trace.id)
       end
     end
 
@@ -440,9 +440,9 @@ def index
 
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+          expect(rack_rails_logger_entry).not_to include format_for_correlation(trace.id)
 
-          expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
+          expect(my_entry).not_to include format_for_correlation(trace.id)
         end
       end
 
@@ -457,11 +457,11 @@ def index
 
           rack_rails_logger_entry, my_entry = log_entries
 
-          expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+          expect(rack_rails_logger_entry).not_to include format_for_correlation(trace.id)
           expect(rack_rails_logger_entry).to include '[some_info]'
           expect(rack_rails_logger_entry).to include '[some_other_info]'
 
-          expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
+          expect(my_entry).not_to include format_for_correlation(trace.id)
           expect(my_entry).to include '[some_info]'
           expect(my_entry).to include '[some_other_info]'
         end
@@ -482,9 +482,9 @@ def index
 
             rack_rails_logger_entry, my_entry = log_entries
             expect(rack_rails_logger_entry).to include "dd.trace_id=#{
-              trace_id_128_log_injection(trace.id)
+              format_for_correlation(trace.id)
             }"
-            expect(my_entry).to include "dd.trace_id=#{trace_id_128_log_injection(trace.id)}"
+            expect(my_entry).to include "dd.trace_id=#{format_for_correlation(trace.id)}"
           end
         end
       end
@@ -509,11 +509,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(rack_rails_logger_entry).not_to include format_for_correlation(trace.id)
 
-              expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(my_entry).not_to include format_for_correlation(trace.id)
 
-              expect(controller_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(controller_logger_entry).not_to include format_for_correlation(trace.id)
             end
           end
 
@@ -535,11 +535,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(rack_rails_logger_entry).not_to include format_for_correlation(trace.id)
 
-              expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(my_entry).not_to include format_for_correlation(trace.id)
 
-              expect(controller_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(controller_logger_entry).not_to include format_for_correlation(trace.id)
               expect(controller_logger_entry).to include 'some_hash_info=test_hash_value'
               expect(controller_logger_entry).to include 'some_other_hash_info=other_test_hash_value'
             end
@@ -565,11 +565,11 @@ def index
 
               rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-              expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(rack_rails_logger_entry).not_to include format_for_correlation(trace.id)
 
-              expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(my_entry).not_to include format_for_correlation(trace.id)
 
-              expect(controller_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+              expect(controller_logger_entry).not_to include format_for_correlation(trace.id)
               expect(controller_logger_entry).to include 'some_lambda_info=test_lambda_value'
               expect(controller_logger_entry).to include 'some_other_lambda_info=other_test_lambda_value'
             end
@@ -589,11 +589,11 @@ def index
 
             rack_rails_logger_entry, my_entry, controller_logger_entry = log_entries
 
-            expect(rack_rails_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+            expect(rack_rails_logger_entry).not_to include format_for_correlation(trace.id)
 
-            expect(my_entry).not_to include trace_id_128_log_injection(trace.id)
+            expect(my_entry).not_to include format_for_correlation(trace.id)
 
-            expect(controller_logger_entry).not_to include trace_id_128_log_injection(trace.id)
+            expect(controller_logger_entry).not_to include format_for_correlation(trace.id)
           end
         end
       end
diff --git a/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb b/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb
index 5d6c6358634..214fa0dac0f 100644
--- a/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb
+++ b/spec/datadog/tracing/contrib/rails/rails_semantic_logger_auto_injection_spec.rb
@@ -88,7 +88,7 @@ def index
 
             if defined?(RailsSemanticLogger::ActionView::LogSubscriber) || Rails.version >= '5'
               expect(log_entries).to have(6).items
-              expect(log_entries).to all include trace_id_128_log_injection(trace.id)
+              expect(log_entries).to all include format_for_correlation(trace.id)
               expect(log_entries).to all include 'ddsource: ruby'
 
               rack_started_entry,
@@ -119,7 +119,7 @@ def index
             else
               expect(log_entries).to have(5).items
 
-              expect(log_entries).to all include trace_id_128_log_injection(trace.id)
+              expect(log_entries).to all include format_for_correlation(trace.id)
               expect(log_entries).to all include 'ddsource: ruby'
             end
           end
@@ -138,7 +138,7 @@ def index
             if defined?(RailsSemanticLogger::ActionView::LogSubscriber) || Rails.version >= '5'
               expect(log_entries).to have(6).items
 
-              expect(log_entries).to all include(trace_id_128_log_injection(trace.id))
+              expect(log_entries).to all include(format_for_correlation(trace.id))
               expect(log_entries).to all include('ddsource: ruby')
               expect(log_entries).to all include('some_tag')
               expect(log_entries).to all include('some_value')
@@ -171,7 +171,7 @@ def index
             else
               expect(log_entries).to have(5).items
 
-              expect(log_entries).to all include(trace_id_128_log_injection(trace.id))
+              expect(log_entries).to all include(format_for_correlation(trace.id))
               expect(log_entries).to all include('ddsource: ruby')
               expect(log_entries).to all include('some_tag')
               expect(log_entries).to all include('some_value')
diff --git a/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb b/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb
index 5922368743d..cb175cbcd77 100644
--- a/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb
+++ b/spec/datadog/tracing/contrib/semantic_logger/instrumentation_spec.rb
@@ -71,7 +71,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).to include 'original: tag'
 
-        expect(log_entry).to include trace_id_128_log_injection(trace_id)
+        expect(log_entry).to include format_for_correlation(trace_id)
         expect(log_entry).to include span_id.to_s
         expect(log_entry).to include 'production'
         expect(log_entry).to include 'MyService'
@@ -91,7 +91,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).to include 'original: tag'
 
-        expect(log_entry).not_to include trace_id_128_log_injection(trace_id)
+        expect(log_entry).not_to include format_for_correlation(trace_id)
         expect(log_entry).not_to include span_id.to_s
         expect(log_entry).not_to include 'production'
         expect(log_entry).not_to include 'MyService'
@@ -111,7 +111,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).to include 'original: tag'
 
-        expect(log_entry).not_to include trace_id_128_log_injection(trace_id)
+        expect(log_entry).not_to include format_for_correlation(trace_id)
         expect(log_entry).not_to include span_id.to_s
         expect(log_entry).not_to include 'production'
         expect(log_entry).not_to include 'MyService'
@@ -137,7 +137,7 @@
         expect(log_entry).to include 'Mamamia!'
         expect(log_entry).not_to include 'original: tag'
 
-        expect(log_entry).to include trace_id_128_log_injection(trace_id)
+        expect(log_entry).to include format_for_correlation(trace_id)
         expect(log_entry).to include span_id.to_s
         expect(log_entry).to include 'production'
         expect(log_entry).to include 'MyService'
diff --git a/spec/datadog/tracing/correlation_spec.rb b/spec/datadog/tracing/correlation_spec.rb
index 4456ceb8a2a..b8027fc4b2e 100644
--- a/spec/datadog/tracing/correlation_spec.rb
+++ b/spec/datadog/tracing/correlation_spec.rb
@@ -68,7 +68,7 @@
           env: default_env,
           service: default_service,
           span_id: span_id.to_s,
-          trace_id: trace_id_128_log_injection(trace_id),
+          trace_id: format_for_correlation(trace_id),
           version: default_version
         )
       end
@@ -189,7 +189,7 @@
             env: env,
             service: service,
             span_id: span_id.to_s,
-            trace_id: trace_id_128_log_injection(trace_id),
+            trace_id: format_for_correlation(trace_id),
             version: version
           )
         end
@@ -222,7 +222,7 @@
                 env: 'dev',
                 service: 'acme-api',
                 version: '1.0',
-                trace_id: trace_id_128_log_injection(trace_id),
+                trace_id: format_for_correlation(trace_id),
                 span_id: span_id.to_s
               },
               ddsource: 'ruby'
diff --git a/spec/datadog/tracing/trace_operation_spec.rb b/spec/datadog/tracing/trace_operation_spec.rb
index 7abce34670a..65dfdb7ad98 100644
--- a/spec/datadog/tracing/trace_operation_spec.rb
+++ b/spec/datadog/tracing/trace_operation_spec.rb
@@ -2155,7 +2155,7 @@ def span
         it do
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: trace_id_128_log_injection(trace_op.id),
+            trace_id: format_for_correlation(trace_op.id),
           )
         end
       end
@@ -2168,7 +2168,7 @@ def span
       it do
         expect(trace_op.to_correlation).to have_attributes(
           span_id: parent_span_id.to_s,
-          trace_id: trace_id_128_log_injection(trace_op.id)
+          trace_id: format_for_correlation(trace_op.id)
         )
       end
     end
@@ -2187,7 +2187,7 @@ def span
 
         expect(correlation).to have_attributes(
           span_id: parent_id.to_s,
-          trace_id: trace_id_128_log_injection(trace_op.id)
+          trace_id: format_for_correlation(trace_op.id)
         )
       end
 
@@ -2208,7 +2208,7 @@ def span
 
           expect(correlation).to have_attributes(
             span_id: parent_id.to_s,
-            trace_id: trace_id_128_log_injection(trace_op.id)
+            trace_id: format_for_correlation(trace_op.id)
           )
         end
       end
@@ -2221,7 +2221,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: trace_id_128_log_injection(trace_op.id),
+            trace_id: format_for_correlation(trace_op.id),
           )
         end
       end
@@ -2232,7 +2232,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: span.id.to_s,
-            trace_id: trace_id_128_log_injection(trace_op.id),
+            trace_id: format_for_correlation(trace_op.id),
           )
         end
       end
@@ -2243,7 +2243,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: trace_id_128_log_injection(trace_op.id),
+            trace_id: format_for_correlation(trace_op.id),
           )
         end
       end
@@ -2258,7 +2258,7 @@ def span
 
         expect(trace_op.to_correlation).to have_attributes(
           span_id: '0',
-          trace_id: trace_id_128_log_injection(trace_op.id)
+          trace_id: format_for_correlation(trace_op.id)
         )
       end
 
@@ -2274,7 +2274,7 @@ def span
 
           expect(trace_op.to_correlation).to have_attributes(
             span_id: '0',
-            trace_id: trace_id_128_log_injection(trace_op.id)
+            trace_id: format_for_correlation(trace_op.id)
           )
         end
       end
diff --git a/spec/datadog/tracing/tracer_spec.rb b/spec/datadog/tracing/tracer_spec.rb
index c12810edb9b..ec3a32a620b 100644
--- a/spec/datadog/tracing/tracer_spec.rb
+++ b/spec/datadog/tracing/tracer_spec.rb
@@ -750,7 +750,7 @@
       it 'produces an Identifier with data' do
         is_expected.to be_a_kind_of(Datadog::Tracing::Correlation::Identifier)
         expect(active_correlation.trace_id)
-          .to eq(trace_id_128_log_injection(span.trace_id))
+          .to eq(format_for_correlation(span.trace_id))
         expect(active_correlation.span_id).to eq(span.id.to_s)
       end
     end
diff --git a/spec/support/tracer_helpers.rb b/spec/support/tracer_helpers.rb
index 547bf928476..1db95eaa2c0 100644
--- a/spec/support/tracer_helpers.rb
+++ b/spec/support/tracer_helpers.rb
@@ -126,7 +126,7 @@ def low_order_trace_id(trace_id)
   end
 
   ## Wraps call to Datadog::Tracing::Correlation.format_trace_id_128 for better test readability
-  def trace_id_128_log_injection(trace_id)
+  def format_for_correlation(trace_id)
     Datadog::Tracing::Correlation.format_trace_id_128(trace_id)
   end