datadog 2.28.0 → 2.41.0

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

@@ -7,23 +7,23 @@ module Datadog
         # Redis integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_REDIS_ENABLED'
-          ENV_SERVICE_NAME = 'DD_TRACE_REDIS_SERVICE_NAME'
-          ENV_PEER_SERVICE = 'DD_TRACE_REDIS_PEER_SERVICE'
+          ENV_ENABLED = "DD_TRACE_REDIS_ENABLED"
+          ENV_SERVICE_NAME = "DD_TRACE_REDIS_SERVICE_NAME"
+          ENV_PEER_SERVICE = "DD_TRACE_REDIS_PEER_SERVICE"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_REDIS_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_REDIS_ANALYTICS_SAMPLE_RATE'
-          ENV_COMMAND_ARGS = 'DD_REDIS_COMMAND_ARGS'
-          METRIC_PIPELINE_LEN = 'redis.pipeline_length'
-          DEFAULT_PEER_SERVICE_NAME = 'redis'
-          SPAN_COMMAND = 'redis.command'
-          TAG_DB = 'out.redis_db'
-          TAG_RAW_COMMAND = 'redis.raw_command'
-          TYPE = 'redis'
-          TAG_COMPONENT = 'redis'
-          TAG_OPERATION_COMMAND = 'command'
-          TAG_SYSTEM = 'redis'
-          TAG_DATABASE_INDEX = 'db.redis.database_index'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_REDIS_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_REDIS_ANALYTICS_SAMPLE_RATE"
+          ENV_COMMAND_ARGS = "DD_REDIS_COMMAND_ARGS"
+          METRIC_PIPELINE_LEN = "redis.pipeline_length"
+          DEFAULT_PEER_SERVICE_NAME = "redis"
+          SPAN_COMMAND = "redis.command"
+          TAG_DB = "out.redis_db"
+          TAG_RAW_COMMAND = "redis.raw_command"
+          TYPE = "redis"
+          TAG_COMPONENT = "redis"
+          TAG_OPERATION_COMMAND = "command"
+          TAG_SYSTEM = "redis"
+          TAG_DATABASE_INDEX = "db.redis.database_index"
           PEER_SERVICE_SOURCES = [
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'configuration/resolver'
-require_relative 'ext'
-require_relative 'quantize'
-require_relative 'tags'
-require_relative 'trace_middleware'
+require_relative "../patcher"
+require_relative "configuration/resolver"
+require_relative "ext"
+require_relative "quantize"
+require_relative "tags"
+require_relative "trace_middleware"
 
 module Datadog
   module Tracing

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -12,11 +12,11 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('3.2')
+          MINIMUM_VERSION = Gem::Version.new("3.2")
 
           # Support `Config#custom`
           # https://github.com/redis-rb/redis-client/blob/master/CHANGELOG.md#0110
-          REDISCLIENT_MINIMUM_VERSION = Gem::Version.new('0.11.0')
+          REDISCLIENT_MINIMUM_VERSION = Gem::Version.new("0.11.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :redis, auto_patch: true
@@ -31,11 +31,11 @@ module Datadog
           end
 
           def self.redis_version
-            Gem.loaded_specs['redis']&.version
+            Gem.loaded_specs["redis"]&.version
           end
 
           def self.redis_client_version
-            Gem.loaded_specs['redis-client']&.version
+            Gem.loaded_specs["redis-client"]&.version
           end
 
           def self.loaded?

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'ext'
-require_relative 'configuration/resolver'
+require_relative "../patcher"
+require_relative "ext"
+require_relative "configuration/resolver"
 
 module Datadog
   module Tracing
@@ -30,8 +30,8 @@ module Datadog
                 # For `redis-rb` 3.x
                 return client if respond_to?(:client)
 
-                Datadog.logger.warn 'Fail to apply configuration on redis client instance with ' \
-                                                        '`Datadog.configure_onto(redis)`.'
+                Datadog.logger.warn "Fail to apply configuration on redis client instance with " \
+                                                        "`Datadog.configure_onto(redis)`."
 
                 # Null object instead of raising error
                 self
@@ -49,10 +49,10 @@ module Datadog
             module InstanceMethods
               def datadog_pin=(_pin)
                 Datadog.logger.warn \
-                  '`Datadog.configure_onto(redis)` is not supported on Redis 5+. To instrument ' \
+                  "`Datadog.configure_onto(redis)` is not supported on Redis 5+. To instrument " \
                   "a redis instance with custom configuration, please initialize it with:\n" \
                   "  `Redis.new(..., custom: { datadog: { service_name: 'my-service' } })`.\n\n" \
-                  'See: https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md#redis'
+                  "See: https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md#redis"
               end
             end
           end
@@ -69,14 +69,14 @@ module Datadog
           def patch
             # Redis 5+ extracts RedisClient to its own gem and provide instrumentation interface
             if Integration.redis_client_compatible?
-              require_relative 'trace_middleware'
+              require_relative "trace_middleware"
 
               ::RedisClient.register(TraceMiddleware)
             end
 
             if Integration.redis_compatible?
-              if Integration.redis_version < Gem::Version.new('5.0.0')
-                require_relative 'instrumentation'
+              if Integration.redis_version < Gem::Version.new("5.0.0")
+                require_relative "instrumentation"
 
                 ::Redis.include(DatadogPinPatch)
                 ::Redis::Client.include(Instrumentation)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'set'
+require "set"
 
 module Datadog
   module Tracing
@@ -8,13 +8,16 @@ module Datadog
       module Redis
         # Quantize contains Redis-specific resource quantization tools.
         module Quantize
-          PLACEHOLDER = '?'
-          TOO_LONG_MARK = '...'
+          PLACEHOLDER = "?"
+          TOO_LONG_MARK = "..."
           VALUE_MAX_LEN = 50
           CMD_MAX_LEN = 500
 
           AUTH_COMMANDS = %w[AUTH auth].freeze
 
+          CONNECTION_SETUP_COMMANDS = Set.new(%w[HELLO]).freeze
+          CLIENT_CONNECTION_SETUP_SUBCOMMANDS = Set.new(%w[SETINFO SETNAME]).freeze
+
           MULTI_VERB_COMMANDS = Set.new(
             %w[
               ACL
@@ -34,13 +37,13 @@ module Datadog
             str = Core::Utils.utf8_encode(arg, binary: true, placeholder: PLACEHOLDER)
             Core::Utils.truncate(str, VALUE_MAX_LEN, TOO_LONG_MARK)
           rescue => e
-            Datadog.logger.debug("non formattable Redis arg #{str}: #{e}")
+            Datadog.logger.debug("non formattable Redis arg #{str}: #{e.class}: #{e.message}")
             PLACEHOLDER
           end
 
           def format_command_args(command_args)
             command_args = resolve_command_args(command_args)
-            return 'AUTH ?' if auth_command?(command_args)
+            return "AUTH ?" if auth_command?(command_args) || hello_auth_command?(command_args)
 
             verb, *args = command_args.map { |x| format_arg(x) }
             Core::Utils.truncate("#{verb.upcase} #{args.join(" ")}", CMD_MAX_LEN, TOO_LONG_MARK)
@@ -51,6 +54,8 @@ module Datadog
 
             return get_verb(command_args.first) if command_args.first.is_a?(Array)
 
+            return "AUTH" if hello_auth_command?(command_args)
+
             verb = command_args.first.to_s.upcase
             return verb unless MULTI_VERB_COMMANDS.include?(verb) && command_args[1]
 
@@ -64,6 +69,35 @@ module Datadog
             AUTH_COMMANDS.include?(verb)
           end
 
+          # Identifies a RESP3 `HELLO ... AUTH user pass` handshake command, which embeds
+          # credentials the same way a standalone `AUTH` command does and must be redacted
+          # (and kept visible as its own span) rather than treated as a silent connection
+          # bootstrap command.
+          def hello_auth_command?(command_args)
+            return false unless command_args.is_a?(Array) && !command_args.empty?
+
+            # `redis-client` always emits this as `["HELLO", "3", "AUTH", username, password]` — check
+            # the fixed "AUTH" keyword position only, never the username/password values themselves,
+            # since those are untrusted, possibly-binary bulk strings that `#upcase` can raise on.
+            return false if command_args.length < 3
+            command_args[0].to_s.upcase == "HELLO" && command_args[2].to_s.upcase == "AUTH"
+          end
+
+          # Identifies protocol-level connection bootstrap commands (`HELLO`, `CLIENT SETINFO`,
+          # `CLIENT SETNAME`) that `redis-client` sends as part of its per-connection handshake,
+          # so they can be excluded from pipeline resource naming. A `HELLO` carrying `AUTH`
+          # credentials is excluded from this so authentication remains visible as its own span.
+          def connection_setup_command?(command_args)
+            command_args = resolve_command_args(command_args)
+            return false unless command_args.is_a?(Array) && !command_args.empty?
+            return false if hello_auth_command?(command_args)
+
+            verb = command_args.first.to_s.upcase
+            return true if CONNECTION_SETUP_COMMANDS.include?(verb)
+
+            verb == "CLIENT" && CLIENT_CONNECTION_SETUP_SUBCOMMANDS.include?(command_args[1].to_s.upcase)
+          end
+
           # Unwraps command array when Redis is called with the following syntax:
           #   redis.call([:cmd, 'arg1', ...])
           def resolve_command_args(command_args)
@@ -72,7 +106,7 @@ module Datadog
             command_args
           end
 
-          private_class_method :auth_command?, :resolve_command_args
+          private_class_method :auth_command?, :hello_auth_command?, :resolve_command_args
         end
       end
     end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
-require_relative '../ext'
-require_relative '../../../core/telemetry/logger'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "../ext"
+require_relative "../../../core/telemetry/logger"
 
 module Datadog
   module Tracing
@@ -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)
 
@@ -47,7 +42,7 @@ module Datadog
 
               Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
             rescue => e
-              Datadog.logger.error(e.message)
+              Datadog.logger.error("#{e.class}: #{e.message}")
               Datadog::Core::Telemetry::Logger.report(e)
             end
 

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'ext'
-require_relative 'quantize'
-require_relative 'tags'
+require_relative "../patcher"
+require_relative "ext"
+require_relative "quantize"
+require_relative "tags"
 
 module Datadog
   module Tracing
@@ -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)
 
@@ -36,11 +37,18 @@ module Datadog
             end
 
             def call_pipelined(client, commands, service_name, command_args)
+              # `redis-client` sends its per-connection handshake (`HELLO`, `CLIENT SETINFO`/`SETNAME`)
+              # as a pipeline through this same code path. Excluding those from resource naming keeps
+              # the resource focused on application-issued commands (e.g. a lone `SELECT` prelude).
+              traced_commands = commands.reject { |c| Contrib::Redis::Quantize.connection_setup_command?(c) }
+              return yield if traced_commands.empty? && !commands.empty?
+
               Tracing.trace(Redis::Ext::SPAN_COMMAND, type: Redis::Ext::TYPE, service: service_name) do |span|
-                raw_command = get_pipeline_commands(commands, true)
-                span.resource = command_args ? raw_command : get_pipeline_commands(commands, false)
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Redis::Ext::TAG_COMPONENT)
+                raw_command = get_pipeline_commands(traced_commands, true)
+                span.resource = command_args ? raw_command : get_pipeline_commands(traced_commands, false)
 
-                span.set_metric Contrib::Redis::Ext::METRIC_PIPELINE_LEN, commands.length
+                span.set_metric Contrib::Redis::Ext::METRIC_PIPELINE_LEN, traced_commands.length
 
                 Contrib::Redis::Tags.set_common_tags(client, span, raw_command)
 
@@ -67,7 +75,7 @@ module Datadog
                 commands.map { |c| Contrib::Redis::Quantize.get_verb(c) }
               end
 
-              list.empty? ? '(none)' : list.join("\n")
+              list.empty? ? "(none)" : list.join("\n")
             end
           end
 

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

@@ -33,6 +33,17 @@ module Datadog
           def register_as(name, registry: Contrib::REGISTRY, auto_patch: false, **options)
             registry.add(name, new(name, **options), auto_patch)
           end
+
+          # Registers this `as` in the global tracer registry as an alias of `original_name`.
+          # Using `as` or `original_name` become interchangeable.
+          # The configuration object is shared between the two names.
+          # The patcher will only run once if both are activated.
+          def register_alias_for(original_name, as:, registry: Contrib::REGISTRY)
+            original = registry[original_name]
+            raise ArgumentError, "integration '#{original_name}' not registered" unless original
+
+            registry.add(as, original, false)
+          end
         end
 
         # Instance methods for registerable behavior

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing

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

@@ -7,14 +7,14 @@ module Datadog
         # Resque integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_RESQUE_ENABLED'
+          ENV_ENABLED = "DD_TRACE_RESQUE_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_RESQUE_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RESQUE_ANALYTICS_SAMPLE_RATE'
-          SERVICE_NAME = 'resque'
-          SPAN_JOB = 'resque.job'
-          TAG_COMPONENT = 'resque'
-          TAG_OPERATION_JOB = 'job'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_RESQUE_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_RESQUE_ANALYTICS_SAMPLE_RATE"
+          SERVICE_NAME = "resque"
+          SPAN_JOB = "resque.job"
+          TAG_COMPONENT = "resque"
+          TAG_OPERATION_JOB = "job"
         end
       end
     end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -12,13 +12,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('1.0')
+          MINIMUM_VERSION = Gem::Version.new("1.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :resque, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['resque']&.version
+            Gem.loaded_specs["resque"]&.version
           end
 
           def self.loaded?

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative '../sidekiq/ext'
+require_relative "../patcher"
+require_relative "../sidekiq/ext"
 
 module Datadog
   module Tracing
@@ -18,7 +18,7 @@ module Datadog
           end
 
           def patch
-            require_relative 'resque_job'
+            require_relative "resque_job"
 
             ::Resque::Job.prepend(Resque::Job)
           end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'resque'
+require "resque"
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative '../sidekiq/ext'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "../sidekiq/ext"
 
 module Datadog
   module Tracing
@@ -35,7 +35,8 @@ module Datadog
             return yield unless datadog_configuration && Tracing.enabled?
 
             Tracing.trace(Ext::SPAN_JOB, **span_options) do |span|
-              span.resource = args.first.is_a?(Hash) && args.first['job_class'] || name
+              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
 
               span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing
@@ -30,8 +30,11 @@ module Datadog
               o.default 1.0
             end
 
-            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 :service_name do |o|
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(

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

@@ -7,16 +7,17 @@ module Datadog
         # RestClient integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_REST_CLIENT_ENABLED'
-          ENV_SERVICE_NAME = 'DD_TRACE_REST_CLIENT_SERVICE_NAME'
-          ENV_PEER_SERVICE = 'DD_TRACE_REST_CLIENT_PEER_SERVICE'
+          ENV_ENABLED = "DD_TRACE_REST_CLIENT_ENABLED"
+          ENV_DISTRIBUTED_TRACING = "DD_TRACE_REST_CLIENT_DISTRIBUTED_TRACING"
+          ENV_SERVICE_NAME = "DD_TRACE_REST_CLIENT_SERVICE_NAME"
+          ENV_PEER_SERVICE = "DD_TRACE_REST_CLIENT_PEER_SERVICE"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_REST_CLIENT_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_REST_CLIENT_ANALYTICS_SAMPLE_RATE'
-          DEFAULT_PEER_SERVICE_NAME = 'rest_client'
-          SPAN_REQUEST = 'rest_client.request'
-          TAG_COMPONENT = 'rest_client'
-          TAG_OPERATION_REQUEST = 'request'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_REST_CLIENT_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_REST_CLIENT_ANALYTICS_SAMPLE_RATE"
+          DEFAULT_PEER_SERVICE_NAME = "rest_client"
+          SPAN_REQUEST = "rest_client.request"
+          TAG_COMPONENT = "rest_client"
+          TAG_OPERATION_REQUEST = "request"
           PEER_SERVICE_SOURCES = [
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -12,16 +12,16 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('1.8')
+          MINIMUM_VERSION = Gem::Version.new("1.8")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :rest_client
           def self.gem_name
-            'rest-client'
+            "rest-client"
           end
 
           def self.version
-            Gem.loaded_specs['rest-client']&.version
+            Gem.loaded_specs["rest-client"]&.version
           end
 
           def self.loaded?

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
+require_relative "../patcher"
 
 module Datadog
   module Tracing
@@ -17,7 +17,7 @@ module Datadog
           end
 
           def patch
-            require_relative 'request_patch'
+            require_relative "request_patch"
 
             ::RestClient::Request.include(RequestPatch)
           end

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'uri'
+require "uri"
 
-require_relative '../../metadata/ext'
-require_relative '../http'
-require_relative '../analytics'
-require_relative 'ext'
+require_relative "../../metadata/ext"
+require_relative "../http"
+require_relative "../analytics"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -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)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing

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

@@ -6,12 +6,13 @@ module Datadog
       module Roda
         # Roda integration constants
         module Ext
-          APP = 'roda'
-          ENV_ENABLED = 'DD_TRACE_RODA_ENABLED'
+          APP = "roda"
+          TAG_COMPONENT = "roda"
+          ENV_ENABLED = "DD_TRACE_RODA_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_RODA_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_RODA_ANALYTICS_SAMPLE_RATE'
-          SPAN_REQUEST = 'roda.request'
+          ENV_ANALYTICS_ENABLED = "DD_RODA_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_RODA_ANALYTICS_SAMPLE_RATE"
+          SPAN_REQUEST = "roda.request"
         end
       end
     end