ddtrace 1.14.0 → 1.15.0

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

@@ -36,7 +36,7 @@ module Datadog
             option :distributed_tracing, default: true, type: :bool
             option :error_handler do |o|
               o.type :proc
-              o.experimental_default_proc(&DEFAULT_ERROR_HANDLER)
+              o.default_proc(&DEFAULT_ERROR_HANDLER)
             end
             option :split_by_domain, default: false, type: :bool
 

data/lib/datadog/tracing/contrib/faraday/middleware.rb

@@ -47,6 +47,11 @@ module Datadog
               )
             end
 
+            # Tag original global service name if not used
+            if span.service != Datadog.configuration.service
+              span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+            end
+
             span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
             span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

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

@@ -48,7 +48,27 @@ module Datadog
 
             option :error_handler do |o|
               o.type :proc
-              o.experimental_default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+              o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+              o.after_set do |value|
+                if value != Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+                  Datadog.logger.warn(
+                    'The gRPC `error_handler` setting has been deprecated for removal. Please replace ' \
+                    'it with `server_error_handler` which is explicit about only handling errors from ' \
+                    'server interceptors. Alternatively, to handle errors from client interceptors use ' \
+                    'the `client_error_handler` setting instead.'
+                  )
+                end
+              end
+            end
+
+            option :server_error_handler do |o|
+              o.type :proc
+              o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+            end
+
+            option :client_error_handler do |o|
+              o.type :proc
+              o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
             end
           end
         end

data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb

@@ -22,7 +22,8 @@ module Datadog
               options = {
                 span_type: Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND,
                 service: service_name, # Maintain client-side service name configuration
-                resource: formatter.resource_name
+                resource: formatter.resource_name,
+                on_error: error_handler
               }
 
               Tracing.trace(Ext::SPAN_CLIENT, **options) do |span, trace|
@@ -56,6 +57,11 @@ module Datadog
                 )
               end
 
+              # Tag original global service name if not used
+              if span.service != Datadog.configuration.service
+                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CLIENT)
@@ -101,6 +107,10 @@ module Datadog
               Datadog.logger.debug { "Could not parse host:port from #{call}: #{e}" }
               nil
             end
+
+            def error_handler
+              Datadog.configuration_for(self, :error_handler) || datadog_configuration[:client_error_handler]
+            end
           end
         end
       end

data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb

@@ -64,6 +64,11 @@ module Datadog
                 span.set_tag(header, value)
               end
 
+              # Tag original global service name if not used
+              if span.service != Datadog.configuration.service
+                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_SERVER)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SERVICE)
@@ -81,6 +86,19 @@ module Datadog
             rescue StandardError => e
               Datadog.logger.debug("GRPC server trace failed: #{e}")
             end
+
+            def error_handler
+              self_handler = Datadog.configuration_for(self, :error_handler)
+              return self_handler if self_handler
+
+              unless datadog_configuration.using_default?(:server_error_handler)
+                return datadog_configuration[:server_error_handler]
+              end
+
+              # As a last resort, fallback to the deprecated error_handler
+              # configuration option.
+              datadog_configuration[:error_handler]
+            end
           end
         end
       end

data/lib/datadog/tracing/contrib/grpc/datadog_interceptor.rb

@@ -58,10 +58,6 @@ module Datadog
               datadog_configuration[:analytics_sample_rate]
             end
 
-            def error_handler
-              datadog_configuration[:error_handler]
-            end
-
             # Allows interceptors to define settings using methods instead of `[]`
             class PinAdapter
               OPTIONS = Configuration::Settings.instance_methods(false).freeze

data/lib/datadog/tracing/contrib/http/circuit_breaker.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../../ddtrace/transport/ext'
+require_relative '../../../core/transport/ext'
 
 module Datadog
   module Tracing
@@ -24,8 +24,8 @@ module Datadog
           # TODO: We don't want this kind of soft-check on HTTP requests.
           #       Remove this when transport implements its own "skip tracing" mechanism.
           def internal_request?(request)
-            !!(request[Datadog::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION] ||
-              request[Transport::Ext::HTTP::HEADER_DD_INTERNAL_UNTRACED_REQUEST])
+            !!(request[Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION] ||
+              request[Datadog::Core::Transport::Ext::HTTP::HEADER_DD_INTERNAL_UNTRACED_REQUEST])
           end
 
           def should_skip_distributed_tracing?(client_config)

data/lib/datadog/tracing/contrib/http/instrumentation.rb

@@ -76,6 +76,11 @@ module Datadog
                 )
               end
 
+              # Tag original global service name if not used
+              if span.service != Datadog.configuration.service
+                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

data/lib/datadog/tracing/contrib/httpclient/instrumentation.rb

@@ -58,6 +58,11 @@ module Datadog
                 )
               end
 
+              # Tag original global service name if not used
+              if span.service != Datadog.configuration.service
+                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 

data/lib/datadog/tracing/contrib/httprb/instrumentation.rb

@@ -58,6 +58,11 @@ module Datadog
                 )
               end
 
+              # Tag original global service name if not used
+              if span.service != Datadog.configuration.service
+                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 

data/lib/datadog/tracing/contrib/mongodb/subscribers.rb

@@ -11,6 +11,7 @@ module Datadog
         # `MongoCommandSubscriber` listens to all events from the `Monitoring`
         # system available in the Mongo driver.
         class MongoCommandSubscriber
+          # rubocop:disable Metrics/AbcSize
           def started(event)
             return unless Tracing.enabled?
 
@@ -36,6 +37,11 @@ module Datadog
               )
             end
 
+            # Tag original global service name if not used
+            if span.service != Datadog.configuration.service
+              span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+            end
+
             span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
 
             span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
@@ -63,6 +69,7 @@ module Datadog
             # set the resource with the quantized query
             span.resource = serialized_query
           end
+          # rubocop:enable Metrics/AbcSize
 
           def failed(event)
             span = get_span(event)

data/lib/datadog/tracing/contrib/mysql2/instrumentation.rb

@@ -33,6 +33,11 @@ module Datadog
                   )
                 end
 
+                # Tag original global service name if not used
+                if span.service != Datadog.configuration.service
+                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+                end
+
                 span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
                 span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
@@ -48,12 +53,17 @@ module Datadog
                 span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, query_options[:host])
                 span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, query_options[:port])
 
+                Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
+
                 propagation_mode = Contrib::Propagation::SqlComment::Mode.new(comment_propagation)
 
                 Contrib::Propagation::SqlComment.annotate!(span, propagation_mode)
-                sql = Contrib::Propagation::SqlComment.prepend_comment(sql, span, trace_op, propagation_mode)
-
-                Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
+                sql = Contrib::Propagation::SqlComment.prepend_comment(
+                  sql,
+                  span,
+                  trace_op,
+                  propagation_mode
+                )
 
                 super(sql, options)
               end

data/lib/datadog/tracing/contrib/opensearch/integration.rb

@@ -18,8 +18,8 @@ module Datadog
           register_as :opensearch, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['opensearch-transport'] \
-              && Gem.loaded_specs['opensearch-transport'].version
+            Gem.loaded_specs['opensearch-ruby'] \
+              && Gem.loaded_specs['opensearch-ruby'].version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/opensearch/patcher.rb

@@ -28,6 +28,7 @@ module Datadog
           # Patches OpenSearch::Transport::Client module
           module Client
             # rubocop:disable Metrics/MethodLength
+            # rubocop:disable Metrics/AbcSize
             def perform_request(method, path, params = {}, body = nil, headers = nil)
               response = nil
               # rubocop:disable Metrics/BlockLength
@@ -61,6 +62,11 @@ module Datadog
                     )
                   end
 
+                  # Tag original global service name if not used
+                  if span.service != Datadog.configuration.service
+                    span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+                  end
+
                   # Set url tags
                   span.set_tag(OpenSearch::Ext::TAG_URL, url)
                   span.set_tag(OpenSearch::Ext::TAG_HOST, host)
@@ -94,6 +100,7 @@ module Datadog
                 end
               end
               # rubocop:enable Metrics/BlockLength
+              # rubocop:enable Metrics/AbcSize
               response
             end
 

data/lib/datadog/tracing/contrib/pg/instrumentation.rb

@@ -129,6 +129,11 @@ module Datadog
                 )
               end
 
+              # Tag original global service name if not used
+              if span.service != Datadog.configuration.service
+                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)

data/lib/datadog/tracing/contrib/presto/instrumentation.rb

@@ -90,6 +90,11 @@ module Datadog
                   )
                 end
 
+                # Tag original global service name if not used
+                if span.service != Datadog.configuration.service
+                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+                end
+
                 if (host_port = @options[:server])
                   host, port = Core::Utils.extract_host_port(host_port)
                   if host && port

data/lib/datadog/tracing/contrib/propagation/sql_comment.rb

@@ -21,7 +21,7 @@ module Datadog
             return sql unless mode.enabled?
 
             tags = {
-              Ext::KEY_DATABASE_SERVICE => span_op.service,
+              Ext::KEY_DATABASE_SERVICE => span_op.get_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE) || span_op.service,
               Ext::KEY_ENVIRONMENT => datadog_configuration.env,
               Ext::KEY_PARENT_SERVICE => datadog_configuration.service,
               Ext::KEY_VERSION => datadog_configuration.version

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

@@ -46,7 +46,7 @@ module Datadog
 
             option :error_handler do |o|
               o.type :proc
-              o.experimental_default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+              o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
             end
           end
         end

data/lib/datadog/tracing/contrib/racecar/event.rb

@@ -48,6 +48,11 @@ module Datadog
               # Measure service stats
               Contrib::Analytics.set_measured(span)
 
+              # Tag original global service name if not used
+              if span.service != Datadog.configuration.service
+                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+              end
+
               span.set_tag(Ext::TAG_TOPIC, payload[:topic])
               span.set_tag(Ext::TAG_CONSUMER, payload[:consumer_class])
               span.set_tag(Ext::TAG_PARTITION, payload[:partition])

data/lib/datadog/tracing/contrib/rack/header_tagging.rb

@@ -37,10 +37,20 @@ module Datadog
                      whitelist = configuration[:headers][:response] || []
                      whitelist.each_with_object({}) do |header, result|
                        header_value = headers[header]
-                       unless header_value.nil?
-                         header_tag = Tracing::Metadata::Ext::HTTP::ResponseHeaders.to_tag(header)
-                         result[header_tag] = header_value
-                       end
+
+                       next if header_value.nil?
+
+                       header_tag = Tracing::Metadata::Ext::HTTP::ResponseHeaders.to_tag(header)
+
+                       # Maintain the value format between Rack 2 and 3
+                       #
+                       # Rack 2.x => { 'foo' => 'bar,baz' }
+                       # Rack 3.x => { 'foo' => ['bar', 'baz'] }
+                       result[header_tag] = if header_value.is_a? Array
+                                              header_value.join(',')
+                                            else
+                                              header_value
+                                            end
                      end
                    end
 

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

@@ -32,7 +32,7 @@ module Datadog
             option :analytics_enabled do |o|
               o.type :bool, nilable: true
               o.env Ext::ENV_ANALYTICS_ENABLED
-              o.on_set do |value|
+              o.after_set do |value|
                 # Update ActionPack analytics too
                 Datadog.configuration.tracing[:action_pack][:analytics_enabled] = value
               end
@@ -42,7 +42,7 @@ module Datadog
               o.type :float
               o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
               o.default 1.0
-              o.on_set do |value|
+              o.after_set do |value|
                 # Update ActionPack analytics too
                 Datadog.configuration.tracing[:action_pack][:analytics_sample_rate] = value
               end
@@ -55,7 +55,7 @@ module Datadog
             end
             # DEV-2.0: Breaking changes for removal.
             option :exception_controller do |o|
-              o.on_set do |value|
+              o.after_set do |value|
                 if value
                   Datadog::Core.log_deprecation do
                     'The error controller is now automatically detected. '\
@@ -70,7 +70,7 @@ module Datadog
             option :template_base_path do |o|
               o.type :string
               o.default 'views/'
-              o.on_set do |value|
+              o.after_set do |value|
                 # Update ActionView template base path too
                 Datadog.configuration.tracing[:action_view][:template_base_path] = value
               end

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

@@ -41,7 +41,7 @@ module Datadog
             option :tasks do |o|
               o.type :array
               o.default []
-              o.on_set do |value|
+              o.after_set do |value|
                 # DEV: It should be possible to modify the value after it's set. E.g. for normalization.
                 options[:tasks].instance_variable_set(:@value, value.map(&:to_s).to_set)
               end

data/lib/datadog/tracing/contrib/redis/tags.rb

@@ -20,6 +20,11 @@ module Datadog
                 )
               end
 
+              # Tag original global service name if not used
+              if span.service != Datadog.configuration.service
+                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_COMMAND)
 

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

@@ -33,7 +33,7 @@ module Datadog
             option :service_name
             option :error_handler do |o|
               o.type :proc
-              o.experimental_default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+              o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
             end
           end
         end

data/lib/datadog/tracing/contrib/rest_client/request_patch.rb

@@ -41,6 +41,11 @@ module Datadog
                 )
               end
 
+              # Tag original global service name if not used
+              if span.service != Datadog.configuration.service
+                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

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

@@ -49,6 +49,11 @@ module Datadog
             end
 
             def set_common_tags(span, db)
+              # Tag original global service name if not used
+              if span.service != Datadog.configuration.service
+                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
 

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

@@ -33,7 +33,7 @@ module Datadog
             option :service_name
             option :error_handler do |o|
               o.type :proc
-              o.experimental_default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+              o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
             end
             option :tag_body, default: false, type: :bool
           end

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

@@ -40,7 +40,7 @@ module Datadog
             option :client_service_name
             option :error_handler do |o|
               o.type :proc
-              o.experimental_default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+              o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
             end
             option :quantize, default: {}, type: :hash
             option :distributed_tracing, default: false, type: :bool

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

@@ -31,7 +31,7 @@ module Datadog
             option :service_name
             option :error_handler do |o|
               o.type :proc
-              o.experimental_default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+              o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
             end
             option :tag_body, default: false, type: :bool
           end

data/lib/datadog/tracing/contrib/utils/quantization/http.rb

@@ -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/distributed/propagation.rb

@@ -18,6 +18,12 @@ module Datadog
         # @param propagation_styles [Hash<String,Object>]
         def initialize(propagation_styles:)
           @propagation_styles = propagation_styles
+          # We need to make sure propagation_style option is evaluated.
+          # Our options are lazy evaluated and it happens that propagation_style has the after_set callback
+          # that affect Datadog.configuration.tracing.distributed_tracing.propagation_inject_style and
+          # Datadog.configuration.tracing.distributed_tracing.propagation_extract_style
+          # By calling it here, we make sure if the customers has set any value either via code or ENV variable is applied.
+          ::Datadog.configuration.tracing.distributed_tracing.propagation_style
         end
 
         # inject! populates the env with span ID, trace ID and sampling priority
@@ -72,8 +78,10 @@ module Datadog
         #
         # @param data [Hash]
         def extract(data)
-          trace_digest = nil
-          dd_trace_digest = nil
+          return unless data
+          return if data.empty?
+
+          extracted_trace_digest = nil
 
           ::Datadog.configuration.tracing.distributed_tracing.propagation_extract_style.each do |style|
             propagator = @propagation_styles[style]
@@ -83,42 +91,14 @@ module Datadog
               extracted_trace_digest = propagator.extract(data)
             rescue => e
               ::Datadog.logger.error(
-                'Error extracting distributed trace data. ' \
-              "Cause: #{e} Location: #{Array(e.backtrace).first}"
+                "Error extracting distributed trace data. Cause: #{e} Location: #{Array(e.backtrace).first}"
               )
             end
 
-            # Skip if no valid data was found
-            next if extracted_trace_digest.nil?
-
-            # Keep track of the Datadog extracted digest, we want to return it if we have it.
-            if extracted_trace_digest && style == Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG
-              dd_trace_digest = extracted_trace_digest
-            end
-
-            # No previously extracted trace data, use the one we just extracted
-            if trace_digest.nil?
-              trace_digest = extracted_trace_digest
-            else
-              unless trace_digest.trace_id == extracted_trace_digest.trace_id \
-                    && trace_digest.span_id == extracted_trace_digest.span_id
-                # We have two mismatched propagation contexts
-                ::Datadog.logger.debug do
-                  'Cannot extract distributed trace data: extracted styles differ, ' \
-                  "#{trace_digest.trace_id} != #{extracted_trace_digest.trace_id} && " \
-                  "#{trace_digest.span_id} != #{extracted_trace_digest.span_id}"
-                end
-
-                # It's safer to create a new context than to attach ourselves to the wrong context
-                return TraceDigest.new # Early return from the whole method
-              end
-            end
+            break if extracted_trace_digest
           end
 
-          # Return the extracted trace digest if we found one or else a new empty digest.
-          # Always return the Datadog trace digest if one exists since it has more
-          # information than the B3 digest, e.g. origin, priority sampling values.
-          dd_trace_digest || trace_digest || nil
+          extracted_trace_digest
         end
       end
     end

data/lib/datadog/tracing/metadata/tagging.rb

@@ -59,8 +59,8 @@ module Datadog
         # A valid example is:
         #
         #   span.set_tags({ "http.method" => "GET", "user.id" => "234" })
-        def set_tags(tags)
-          tags.each { |k, v| set_tag(k, v) }
+        def set_tags(hash)
+          hash.each { |k, v| set_tag(k, v) }
         end
 
         # Returns true if the provided `tag` was set to a non-nil value.
@@ -111,7 +111,7 @@ module Datadog
         # Returns a copy of all metadata.
         # Keys for `@meta` and `@metrics` don't collide, by construction.
         def tags
-          @meta.merge(@metrics)
+          meta.merge(metrics)
         end
 
         protected

data/lib/datadog/tracing/sync_writer.rb

@@ -4,7 +4,7 @@ require_relative 'pipeline'
 require_relative 'runtime/metrics'
 require_relative 'writer'
 
-require_relative '../../ddtrace/transport/http'
+require_relative 'transport/http'
 
 module Datadog
   module Tracing
@@ -20,10 +20,10 @@ module Datadog
         :events,
         :transport
 
-      # @param [Datadog::Transport::Traces::Transport] transport a custom transport instance.
+      # @param [Datadog::Tracing::Transport::Traces::Transport] transport a custom transport instance.
       #   If provided, overrides `transport_options` and `agent_settings`.
       # @param [Hash<Symbol,Object>] transport_options options for the default transport instance.
-      # @param [Datadog::Core::Configuration::AgentSettingsResolver::AgentSettings] agent_settings agent options for
+      # @param [Datadog::Tracing::Configuration::AgentSettingsResolver::AgentSettings] agent_settings agent options for
       #   the default transport instance.
       def initialize(transport: nil, transport_options: {}, agent_settings: nil)
         @transport = transport || begin

data/lib/datadog/tracing/tracer.rb

@@ -353,6 +353,8 @@ module Datadog
         end
       end
 
+      # Creates a new TraceOperation, with events bounds to this Tracer instance.
+      # @return [TraceOperation]
       def start_trace(continue_from: nil)
         # Build a new trace using digest if provided.
         trace = build_trace(continue_from)