datadog 2.17.0 → 2.37.0

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

@@ -56,7 +56,7 @@ module Datadog
 
                 Datadog.logger.warn(
                   "Invalid resource pattern: #{value}. " \
-                  "Supported values are: #{Ext::VALID_RESOURCE_PATTERNS.join(' | ')}. " \
+                  "Supported values are: #{Ext::VALID_RESOURCE_PATTERNS.join(" | ")}. " \
                   "Using default value: #{Ext::DEFAULT_RESOURCE_PATTERN}."
                 )
 

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

@@ -36,10 +36,11 @@ module Datadog
           TAG_PORT = 'http.url_details.port'
           TAG_SCHEME = 'http.url_details.scheme'
           TAG_RESPONSE_CONTENT_LENGTH = 'http.response.content_length'
-          PEER_SERVICE_SOURCES = Array[
+          PEER_SERVICE_SOURCES = [
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
-            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,
+          ].freeze
         end
       end
     end

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

@@ -21,8 +21,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['opensearch-ruby'] \
-              && Gem.loaded_specs['opensearch-ruby'].version
+            Gem.loaded_specs['opensearch-ruby']&.version
           end
 
           def self.loaded?

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

@@ -34,79 +34,73 @@ module Datadog
               response = nil
               # rubocop:disable Metrics/BlockLength
               Tracing.trace('opensearch.query', service: datadog_configuration[:service_name]) do |span|
-                begin
-                  # 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)
-                  span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
-
-                  # Set argument tags
-                  span.set_tag(OpenSearch::Ext::TAG_METHOD, method)
-                  span.set_tag(OpenSearch::Ext::TAG_PATH, path)
-
-                  tag_params(params, span)
-                  tag_body(body, span)
-
-                  # Parse url
-                  original_url = transport.get_connection.full_url(path, {})
-                  url = URI.parse(original_url)
-                  host = url.host
-                  port = url.port
-                  scheme = url.scheme
-                  # Set url.user to nil to remove sensitive information (i.e. user's username and password)
-                  url.user = nil
-
-                  if datadog_configuration[:peer_service]
-                    span.set_tag(
-                      Tracing::Metadata::Ext::TAG_PEER_SERVICE,
-                      datadog_configuration[:peer_service]
-                    )
-                  end
+                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)
+                span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
+
+                # Set argument tags
+                span.set_tag(OpenSearch::Ext::TAG_METHOD, method)
+                span.set_tag(OpenSearch::Ext::TAG_PATH, path)
+
+                tag_params(params, span)
+                tag_body(body, span)
+
+                # Parse url
+                original_url = transport.get_connection.full_url(path, {})
+                url = URI.parse(original_url)
+                host = url.host
+                port = url.port
+                scheme = url.scheme
+                # Set url.user to nil to remove sensitive information (i.e. user's username and password)
+                url.user = nil
+
+                if datadog_configuration[:peer_service]
+                  span.set_tag(
+                    Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                    datadog_configuration[:peer_service]
+                  )
+                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)
+                span.set_tag(OpenSearch::Ext::TAG_PORT, port)
+                span.set_tag(OpenSearch::Ext::TAG_SCHEME, scheme)
 
-                  # Set url tags
-                  span.set_tag(OpenSearch::Ext::TAG_URL, url)
-                  span.set_tag(OpenSearch::Ext::TAG_HOST, host)
-                  span.set_tag(OpenSearch::Ext::TAG_PORT, port)
-                  span.set_tag(OpenSearch::Ext::TAG_SCHEME, scheme)
-
-                  span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
-
-                  # Define span resource
-                  quantized_url = if datadog_configuration[:resource_pattern] == Ext::RELATIVE_RESOURCE_PATTERN
-                                    OpenSearch::Quantize.format_url(url.path)
-                                  else # Default to Ext::ABSOLUTE_RESOURCE_PATTERN
-                                    OpenSearch::Quantize.format_url(url)
-                                  end
-                  span.resource = "#{method} #{quantized_url}"
-                  Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
-                rescue StandardError => e
-                  Datadog.logger.error(e.message)
-                  Datadog::Core::Telemetry::Logger.report(e)
-                  # TODO: Refactor the code to streamline the execution without ensure
-                ensure
-                  begin
-                    response = super
-                  rescue => e
-                    status_code = ::OpenSearch::Transport::Transport::ERRORS.key(e.class)
-                    span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, status_code) if status_code
-                    raise
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
+
+                # Define span resource
+                quantized_url = if datadog_configuration[:resource_pattern] == Ext::RELATIVE_RESOURCE_PATTERN
+                  OpenSearch::Quantize.format_url(url.path)
+                else # Default to Ext::ABSOLUTE_RESOURCE_PATTERN
+                  OpenSearch::Quantize.format_url(url)
+                end
+                span.resource = "#{method} #{quantized_url}"
+                Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
+              rescue => e
+                Datadog.logger.error("#{e.class}: #{e.message}")
+                Datadog::Core::Telemetry::Logger.report(e)
+                # TODO: Refactor the code to streamline the execution without ensure
+              ensure
+                begin
+                  response = super
+                rescue => e
+                  status_code = ::OpenSearch::Transport::Transport::ERRORS.key(e.class)
+                  span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, status_code) if status_code
+                  raise
+                end
+                # Set post-response tags
+                if response
+                  if response.respond_to?(:status)
+                    span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
                   end
-                  # Set post-response tags
-                  if response
-                    if response.respond_to?(:status)
-                      span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
-                    end
-                    if response.respond_to?(:headers) && (response.headers || {})['content-length']
-                      span.set_tag(
-                        OpenSearch::Ext::TAG_RESPONSE_CONTENT_LENGTH,
-                        response.headers['content-length'].to_i
-                      )
-                    end
+                  if response.respond_to?(:headers) && (response.headers || {})['content-length']
+                    span.set_tag(
+                      OpenSearch::Ext::TAG_RESPONSE_CONTENT_LENGTH,
+                      response.headers['content-length'].to_i
+                    )
                   end
                 end
               end

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
@@ -28,7 +28,7 @@ module Datadog
           # Use Elasticsearch implementation
           def format_body(body, options = {})
             format_body!(body, options)
-          rescue StandardError
+          rescue
             options[:placeholder] || DEFAULT_PLACEHOLDER
           end
 
@@ -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
@@ -51,10 +51,10 @@ module Datadog
               # Show
               # If either is :all, value becomes :all
               options[:show] = if original[:show] == :all || additional[:show] == :all
-                                 :all
-                               else
-                                 (original[:show] || []).dup.concat(additional[:show] || []).uniq
-                               end
+                :all
+              else
+                (original[:show] || []).dup.concat(additional[:show] || []).uniq
+              end
 
               # Exclude
               options[:exclude] = (original[:exclude] || []).dup.concat(additional[:exclude] || []).uniq

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

@@ -27,7 +27,7 @@ module Datadog
           end
 
           def patch_name
-            self.class != Class && self.class != Module ? self.class.name : name
+            (self.class != Class && self.class != Module) ? self.class.name : name
           end
 
           def patched?
@@ -38,15 +38,13 @@ module Datadog
             return unless defined?(super)
 
             patch_only_once.run do
-              begin
-                super.tap do
-                  # Emit a metric
-                  Datadog.health_metrics.instrumentation_patched(1, tags: default_tags)
-                  @patch_successful = true
-                end
-              rescue StandardError => e
-                on_patch_error(e)
+              super.tap do
+                # Emit a metric
+                Datadog.health_metrics.instrumentation_patched(1, tags: default_tags)
+                @patch_successful = true
               end
+            rescue => e
+              on_patch_error(e)
             end
           end
 

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

@@ -57,6 +57,12 @@ module Datadog
               o.default false
             end
 
+            option :inject_sql_basehash do |o|
+              o.type :bool
+              o.env Contrib::Propagation::SqlComment::Ext::ENV_DBM_INJECT_SQL_BASEHASH
+              o.default false
+            end
+
             option :peer_service do |o|
               o.type :string, nilable: true
               o.env Ext::ENV_PEER_SERVICE

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?
@@ -116,7 +117,8 @@ module Datadog
                 if sql
                   propagation_mode = Contrib::Propagation::SqlComment::Mode.new(
                     comment_propagation,
-                    datadog_configuration[:append_comment]
+                    datadog_configuration[:append_comment],
+                    datadog_configuration[:inject_sql_basehash]
                   )
                   Contrib::Propagation::SqlComment.annotate!(span, propagation_mode)
                   propagated_sql_statement = Contrib::Propagation::SqlComment.prepend_comment(
@@ -159,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/pg/integration.rb

@@ -18,7 +18,7 @@ module Datadog
           register_as :pg
 
           def self.version
-            Gem.loaded_specs['pg'] && Gem.loaded_specs['pg'].version
+            Gem.loaded_specs['pg']&.version
           end
 
           def self.loaded?

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

@@ -29,7 +29,7 @@ module Datadog
           TAG_OPERATION_QUERY = 'query'
           TAG_OPERATION_KILL = 'kill'
           TAG_SYSTEM = 'presto'
-          PEER_SERVICE_SOURCES = (Array[Ext::TAG_SCHEMA_NAME] +
+          PEER_SERVICE_SOURCES = ([Ext::TAG_SCHEMA_NAME] +
                                             Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
         end
       end

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

@@ -23,12 +23,13 @@ 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
                     span.set_tag(Ext::TAG_QUERY_ASYNC, false)
-                  rescue StandardError => e
-                    Datadog.logger.debug("error preparing span for presto: #{e}")
+                  rescue => e
+                    Datadog.logger.debug("error preparing span for presto: #{e.class}: #{e.message}")
                   end
 
                   super(query)
@@ -41,12 +42,13 @@ 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
                     span.set_tag(Ext::TAG_QUERY_ASYNC, !blk.nil?)
-                  rescue StandardError => e
-                    Datadog.logger.debug("error preparing span for presto: #{e}")
+                  rescue => e
+                    Datadog.logger.debug("error preparing span for presto: #{e.class}: #{e.message}")
                   end
 
                   super(query, &blk)
@@ -59,13 +61,14 @@ 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
                     # ^ not an SQL type span, since there's no SQL query
                     span.set_tag(Ext::TAG_QUERY_ID, query_id)
-                  rescue StandardError => e
-                    Datadog.logger.debug("error preparing span for presto: #{e}")
+                  rescue => e
+                    Datadog.logger.debug("error preparing span for presto: #{e.class}: #{e.message}")
                   end
 
                   super(query_id)
@@ -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/presto/integration.rb

@@ -21,7 +21,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['presto-client'] && Gem.loaded_specs['presto-client'].version
+            Gem.loaded_specs['presto-client']&.version
           end
 
           def self.loaded?

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

@@ -15,7 +15,7 @@ module Datadog
 
             def to_s
               @string ||= begin
-                ret = String.new
+                ret = +''
 
                 @hash.each do |key, value|
                   next if value.nil?

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

@@ -8,18 +8,28 @@ module Datadog
           module Ext
             ENV_DBM_PROPAGATION_MODE = 'DD_DBM_PROPAGATION_MODE'
 
+            # Determines whether to inject the propagation hash into the SQL comment
+            # TODO: BASEHASH is confusing as a name, so look into better names that can apply cross tracer in the future
+            ENV_DBM_INJECT_SQL_BASEHASH = 'DD_DBM_INJECT_SQL_BASEHASH'
+
             # The default mode for sql comment propagation
             DISABLED = 'disabled'
 
             # 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'
 
             # The value should be `true` when `full` mode
             TAG_DBM_TRACE_INJECTED = '_dd.dbm_trace_injected'
 
+            # Checksum of the agent's container tags and this process' tags
+            TAG_PROPAGATED_HASH = '_dd.propagated_hash'
+
             # Database service/sql span service (i.e. the service executing the actual query)
             #
             # If fake services are disabled:
@@ -52,6 +62,9 @@ module Datadog
             # @see Datadog::Tracing::Metadata::Ext::TAG_PEER_SERVICE
             KEY_PEER_SERVICE = 'ddprs'
 
+            # DBM service hash (ddsh) for propagation
+            KEY_BASE_HASH = 'ddsh'
+
             KEY_TRACEPARENT = 'traceparent'
           end
         end

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

@@ -8,13 +8,13 @@ module Datadog
       module Propagation
         # Implements sql comment propagation related contracts.
         module SqlComment
-          Mode = Struct.new(:mode, :append) do
+          Mode = Struct.new(:mode, :append, :inject_sql_basehash) do
             def enabled?
               service? || full?
             end
 
             def service?
-              mode == Ext::SERVICE
+              mode == Ext::SERVICE || mode == Ext::DYNAMIC_SERVICE
             end
 
             def full?
@@ -24,6 +24,10 @@ module Datadog
             def append?
               append
             end
+
+            def inject_sql_basehash?
+              inject_sql_basehash || mode == Ext::DYNAMIC_SERVICE
+            end
           end
         end
       end

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

@@ -14,6 +14,16 @@ module Datadog
           def self.annotate!(span_op, mode)
             return unless mode.enabled?
 
+            config = Datadog.configuration
+
+            # Add DBM propagation hash when enabled and available.
+            # This matches the behavior in the Python tracer:
+            # https://github.com/DataDog/dd-trace-py/blob/5e94be5c97b42060e5800e35d8fa41472fb8c569/ddtrace/propagation/_database_monitoring.py#L89
+            if inject_hash?(mode, config)
+              checksum = Datadog.send(:components).agent_info.propagation_checksum
+              span_op.set_tag(Ext::TAG_PROPAGATED_HASH, checksum.to_s) if checksum
+            end
+
             span_op.set_tag(Ext::TAG_DBM_TRACE_INJECTED, true) if mode.full?
           end
 
@@ -36,6 +46,14 @@ module Datadog
               Ext::KEY_PEER_SERVICE => peer_service,
             }
 
+            # Add DBM propagation hash to SQL comment when enabled and available.
+            # This matches the behavior in the Python tracer:
+            # https://github.com/DataDog/dd-trace-py/blob/5e94be5c97b42060e5800e35d8fa41472fb8c569/ddtrace/propagation/_database_monitoring.py#L139
+            if inject_hash?(mode, config)
+              checksum = Datadog.send(:components).agent_info.propagation_checksum
+              tags[Ext::KEY_BASE_HASH] = checksum.to_s if checksum
+            end
+
             db_service = peer_service || span_op.service
             if parent_service != db_service # Only set if it's different from parent_service; otherwise it's redundant
               tags[Ext::KEY_DATABASE_SERVICE] = db_service
@@ -48,7 +66,7 @@ module Datadog
                   Tracing::Distributed::TraceContext.new(fetcher: nil).send(:build_traceparent, trace_op.to_digest)
               else
                 Datadog.logger.warn(
-                  'Sql comment propagation with `full` mode is aborted, because tracing is disabled. '\
+                  'Sql comment propagation with `full` mode is aborted, because tracing is disabled. ' \
                   'Please set `Datadog.configuration.tracing.enabled = true` to continue.'
                 )
               end
@@ -60,6 +78,12 @@ module Datadog
               "#{Comment.new(tags)} #{sql}"
             end
           end
+
+          # @return [Boolean] whether to inject the propagation checksum (basehash)
+          def self.inject_hash?(mode, config)
+            mode.inject_sql_basehash? && config.experimental_propagate_process_tags_enabled
+          end
+          private_class_method :inject_hash?
         end
       end
     end

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

@@ -11,8 +11,11 @@ module Datadog
           # Default settings for the Que integration
           class Settings < Contrib::Configuration::Settings
             option :service_name
-            option :distributed_tracing, default: true, type: :bool
-
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :enabled do |o|
               o.type :bool
               o.env Ext::ENV_ENABLED

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

@@ -11,6 +11,7 @@ module Datadog
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_QUE_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_QUE_ANALYTICS_SAMPLE_RATE'
           ENV_ENABLED = 'DD_TRACE_QUE_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_QUE_DISTRIBUTED_TRACING'
           ENV_TAG_ARGS_ENABLED = 'DD_TRACE_QUE_TAG_ARGS_ENABLED'
           ENV_TAG_DATA_ENABLED = 'DD_TRACE_QUE_TAG_DATA_ENABLED'
           SERVICE_NAME = 'que'

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

@@ -19,7 +19,7 @@ module Datadog
           register_as :que, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['que'] && Gem.loaded_specs['que'].version
+            Gem.loaded_specs['que']&.version
           end
 
           def self.loaded?

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

@@ -26,7 +26,7 @@ module Datadog
             end
 
             def span_options
-              { service: configuration[:service_name] }
+              {service: configuration[:service_name]}
             end
 
             def configuration
@@ -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/racecar/events/batch.rb

@@ -26,8 +26,8 @@ module Datadog
 
             def span_options
               super.merge(
-                tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_BATCH,
-                        Tracing::Metadata::Ext::TAG_KIND => Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER }
+                tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_BATCH,
+                       Tracing::Metadata::Ext::TAG_KIND => Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER}
               )
             end
           end

data/lib/datadog/tracing/contrib/racecar/events/consume.rb

@@ -25,7 +25,7 @@ module Datadog
             end
 
             def span_options
-              super.merge(tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_CONSUME })
+              super.merge(tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_CONSUME})
             end
           end
         end

data/lib/datadog/tracing/contrib/racecar/events/message.rb

@@ -26,8 +26,8 @@ module Datadog
 
             def span_options
               super.merge(
-                tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_MESSAGE,
-                        Tracing::Metadata::Ext::TAG_KIND => Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER }
+                tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_MESSAGE,
+                       Tracing::Metadata::Ext::TAG_KIND => Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER}
               )
             end
           end

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

@@ -18,7 +18,7 @@ module Datadog
           register_as :racecar, auto_patch: false
 
           def self.version
-            Gem.loaded_specs['racecar'] && Gem.loaded_specs['racecar'].version
+            Gem.loaded_specs['racecar']&.version
           end
 
           def self.loaded?