ddtrace 1.12.1 → 1.18.0

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/contrib/utils/quantization/http.rb

@@ -134,18 +134,18 @@ module Datadog
                  (?:"|%22)?
               )
               (?: # common keys
-                 (?:old_?|new_?)?p(?:ass)?w(?:or)?d(?:1|2)? # pw, password variants
-                |pass(?:_?phrase)?  # pass, passphrase variants
+                 (?:old[-_]?|new_?)?p(?:ass)?w(?:or)?d(?:1|2)? # pw, password variants
+                |pass(?:[-_]?phrase)?  # pass, passphrase variants
                 |secret
                 |(?: # key, key_id variants
-                     api_?
-                    |private_?
-                    |public_?
-                    |access_?
-                    |secret_?
-                 )key(?:_?id)?
+                     api[-_]?
+                    |private[-_]?
+                    |public[-_]?
+                    |access[-_]?
+                    |secret[-_]?
+                 )key(?:[-_]?id)?
                 |token
-                |consumer_?(?:id|key|secret)
+                |consumer[-_]?(?:id|key|secret)
                 |sign(?:ed|ature)?
                 |auth(?:entication|orization)?
               )
@@ -160,11 +160,11 @@ module Datadog
                  (?:"|%22)                                     # closing '"' at end of value
               )
              |(?: # other common secret values
-                 bearer(?:\s|%20)+[a-z0-9._\-]+
+                 bearer(?:\s|%20)+[a-z0-9._-]+
                 |token(?::|%3A)[a-z0-9]{13}
                 |gh[opsu]_[0-9a-zA-Z]{36}
                 |ey[I-L](?:[\w=-]|%3D)+\.ey[I-L](?:[\w=-]|%3D)+(?:\.(?:[\w.+/=-]|%3D|%2F|%2B)+)?
-                |-{5}BEGIN(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY-{5}[^\-]+-{5}END(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY(?:-{5})?(?:\n|%0A)?
+                |-{5}BEGIN(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY-{5}[^-]+-{5}END(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY(?:-{5})?(?:\n|%0A)?
                 |(?:ssh-(?:rsa|dss)|ecdsa-[a-z0-9]+-[a-z0-9]+)(?:\s|%20)*(?:[a-z0-9/.+]|%2F|%5C|%2B){100,}(?:=|%3D)*(?:(?:\s+)[a-z0-9._-]+)?
               )
             }ix.freeze

data/lib/datadog/tracing/contrib.rb

@@ -58,6 +58,7 @@ require_relative 'contrib/kafka/integration'
 require_relative 'contrib/lograge/integration'
 require_relative 'contrib/mongodb/integration'
 require_relative 'contrib/mysql2/integration'
+require_relative 'contrib/opensearch/integration'
 require_relative 'contrib/pg/integration'
 require_relative 'contrib/presto/integration'
 require_relative 'contrib/qless/integration'

data/lib/datadog/tracing/correlation.rb

@@ -1,5 +1,6 @@
 require_relative 'utils'
 require_relative 'metadata/ext'
+require_relative '../core/logging/ext'
 
 module Datadog
   module Tracing
@@ -14,6 +15,7 @@ module Datadog
         LOG_ATTR_SPAN_ID = 'dd.span_id'.freeze
         LOG_ATTR_TRACE_ID = 'dd.trace_id'.freeze
         LOG_ATTR_VERSION = 'dd.version'.freeze
+        LOG_ATTR_SOURCE = 'ddsource'.freeze
 
         attr_reader \
           :env,
@@ -23,7 +25,6 @@ module Datadog
           :span_resource,
           :span_service,
           :span_type,
-          :trace_id,
           :trace_name,
           :trace_resource,
           :trace_service,
@@ -59,28 +60,44 @@ module Datadog
           @version = Core::Utils::SafeDup.frozen_dup(version || Datadog.configuration.version)
         end
 
+        def to_h
+          @to_h ||= {
+            # Adds IDs as tags to log output
+            dd: {
+              # To preserve precision during JSON serialization, use strings for large numbers
+              env: env.to_s,
+              service: service.to_s,
+              version: version.to_s,
+              trace_id: trace_id.to_s,
+              span_id: span_id.to_s
+            },
+            ddsource: Core::Logging::Ext::DD_SOURCE
+          }
+        end
+
+        # This method (#to_log_format) implements an algorithm by prefixing keys for nested values
+        # but the algorithm makes the constants implicit. Hence, we use it for validation during test.
         def to_log_format
           @log_format ||= begin
             attributes = []
             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 << "#{LOG_ATTR_SOURCE}=#{Core::Logging::Ext::DD_SOURCE}"
             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/environment_logger.rb

@@ -0,0 +1,165 @@
+# frozen_string_literal: true
+
+require 'date'
+require 'json'
+require 'rbconfig'
+require_relative '../../core/diagnostics/environment_logger'
+
+module Datadog
+  module Tracing
+    module Diagnostics
+      # Collects and logs Tracing diagnostic and error information
+      module EnvironmentLogger
+        extend Core::Diagnostics::EnvironmentLogging
+
+        def self.collect_and_log!(responses: nil)
+          log_once! do
+            env_data = EnvironmentCollector.collect_config!
+            log_configuration!('TRACING', env_data.to_json)
+
+            if responses
+              err_data = EnvironmentCollector.collect_errors!(responses)
+              err_data.reject! { |_, v| v.nil? } # Remove empty values from hash output
+              log_error!('TRACING', 'Agent Error', err_data.to_json) unless err_data.empty?
+            end
+          end
+        rescue => e
+          logger.warn("Failed to collect tracing environment information: #{e} Location: #{Array(e.backtrace).first}")
+        end
+      end
+
+      # Collects environment information for Tracing diagnostic logging
+      module EnvironmentCollector
+        class << self
+          def collect_config!
+            {
+              enabled: enabled,
+              agent_url: agent_url,
+              analytics_enabled: analytics_enabled,
+              sample_rate: sample_rate,
+              sampling_rules: sampling_rules,
+              integrations_loaded: integrations_loaded,
+              partial_flushing_enabled: partial_flushing_enabled,
+              priority_sampling_enabled: priority_sampling_enabled,
+              **instrumented_integrations_settings
+            }
+          end
+
+          def collect_errors!(responses)
+            {
+              agent_error: agent_error(responses)
+            }
+          end
+
+          # @return [Boolean, nil]
+          def enabled
+            !!Datadog.configuration.tracing.enabled
+          end
+
+          # @return [String, nil] target agent URL for trace flushing
+          def agent_url
+            # Retrieve the effect agent URL, regardless of how it was configured
+            transport = Tracing.send(:tracer).writer.transport
+
+            # return `nil` with IO transport
+            return unless transport.respond_to?(:client)
+
+            adapter = transport.client.api.adapter
+            adapter.url
+          end
+
+          # Error returned by Datadog agent during a tracer flush attempt
+          # @return [String] concatenated list of transport errors
+          def agent_error(responses)
+            error_responses = responses.reject(&:ok?)
+
+            return nil if error_responses.empty?
+
+            error_responses.map(&:inspect).join(',')
+          end
+
+          # @return [Boolean, nil] analytics enabled in configuration
+          def analytics_enabled
+            !!Datadog.configuration.tracing.analytics.enabled
+          end
+
+          # @return [Numeric, nil] tracer sample rate configured
+          def sample_rate
+            sampler = Datadog.configuration.tracing.sampler
+            return nil unless sampler
+
+            sampler.sample_rate(nil) rescue nil
+          end
+
+          # DEV: We currently only support SimpleRule instances.
+          # DEV: These are the most commonly used rules.
+          # DEV: We should expand support for other rules in the future,
+          # DEV: although it is tricky to serialize arbitrary rules.
+          #
+          # @return [Hash, nil] sample rules configured
+          def sampling_rules
+            sampler = Datadog.configuration.tracing.sampler
+            return nil unless sampler.is_a?(Tracing::Sampling::PrioritySampler) &&
+              sampler.priority_sampler.is_a?(Tracing::Sampling::RuleSampler)
+
+            sampler.priority_sampler.rules.map do |rule|
+              next unless rule.is_a?(Tracing::Sampling::SimpleRule)
+
+              {
+                name: rule.matcher.name,
+                service: rule.matcher.service,
+                sample_rate: rule.sampler.sample_rate(nil)
+              }
+            end.compact
+          end
+
+          # Concatenated list of integrations activated, with their gem version.
+          # Example: "rails@6.0.3,rack@2.2.3"
+          #
+          # @return [String, nil]
+          def integrations_loaded
+            integrations = instrumented_integrations
+            return if integrations.empty?
+
+            integrations.map { |name, integration| "#{name}@#{integration.class.version}" }.join(',')
+          end
+
+          # @return [Boolean, nil] partial flushing enabled in configuration
+          def partial_flushing_enabled
+            !!Datadog.configuration.tracing.partial_flush.enabled
+          end
+
+          # @return [Boolean, nil] priority sampling enabled in configuration
+          def priority_sampling_enabled
+            !!Datadog.configuration.tracing.priority_sampling
+          end
+
+          private
+
+          def instrumented_integrations
+            # `instrumented_integrations` method is added only if tracing contrib extensions are required.
+            # If tracing is used in manual mode without integrations enabled this method does not exist.
+            # CI visibility gem datadog-ci uses Datadog::Tracer without requiring datadog/tracing/contrib folder
+            # nor enabling any integrations by default which causes EnvironmentCollector to fail.
+            return {} unless Datadog.configuration.tracing.respond_to?(:instrumented_integrations)
+
+            Datadog.configuration.tracing.instrumented_integrations
+          end
+
+          # Capture all active integration settings into "integrationName_settingName: value" entries.
+          def instrumented_integrations_settings
+            instrumented_integrations.flat_map do |name, integration|
+              integration.configuration.to_h.flat_map do |setting, value|
+                next [] if setting == :tracer # Skip internal Ruby objects
+
+                # Convert value to a string to avoid custom #to_json
+                # handlers possibly causing errors.
+                [[:"integration_#{name}_#{setting}", value.to_s]]
+              end
+            end.to_h
+          end
+        end
+      end
+    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(

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

@@ -49,7 +49,6 @@ module Datadog
           build_tags(digest).tap do |tags|
             inject_tags!(tags, data) unless tags.empty?
           end
-
           data
         end