datadog 2.33.0 → 2.35.0

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

@@ -119,6 +119,7 @@ module Datadog
           def annotate!(span, datum)
             span.resource = datum[:method].to_s.upcase
             span.service = service_name(datum[:host], @options)
+            span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
             span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
             if @options[:peer_service]
@@ -128,11 +129,6 @@ 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/ext.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../metadata/ext'
+
 module Datadog
   module Tracing
     module Contrib
@@ -62,7 +64,7 @@ module Datadog
           TAG_PEER_SERVICE_REMAP = '_dd.peer.service.remapped_from'
 
           # Set equal to the global service when contrib span.service is overriden
-          TAG_BASE_SERVICE = '_dd.base_service'
+          TAG_BASE_SERVICE = Tracing::Metadata::Ext::TAG_BASE_SERVICE
         end
       end
     end

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

@@ -47,6 +47,7 @@ module Datadog
           def annotate!(span, env, options)
             span.resource = resource_name(env)
             span.service = service_name(env[:url].host, options)
+            span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
             span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
             if options[:peer_service]
@@ -56,11 +57,6 @@ 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/grape/endpoint.rb

@@ -62,6 +62,7 @@ module Datadog
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ENDPOINT_RUN)
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
 
               if (grape_route = env['grape.routing_args']) && grape_route[:route_info]
                 trace.set_tag(
@@ -162,6 +163,7 @@ module Datadog
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ENDPOINT_RENDER)
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
 
               Thread.current[KEY_RENDER] = true
             rescue => e
@@ -213,6 +215,7 @@ module Datadog
               begin
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ENDPOINT_RUN_FILTERS)
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
 
                 # Set analytics sample rate
                 Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?

data/lib/datadog/tracing/contrib/graphql/unified_trace.rb

@@ -214,6 +214,7 @@ module Datadog
               resource: resource,
               service: @service_name
             ) do |span|
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               if Contrib::Analytics.enabled?(@analytics_enabled)
                 Contrib::Analytics.set_sample_rate(span, @analytics_sample_rate)
               end

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

@@ -29,6 +29,7 @@ module Datadog
               }
 
               Tracing.trace(Ext::SPAN_CLIENT, **options) do |span, trace|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 annotate!(trace, span, keywords, formatter)
 
                 begin
@@ -59,11 +60,6 @@ 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)

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

@@ -33,6 +33,7 @@ module Datadog
               set_distributed_context!(metadata)
 
               Tracing.trace(Ext::SPAN_SERVICE, **options) do |span|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 annotate!(span, metadata, formatter)
 
                 begin
@@ -66,11 +67,6 @@ 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)

data/lib/datadog/tracing/contrib/hanami/action_tracer.rb

@@ -22,6 +22,7 @@ module Datadog
               service: configuration[:service_name],
               type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span_op, trace_op|
+              span_op.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ACTION)
 

data/lib/datadog/tracing/contrib/hanami/renderer_policy_tracing.rb

@@ -24,6 +24,7 @@ module Datadog
               resource: action_klass.to_s,
               type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span_op, _trace_op|
+              span_op.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_RENDER)
 

data/lib/datadog/tracing/contrib/hanami/router_tracing.rb

@@ -17,6 +17,7 @@ module Datadog
               service: configuration[:service_name],
               type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span_op, trace_op|
+              span_op.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ROUTING)
 

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

@@ -32,6 +32,7 @@ module Datadog
 
               Tracing.trace(Ext::SPAN_REQUEST) do |span, trace|
                 span.service = service_name(host, request_options, client_config)
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
                 span.resource = req.method
 
@@ -63,11 +64,6 @@ 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

@@ -28,6 +28,7 @@ module Datadog
               Tracing.trace(Ext::SPAN_REQUEST) do |span, trace|
                 begin
                   span.service = service_name(host, request_options, client_config)
+                  span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                   span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
                   if Tracing::Distributed::PropagationPolicy.enabled?(
@@ -68,11 +69,6 @@ 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

@@ -28,6 +28,7 @@ module Datadog
               Tracing.trace(Ext::SPAN_REQUEST) do |span, trace|
                 begin
                   span.service = service_name(host, request_options, client_config)
+                  span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                   span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
                   if Tracing::Distributed::PropagationPolicy.enabled?(
@@ -66,11 +67,6 @@ 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/kafka/event.rb

@@ -30,6 +30,7 @@ module Datadog
             end
 
             def on_start(span, _event, _id, payload)
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_MESSAGING_SYSTEM)
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../utils/quantization/hash'
+require_relative '../utils/quantization/hash_formatter'
 
 module Datadog
   module Tracing
@@ -20,11 +20,11 @@ module Datadog
         # returns a formatted and normalized query
         def query_builder(command_name, database_name, command)
           # always exclude the command name
-          options = Contrib::Utils::Quantization::Hash.merge_options(quantization_options, exclude: [command_name.to_s])
+          options = Contrib::Utils::Quantization::HashFormatter.merge_options(quantization_options, exclude: [command_name.to_s])
 
           # quantized statements keys are strings to avoid leaking Symbols in older Rubies
           # as Symbols are not GC'ed in Rubies prior to 2.2
-          base_info = Contrib::Utils::Quantization::Hash.format(
+          base_info = Contrib::Utils::Quantization::HashFormatter.format(
             {
               'operation' => command_name,
               'database' => database_name,
@@ -33,11 +33,11 @@ module Datadog
             options
           )
 
-          base_info.merge(Contrib::Utils::Quantization::Hash.format(command, options))
+          base_info.merge(Contrib::Utils::Quantization::HashFormatter.format(command, options))
         end
 
         def quantization_options
-          Contrib::Utils::Quantization::Hash.merge_options(DEFAULT_OPTIONS, configuration[:quantize])
+          Contrib::Utils::Quantization::HashFormatter.merge_options(DEFAULT_OPTIONS, configuration[:quantize])
         end
 
         def configuration

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

@@ -30,6 +30,8 @@ module Datadog
             span = Tracing.trace(Ext::SPAN_COMMAND, service: service, type: Ext::SPAN_TYPE_COMMAND)
             set_span(event, span)
 
+            span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+
             # build a quantized Query using the Parser module
             query = MongoDB.query_builder(event.command_name, event.database_name, event.command)
             serialized_query = serialize_query(query)
@@ -41,11 +43,6 @@ 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)

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

@@ -24,6 +24,7 @@ module Datadog
               on_error = Datadog.configuration_for(self, :on_error) || datadog_configuration[:on_error]
 
               Tracing.trace(Ext::SPAN_QUERY, service: service, on_error: on_error) do |span, trace_op|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.resource = sql
                 span.type = Tracing::Metadata::Ext::SQL::TYPE
 
@@ -34,11 +35,6 @@ 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)
 

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

@@ -34,6 +34,7 @@ module Datadog
               response = nil
               # rubocop:disable Metrics/BlockLength
               Tracing.trace('opensearch.query', service: datadog_configuration[:service_name]) do |span|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 # Set generic tags
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
@@ -62,11 +63,6 @@ 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)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../utils/quantization/hash'
+require_relative '../utils/quantization/hash_formatter'
 
 module Datadog
   module Tracing
@@ -41,7 +41,7 @@ module Datadog
             # Parse each statement and quantize them.
             statements.collect do |string|
               reserialize_json(string, options[:placeholder]) do |obj|
-                Contrib::Utils::Quantization::Hash.format(obj, options)
+                Contrib::Utils::Quantization::HashFormatter.format(obj, options)
               end
             end.join("\n")
           end

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

@@ -109,6 +109,7 @@ module Datadog
                 resource: resource,
                 type: Tracing::Metadata::Ext::SQL::TYPE
               ) do |span, trace_op|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 annotate_span_with_query!(span, service)
                 # Set analytics sample rate
                 Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
@@ -160,11 +161,6 @@ 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

@@ -23,6 +23,7 @@ module Datadog
                   service: datadog_configuration[:service_name]
                 ) do |span|
                   begin
+                    span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                     decorate!(span, Ext::TAG_OPERATION_QUERY)
                     span.resource = query
                     span.type = Tracing::Metadata::Ext::SQL::TYPE
@@ -41,6 +42,7 @@ module Datadog
                   service: datadog_configuration[:service_name]
                 ) do |span|
                   begin
+                    span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                     decorate!(span, Ext::TAG_OPERATION_QUERY)
                     span.resource = query
                     span.type = Tracing::Metadata::Ext::SQL::TYPE
@@ -59,6 +61,7 @@ module Datadog
                   service: datadog_configuration[:service_name]
                 ) do |span|
                   begin
+                    span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                     decorate!(span, Ext::TAG_OPERATION_KILL)
                     span.resource = Ext::SPAN_KILL
                     span.type = Tracing::Metadata::Ext::AppTypes::TYPE_DB
@@ -92,11 +95,6 @@ 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/ext.rb

@@ -18,6 +18,9 @@ module Datadog
             # The `service` mode propagates service configuration
             SERVICE = 'service'
 
+            # The `dynamic_service` mode propagates service configuration + DBM service hash
+            DYNAMIC_SERVICE = 'dynamic_service'
+
             # The `full` mode propagates service configuration + trace context
             FULL = 'full'
 

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

@@ -14,7 +14,7 @@ module Datadog
             end
 
             def service?
-              mode == Ext::SERVICE
+              mode == Ext::SERVICE || mode == Ext::DYNAMIC_SERVICE
             end
 
             def full?
@@ -26,7 +26,7 @@ module Datadog
             end
 
             def inject_sql_basehash?
-              inject_sql_basehash
+              inject_sql_basehash || mode == Ext::DYNAMIC_SERVICE
             end
           end
         end

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

@@ -16,6 +16,7 @@ module Datadog
             }
 
             Tracing.trace(Ext::SPAN_JOB, **trace_options) do |request_span|
+              request_span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               request_span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
 
               request_span.resource = job.class.name.to_s

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

@@ -35,6 +35,7 @@ module Datadog
 
             def on_start(span, event, _id, payload)
               span.service = configuration[:service_name]
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span.resource = payload[:consumer_class]
 
               span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_MESSAGING_SYSTEM)
@@ -48,11 +49,6 @@ 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

@@ -1,11 +1,18 @@
 # frozen_string_literal: true
 
+require_relative 'header_collection'
+
 module Datadog
   module Tracing
     module Contrib
       module Rack
         # Matches Rack-style headers with a matcher and sets matching headers into a span.
         module HeaderTagging
+          DATADOG_REQUEST_ATTRIBUTION_HEADERS = [
+            'x-datadog-endpoint-scan',
+            'x-datadog-security-test'
+          ].freeze
+
           def self.tag_request_headers(span, env, configuration)
             # Wrap env in a case-insensitive Rack-style accessor.
             headers = env.is_a?(Header::RequestHeaderCollection) ? env : Header::RequestHeaderCollection.new(env)
@@ -25,6 +32,7 @@ module Datadog
             end
 
             span.set_tags(tags)
+            tag_datadog_request_attribution_headers(span, headers)
           end
 
           def self.tag_response_headers(span, headers, configuration)
@@ -56,6 +64,21 @@ module Datadog
 
             span.set_tags(tags)
           end
+
+          # Datadog-originated requests use these headers for request attribution.
+          # They are tagged independently of user-configured header tagging so
+          # downstream systems can distinguish them from regular application traffic.
+          #
+          # @api private
+          private_class_method def self.tag_datadog_request_attribution_headers(span, headers)
+            DATADOG_REQUEST_ATTRIBUTION_HEADERS.each do |header|
+              header_value = headers.get(header)
+              next unless header_value
+
+              header_tag = Tracing::Metadata::Ext::HTTP::RequestHeaders.to_tag(header)
+              span.set_tag(header_tag, header_value)
+            end
+          end
         end
       end
     end

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

@@ -135,6 +135,7 @@ module Datadog
             # Otherwise, the getter method would delegate to its root span
             trace.resource = request_span.resource unless trace.resource_override?
 
+            request_span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
             request_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
             request_span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
             request_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_SERVER)

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

@@ -32,12 +32,14 @@ module Datadog
 
             request_span = Tracing.trace(Ext::SPAN_HTTP_PROXY_REQUEST, **options)
 
+            request_span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT_HTTP_PROXY)
             request_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT_HTTP_PROXY)
             request_span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_HTTP_PROXY_REQUEST)
             request_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_PROXY)
 
             queue_span = Tracing.trace(Ext::SPAN_HTTP_PROXY_QUEUE, **options)
 
+            queue_span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT_HTTP_PROXY)
             queue_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT_HTTP_PROXY)
             queue_span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_HTTP_PROXY_QUEUE)
             queue_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_PROXY)

data/lib/datadog/tracing/contrib/rails/runner.rb

@@ -53,6 +53,7 @@ module Datadog
               name,
               service: Datadog.configuration.tracing[:rails][:service_name],
               tags: {
+                Tracing::Metadata::Ext::TAG_SVC_SRC => Ext::TAG_COMPONENT,
                 Tracing::Metadata::Ext::TAG_COMPONENT => Ext::TAG_COMPONENT,
                 Tracing::Metadata::Ext::TAG_OPERATION => operation,
               }
@@ -94,6 +95,7 @@ module Datadog
                 service: Datadog.configuration.tracing[:rails][:service_name],
                 resource: resource,
                 tags: {
+                  Tracing::Metadata::Ext::TAG_SVC_SRC => Ext::TAG_COMPONENT,
                   Tracing::Metadata::Ext::TAG_COMPONENT => Ext::TAG_COMPONENT,
                   Tracing::Metadata::Ext::TAG_OPERATION => operation,
                 }

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

@@ -3,7 +3,7 @@
 require_relative '../../metadata/ext'
 require_relative '../analytics'
 require_relative 'ext'
-require_relative '../utils/quantization/hash'
+require_relative '../utils/quantization/hash_formatter'
 
 module Datadog
   module Tracing
@@ -53,6 +53,7 @@ module Datadog
 
             def annotate_invoke!(span, args)
               span.resource = name
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
                 Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
@@ -71,6 +72,7 @@ module Datadog
 
             def annotate_execute!(span, args)
               span.resource = name
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_EXECUTE)
               span.set_tag(Ext::TAG_EXECUTE_ARGS, quantize_args(args.to_hash)) unless args.nil?
@@ -80,7 +82,7 @@ module Datadog
 
             def quantize_args(args)
               quantize_options = configuration[:quantize][:args]
-              Contrib::Utils::Quantization::Hash.format(args, quantize_options)
+              Contrib::Utils::Quantization::HashFormatter.format(args, quantize_options)
             end
 
             def enabled?

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

@@ -21,11 +21,6 @@ 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/redis/trace_middleware.rb

@@ -26,6 +26,7 @@ module Datadog
           class << self
             def call(client, command, service_name, command_args)
               Tracing.trace(Redis::Ext::SPAN_COMMAND, type: Redis::Ext::TYPE, service: service_name) do |span|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Redis::Ext::TAG_COMPONENT)
                 raw_command = get_command(command, true)
                 span.resource = command_args ? raw_command : get_command(command, false)
 
@@ -37,6 +38,7 @@ module Datadog
 
             def call_pipelined(client, commands, service_name, command_args)
               Tracing.trace(Redis::Ext::SPAN_COMMAND, type: Redis::Ext::TYPE, service: service_name) do |span|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Redis::Ext::TAG_COMPONENT)
                 raw_command = get_pipeline_commands(commands, true)
                 span.resource = command_args ? raw_command : get_pipeline_commands(commands, false)
 

data/lib/datadog/tracing/contrib/resque/resque_job.rb

@@ -35,6 +35,7 @@ module Datadog
             return yield unless datadog_configuration && Tracing.enabled?
 
             Tracing.trace(Ext::SPAN_JOB, **span_options) do |span|
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span.resource = args.first.is_a?(Hash) && args.first['job_class'] || name
               span.type = Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 

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

@@ -37,6 +37,7 @@ module Datadog
             end
 
             def datadog_tag_request(uri, span)
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span.resource = method.to_s.upcase
 
               if datadog_configuration[:peer_service]
@@ -46,11 +47,6 @@ 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)