format for correlation

Author: mabdinur

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' }

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
 

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

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')

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'