ddtrace 1.12.1 → 1.13.0

data/lib/datadog/tracing/contrib/sidekiq/ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,36 +7,36 @@ module Datadog
         # Sidekiq integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          CLIENT_SERVICE_NAME = 'sidekiq-client'.freeze
-          ENV_ENABLED = 'DD_TRACE_SIDEKIQ_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SIDEKIQ_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SIDEKIQ_ANALYTICS_SAMPLE_RATE'.freeze
-          ENV_TAG_JOB_ARGS = 'DD_SIDEKIQ_TAG_JOB_ARGS'.freeze
-          SERVICE_NAME = 'sidekiq'.freeze
-          SPAN_PUSH = 'sidekiq.push'.freeze
-          SPAN_JOB = 'sidekiq.job'.freeze
-          SPAN_JOB_FETCH = 'sidekiq.job_fetch'.freeze
-          SPAN_REDIS_INFO = 'sidekiq.redis_info'.freeze
-          SPAN_HEARTBEAT = 'sidekiq.heartbeat'.freeze
-          SPAN_SCHEDULED_PUSH = 'sidekiq.scheduled_push'.freeze
-          SPAN_SCHEDULED_WAIT = 'sidekiq.scheduled_poller_wait'.freeze
-          SPAN_STOP = 'sidekiq.stop'.freeze
-          TAG_JOB_DELAY = 'sidekiq.job.delay'.freeze
-          TAG_JOB_ID = 'sidekiq.job.id'.freeze
-          TAG_JOB_QUEUE = 'sidekiq.job.queue'.freeze
-          TAG_JOB_RETRY = 'sidekiq.job.retry'.freeze
-          TAG_JOB_RETRY_COUNT = 'sidekiq.job.retry_count'.freeze
-          TAG_JOB_WRAPPER = 'sidekiq.job.wrapper'.freeze
-          TAG_JOB_ARGS = 'sidekiq.job.args'.freeze
-          TAG_COMPONENT = 'sidekiq'.freeze
-          TAG_OPERATION_PUSH = 'push'.freeze
-          TAG_OPERATION_JOB = 'job'.freeze
-          TAG_OPERATION_JOB_FETCH = 'job_fetch'.freeze
-          TAG_OPERATION_REDIS_INFO = 'redis_info'.freeze
-          TAG_OPERATION_HEARTBEAT = 'heartbeat'.freeze
-          TAG_OPERATION_SCHEDULED_PUSH = 'scheduled_push'.freeze
-          TAG_OPERATION_SCHEDULED_WAIT = 'scheduled_poller_wait'.freeze
-          TAG_OPERATION_STOP = 'stop'.freeze
+          CLIENT_SERVICE_NAME = 'sidekiq-client'
+          ENV_ENABLED = 'DD_TRACE_SIDEKIQ_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SIDEKIQ_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SIDEKIQ_ANALYTICS_SAMPLE_RATE'
+          ENV_TAG_JOB_ARGS = 'DD_SIDEKIQ_TAG_JOB_ARGS'
+          SERVICE_NAME = 'sidekiq'
+          SPAN_PUSH = 'sidekiq.push'
+          SPAN_JOB = 'sidekiq.job'
+          SPAN_JOB_FETCH = 'sidekiq.job_fetch'
+          SPAN_REDIS_INFO = 'sidekiq.redis_info'
+          SPAN_HEARTBEAT = 'sidekiq.heartbeat'
+          SPAN_SCHEDULED_PUSH = 'sidekiq.scheduled_push'
+          SPAN_SCHEDULED_WAIT = 'sidekiq.scheduled_poller_wait'
+          SPAN_STOP = 'sidekiq.stop'
+          TAG_JOB_DELAY = 'sidekiq.job.delay'
+          TAG_JOB_ID = 'sidekiq.job.id'
+          TAG_JOB_QUEUE = 'sidekiq.job.queue'
+          TAG_JOB_RETRY = 'sidekiq.job.retry'
+          TAG_JOB_RETRY_COUNT = 'sidekiq.job.retry_count'
+          TAG_JOB_WRAPPER = 'sidekiq.job.wrapper'
+          TAG_JOB_ARGS = 'sidekiq.job.args'
+          TAG_COMPONENT = 'sidekiq'
+          TAG_OPERATION_PUSH = 'push'
+          TAG_OPERATION_JOB = 'job'
+          TAG_OPERATION_JOB_FETCH = 'job_fetch'
+          TAG_OPERATION_REDIS_INFO = 'redis_info'
+          TAG_OPERATION_HEARTBEAT = 'heartbeat'
+          TAG_OPERATION_SCHEDULED_PUSH = 'scheduled_push'
+          TAG_OPERATION_SCHEDULED_WAIT = 'scheduled_poller_wait'
+          TAG_OPERATION_STOP = 'stop'
         end
       end
     end

data/lib/datadog/tracing/contrib/sinatra/configuration/settings.rb

@@ -14,23 +14,25 @@ module Datadog
             }.freeze
 
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
-              o.lazy
+              o.type :bool, nilable: true
+              o.env Ext::ENV_ANALYTICS_ENABLED
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
-            option :distributed_tracing, default: true
-            option :headers, default: DEFAULT_HEADERS
-            option :resource_script_names, default: false
+            option :distributed_tracing, default: true, type: :bool
+            option :headers, default: DEFAULT_HEADERS, type: :hash
+            option :resource_script_names, default: false, type: :bool
 
             option :service_name
           end

data/lib/datadog/tracing/contrib/sinatra/env.rb

@@ -19,23 +19,6 @@ module Datadog
             env[Ext::RACK_ENV_SINATRA_REQUEST_SPAN] = span
           end
 
-          def request_header_tags(env, headers)
-            headers ||= []
-
-            {}.tap do |result|
-              headers.each do |header|
-                rack_header = header_to_rack_header(header)
-                if env.key?(rack_header)
-                  result[Tracing::Metadata::Ext::HTTP::RequestHeaders.to_tag(header)] = env[rack_header]
-                end
-              end
-            end
-          end
-
-          def header_to_rack_header(name)
-            "HTTP_#{name.to_s.upcase.gsub(/[-\s]/, '_')}"
-          end
-
           def route_path(env, use_script_names: Datadog.configuration.tracing[:sinatra][:resource_script_names])
             return unless env['sinatra.route']
 

data/lib/datadog/tracing/contrib/sinatra/ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,27 +7,27 @@ module Datadog
         # Sinatra integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_SINATRA_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SINATRA_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SINATRA_ANALYTICS_SAMPLE_RATE'.freeze
-          RACK_ENV_SINATRA_REQUEST_SPAN = 'datadog.sinatra_request_span'.freeze
-          SPAN_RENDER_TEMPLATE = 'sinatra.render_template'.freeze
-          SPAN_REQUEST = 'sinatra.request'.freeze
-          SPAN_ROUTE = 'sinatra.route'.freeze
-          TAG_APP_NAME = 'sinatra.app.name'.freeze
-          TAG_COMPONENT = 'sinatra'.freeze
-          TAG_OPERATION_RENDER_TEMPLATE = 'render_template'.freeze
-          TAG_OPERATION_REQUEST = 'request'.freeze
-          TAG_OPERATION_ROUTE = 'route'.freeze
-          TAG_ROUTE_PATH = 'sinatra.route.path'.freeze
-          TAG_SCRIPT_NAME = 'sinatra.script_name'.freeze
-          TAG_TEMPLATE_ENGINE = 'sinatra.template_engine'.freeze
-          TAG_TEMPLATE_NAME = 'sinatra.template_name'.freeze
+          ENV_ENABLED = 'DD_TRACE_SINATRA_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SINATRA_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SINATRA_ANALYTICS_SAMPLE_RATE'
+          RACK_ENV_SINATRA_REQUEST_SPAN = 'datadog.sinatra_request_span'
+          SPAN_RENDER_TEMPLATE = 'sinatra.render_template'
+          SPAN_REQUEST = 'sinatra.request'
+          SPAN_ROUTE = 'sinatra.route'
+          TAG_APP_NAME = 'sinatra.app.name'
+          TAG_COMPONENT = 'sinatra'
+          TAG_OPERATION_RENDER_TEMPLATE = 'render_template'
+          TAG_OPERATION_REQUEST = 'request'
+          TAG_OPERATION_ROUTE = 'route'
+          TAG_ROUTE_PATH = 'sinatra.route.path'
+          TAG_SCRIPT_NAME = 'sinatra.script_name'
+          TAG_TEMPLATE_ENGINE = 'sinatra.template_engine'
+          TAG_TEMPLATE_NAME = 'sinatra.template_name'
 
           # === Deprecated: To be removed ===
-          RACK_ENV_REQUEST_SPAN = 'datadog.sinatra_request_span'.freeze
-          RACK_ENV_MIDDLEWARE_START_TIME = 'datadog.sinatra_middleware_start_time'.freeze
-          RACK_ENV_MIDDLEWARE_TRACED = 'datadog.sinatra_middleware_traced'.freeze
+          RACK_ENV_REQUEST_SPAN = 'datadog.sinatra_request_span'
+          RACK_ENV_MIDDLEWARE_START_TIME = 'datadog.sinatra_middleware_start_time'
+          RACK_ENV_MIDDLEWARE_TRACED = 'datadog.sinatra_middleware_traced'
           # === Deprecated: To be removed ===
         end
       end

data/lib/datadog/tracing/contrib/sinatra/tracer_middleware.rb

@@ -3,9 +3,9 @@
 require_relative '../../metadata/ext'
 require_relative '../analytics'
 require_relative '../rack/ext'
+require_relative '../rack/header_tagging'
 require_relative 'env'
 require_relative 'ext'
-require_relative 'headers'
 
 module Datadog
   module Tracing
@@ -20,8 +20,6 @@ module Datadog
 
           # rubocop:disable Metrics/AbcSize
           # rubocop:disable Metrics/MethodLength
-          # rubocop:disable Metrics/CyclomaticComplexity
-          # rubocop:disable Metrics/PerceivedComplexity
           def call(env)
             # Set the trace context (e.g. distributed tracing)
             if configuration[:distributed_tracing] && Tracing.active_trace.nil?
@@ -45,9 +43,7 @@ module Datadog
 
                 response = @app.call(env)
               ensure
-                Sinatra::Env.request_header_tags(env, configuration[:headers][:request]).each do |name, value|
-                  span.set_tag(name, value) if span.get_tag(name).nil?
-                end
+                Contrib::Rack::HeaderTagging.tag_request_headers(span, env, configuration)
 
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
@@ -85,12 +81,7 @@ module Datadog
                   end
 
                   if (headers = response[1])
-                    Sinatra::Headers.response_header_tags(
-                      headers,
-                      configuration[:headers][:response]
-                    ).each do |name, value|
-                      span.set_tag(name, value) if span.get_tag(name).nil?
-                    end
+                    Contrib::Rack::HeaderTagging.tag_response_headers(span, headers, configuration)
                   end
                 end
 
@@ -104,8 +95,6 @@ module Datadog
           end
           # rubocop:enable Metrics/AbcSize
           # rubocop:enable Metrics/MethodLength
-          # rubocop:enable Metrics/CyclomaticComplexity
-          # rubocop:enable Metrics/PerceivedComplexity
 
           private
 

data/lib/datadog/tracing/contrib/sneakers/configuration/settings.rb

@@ -11,23 +11,29 @@ module Datadog
           # Default settings for the Shoryuken integration
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :service_name
-            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
-            option :tag_body, default: false
+            option :error_handler do |o|
+              o.type :proc
+              o.experimental_default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+            end
+            option :tag_body, default: false, type: :bool
           end
         end
       end

data/lib/datadog/tracing/contrib/sneakers/ext.rb

@@ -18,6 +18,7 @@ module Datadog
           TAG_COMPONENT = 'sneakers'
           TAG_OPERATION_JOB = 'job'
           TAG_MESSAGING_SYSTEM = 'rabbitmq'
+          TAG_RABBITMQ_ROUTING_KEY = 'messaging.rabbitmq.routing_key'
         end
       end
     end

data/lib/datadog/tracing/contrib/sneakers/tracer.rb

@@ -37,7 +37,7 @@ module Datadog
 
               request_span.resource = @app.to_proc.binding.eval('self.class').to_s
               request_span.set_tag(Ext::TAG_JOB_ROUTING_KEY, delivery_info.routing_key)
-              request_span.set_tag(Contrib::Ext::Messaging::TAG_RABBITMQ_ROUTING_KEY, delivery_info.routing_key)
+              request_span.set_tag(Ext::TAG_RABBITMQ_ROUTING_KEY, delivery_info.routing_key)
               request_span.set_tag(Ext::TAG_JOB_QUEUE, delivery_info.consumer.queue.name)
 
               request_span.set_tag(Ext::TAG_JOB_BODY, deserialized_msg) if configuration[:tag_body]

data/lib/datadog/tracing/contrib/span_attribute_schema.rb

@@ -1,27 +1,91 @@
 # frozen_string_literal: true
 
+require_relative 'ext'
+
 module Datadog
   module Tracing
     module Contrib
       # Contains methods for fetching values according to span attributes schema
       module SpanAttributeSchema
-        module_function
+        REFLEXIVE_SOURCES = [Tracing::Metadata::Ext::TAG_PEER_SERVICE].freeze
+        NO_SOURCE = [].freeze
 
-        def fetch_service_name(env, default)
+        def self.fetch_service_name(env, default)
           ENV.fetch(env) do
-            if Datadog.configuration.tracing.span_attribute_schema ==
-                Tracing::Configuration::Ext::SpanAttributeSchema::VERSION_ONE
-              Datadog.configuration.service
-            else
-              default
+            if Datadog.configuration.tracing.contrib.global_default_service_name.enabled
+              return Datadog.configuration.service
             end
+
+            default
           end
         end
 
-        def default_span_attribute_schema?
-          Datadog.configuration.tracing.span_attribute_schema ==
-            Tracing::Configuration::Ext::SpanAttributeSchema::DEFAULT_VERSION
+        def self.set_peer_service!(span, sources)
+          # Acquire all peer.service values as well as any potential remapping
+          peer_service_val, peer_service_source = set_peer_service_from_source(span, sources)
+          remap_val = Datadog.configuration.tracing.contrib.peer_service_mapping[peer_service_val]
+
+          # Only continue to setting peer.service if actual source is found
+          return false unless peer_service_source
+
+          span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_PEER_SERVICE_SOURCE, peer_service_source)
+
+          # Set peer.service to remapped value if found otherwise normally set peer.service
+          if remap_val
+            span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, remap_val)
+            span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_PEER_SERVICE_REMAP, peer_service_val)
+          else
+            span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, peer_service_val)
+          end
+          true
+        end
+
+        # set_peer_service_from_source: Implements the extraction logic to determine the peer.service value
+        # based on the list of source tags passed as a parameter.
+        #
+        # If no values are found, it checks the default list for all spans before returning false for no result
+        # Sets the source of where the information for peer.service was extracted from
+        # Returns a peer.service value if successfully set or not
+        def self.set_peer_service_from_source(span, sources = [])
+          # Filter out sources based on existence of peer.service tag
+          sources = filter_peer_service_sources(span, sources)
+
+          # Find a possible peer.service source from the list of source tags passed in
+          sources.each do |source|
+            source_val = span.get_tag(source)
+            next unless not_empty_tag?(source_val)
+
+            return source_val, source
+          end
+          false
         end
+
+        private_class_method :set_peer_service_from_source
+
+        # filter_peer_service_sources: returns filtered sources based on existence of peer.service tag
+        # If peer.service exists, we do not read from any other source rather use peer.service as source
+        # This is to prevent overwriting of pre-existing peer.service tags
+        def self.filter_peer_service_sources(span, sources)
+          ps = span.get_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE)
+          # Do not override existing peer.service tag if it exists based on schema version
+          return REFLEXIVE_SOURCES if not_empty_tag?(ps)
+
+          # Check that peer.service is only set on spankind client/producer spans
+          if (span.get_tag(Tracing::Metadata::Ext::TAG_KIND) == Tracing::Metadata::Ext::SpanKind::TAG_CLIENT) ||
+              (span.get_tag(Tracing::Metadata::Ext::TAG_KIND) == Tracing::Metadata::Ext::SpanKind::TAG_PRODUCER)
+            return sources
+          end
+
+          NO_SOURCE
+        end
+
+        private_class_method :filter_peer_service_sources
+
+        def self.not_empty_tag?(tag)
+          tag && (tag != '')
+        end
+
+        private_class_method :not_empty_tag?
       end
     end
   end

data/lib/datadog/tracing/contrib/stripe/configuration/settings.rb

@@ -12,18 +12,21 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
           end
         end

data/lib/datadog/tracing/contrib/sucker_punch/configuration/settings.rb

@@ -12,18 +12,21 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :service_name

data/lib/datadog/tracing/contrib/sucker_punch/ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,19 +7,19 @@ module Datadog
         # SuckerPunch integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_SUCKER_PUNCH_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SUCKER_PUNCH_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SUCKER_PUNCH_ANALYTICS_SAMPLE_RATE'.freeze
-          SERVICE_NAME = 'sucker_punch'.freeze
-          SPAN_PERFORM = 'sucker_punch.perform'.freeze
-          SPAN_PERFORM_ASYNC = 'sucker_punch.perform_async'.freeze
-          SPAN_PERFORM_IN = 'sucker_punch.perform_in'.freeze
-          TAG_PERFORM_IN = 'sucker_punch.perform_in'.freeze
-          TAG_QUEUE = 'sucker_punch.queue'.freeze
-          TAG_COMPONENT = 'sucker_punch'.freeze
-          TAG_OPERATION_PERFORM = 'perform'.freeze
-          TAG_OPERATION_PERFORM_ASYNC = 'perform_async'.freeze
-          TAG_OPERATION_PERFORM_IN = 'perform_in'.freeze
+          ENV_ENABLED = 'DD_TRACE_SUCKER_PUNCH_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SUCKER_PUNCH_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SUCKER_PUNCH_ANALYTICS_SAMPLE_RATE'
+          SERVICE_NAME = 'sucker_punch'
+          SPAN_PERFORM = 'sucker_punch.perform'
+          SPAN_PERFORM_ASYNC = 'sucker_punch.perform_async'
+          SPAN_PERFORM_IN = 'sucker_punch.perform_in'
+          TAG_PERFORM_IN = 'sucker_punch.perform_in'
+          TAG_QUEUE = 'sucker_punch.queue'
+          TAG_COMPONENT = 'sucker_punch'
+          TAG_OPERATION_PERFORM = 'perform'
+          TAG_OPERATION_PERFORM_ASYNC = 'perform_async'
+          TAG_OPERATION_PERFORM_IN = 'perform_in'
         end
       end
     end

data/lib/datadog/tracing/contrib/utils/database.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
       module Utils
         # Common database-related utility functions.
         module Database
-          VENDOR_DEFAULT = 'defaultdb'.freeze
-          VENDOR_POSTGRES = 'postgres'.freeze
-          VENDOR_SQLITE = 'sqlite'.freeze
+          VENDOR_DEFAULT = 'defaultdb'
+          VENDOR_POSTGRES = 'postgres'
+          VENDOR_SQLITE = 'sqlite'
 
           module_function
 

data/lib/datadog/tracing/correlation.rb

@@ -23,7 +23,6 @@ module Datadog
           :span_resource,
           :span_service,
           :span_type,
-          :trace_id,
           :trace_name,
           :trace_resource,
           :trace_service,
@@ -65,22 +64,20 @@ module Datadog
             attributes << "#{LOG_ATTR_ENV}=#{env}" unless env.nil?
             attributes << "#{LOG_ATTR_SERVICE}=#{service}"
             attributes << "#{LOG_ATTR_VERSION}=#{version}" unless version.nil?
-            attributes << "#{LOG_ATTR_TRACE_ID}=#{logging_trace_id}"
+            attributes << "#{LOG_ATTR_TRACE_ID}=#{trace_id}"
             attributes << "#{LOG_ATTR_SPAN_ID}=#{span_id}"
             attributes.join(' ')
           end
         end
 
-        private
-
-        def logging_trace_id
-          @logging_trace_id ||=
-            if Datadog.configuration.tracing.trace_id_128_bit_logging_enabled &&
-                !Tracing::Utils::TraceId.to_high_order(@trace_id).zero?
-              Kernel.format('%032x', trace_id)
-            else
-              Tracing::Utils::TraceId.to_low_order(@trace_id)
-            end
+        # DEV-2.0: This public method was returning an Integer, but with 128 bit trace id it would return a String.
+        def trace_id
+          if Datadog.configuration.tracing.trace_id_128_bit_logging_enabled &&
+              !Tracing::Utils::TraceId.to_high_order(@trace_id).zero?
+            Kernel.format('%032x', @trace_id)
+          else
+            Tracing::Utils::TraceId.to_low_order(@trace_id)
+          end
         end
       end
 

data/lib/datadog/tracing/diagnostics/ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Diagnostics
@@ -7,25 +9,25 @@ module Datadog
         module Health
           # Metrics
           module Metrics
-            METRIC_API_ERRORS = 'datadog.tracer.api.errors'.freeze
-            METRIC_API_REQUESTS = 'datadog.tracer.api.requests'.freeze
-            METRIC_API_RESPONSES = 'datadog.tracer.api.responses'.freeze
-            METRIC_ERROR_CONTEXT_OVERFLOW = 'datadog.tracer.error.context_overflow'.freeze
-            METRIC_ERROR_INSTRUMENTATION_PATCH = 'datadog.tracer.error.instrumentation_patch'.freeze
-            METRIC_ERROR_SPAN_FINISH = 'datadog.tracer.error.span_finish'.freeze
-            METRIC_ERROR_UNFINISHED_SPANS = 'datadog.tracer.error.unfinished_spans'.freeze
-            METRIC_INSTRUMENTATION_PATCHED = 'datadog.tracer.instrumentation_patched'.freeze
-            METRIC_QUEUE_ACCEPTED = 'datadog.tracer.queue.accepted'.freeze
-            METRIC_QUEUE_ACCEPTED_LENGTHS = 'datadog.tracer.queue.accepted_lengths'.freeze
-            METRIC_QUEUE_DROPPED = 'datadog.tracer.queue.dropped'.freeze
-            METRIC_QUEUE_LENGTH = 'datadog.tracer.queue.length'.freeze
-            METRIC_QUEUE_MAX_LENGTH = 'datadog.tracer.queue.max_length'.freeze
-            METRIC_QUEUE_SPANS = 'datadog.tracer.queue.spans'.freeze
-            METRIC_SAMPLING_SERVICE_CACHE_LENGTH = 'datadog.tracer.sampling.service_cache_length'.freeze
-            METRIC_TRACES_FILTERED = 'datadog.tracer.traces.filtered'.freeze
-            METRIC_TRANSPORT_CHUNKED = 'datadog.tracer.transport.chunked'.freeze
-            METRIC_TRANSPORT_TRACE_TOO_LARGE = 'datadog.tracer.transport.trace_too_large'.freeze
-            METRIC_WRITER_CPU_TIME = 'datadog.tracer.writer.cpu_time'.freeze
+            METRIC_API_ERRORS = 'datadog.tracer.api.errors'
+            METRIC_API_REQUESTS = 'datadog.tracer.api.requests'
+            METRIC_API_RESPONSES = 'datadog.tracer.api.responses'
+            METRIC_ERROR_CONTEXT_OVERFLOW = 'datadog.tracer.error.context_overflow'
+            METRIC_ERROR_INSTRUMENTATION_PATCH = 'datadog.tracer.error.instrumentation_patch'
+            METRIC_ERROR_SPAN_FINISH = 'datadog.tracer.error.span_finish'
+            METRIC_ERROR_UNFINISHED_SPANS = 'datadog.tracer.error.unfinished_spans'
+            METRIC_INSTRUMENTATION_PATCHED = 'datadog.tracer.instrumentation_patched'
+            METRIC_QUEUE_ACCEPTED = 'datadog.tracer.queue.accepted'
+            METRIC_QUEUE_ACCEPTED_LENGTHS = 'datadog.tracer.queue.accepted_lengths'
+            METRIC_QUEUE_DROPPED = 'datadog.tracer.queue.dropped'
+            METRIC_QUEUE_LENGTH = 'datadog.tracer.queue.length'
+            METRIC_QUEUE_MAX_LENGTH = 'datadog.tracer.queue.max_length'
+            METRIC_QUEUE_SPANS = 'datadog.tracer.queue.spans'
+            METRIC_SAMPLING_SERVICE_CACHE_LENGTH = 'datadog.tracer.sampling.service_cache_length'
+            METRIC_TRACES_FILTERED = 'datadog.tracer.traces.filtered'
+            METRIC_TRANSPORT_CHUNKED = 'datadog.tracer.transport.chunked'
+            METRIC_TRANSPORT_TRACE_TOO_LARGE = 'datadog.tracer.transport.trace_too_large'
+            METRIC_WRITER_CPU_TIME = 'datadog.tracer.writer.cpu_time'
           end
         end
       end

data/lib/datadog/tracing/distributed/b3_multi.rb

@@ -30,8 +30,8 @@ module Datadog
           return if digest.nil?
 
           # DEV: We need these to be hex encoded
-          data[@trace_id_key] = digest.trace_id.to_s(16)
-          data[@span_id_key] = digest.span_id.to_s(16)
+          data[@trace_id_key] = format('%032x', digest.trace_id)
+          data[@span_id_key] = format('%016x', digest.span_id)
 
           if digest.trace_sampling_priority
             sampling_priority = Helpers.clamp_sampling_priority(

data/lib/datadog/tracing/distributed/b3_single.rb

@@ -26,7 +26,7 @@ module Datadog
           return if digest.nil?
 
           # DEV: We need these to be hex encoded
-          value = "#{digest.trace_id.to_s(16)}-#{digest.span_id.to_s(16)}"
+          value = "#{format('%032x', digest.trace_id)}-#{format('%016x', digest.span_id)}"
 
           if digest.trace_sampling_priority
             sampling_priority = Helpers.clamp_sampling_priority(