datadog 2.28.0 → 2.41.0

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative 'ext'
-require_relative '../analytics'
+require_relative "../../metadata/ext"
+require_relative "ext"
+require_relative "../analytics"
 
 module Datadog
   module Tracing
@@ -25,7 +25,10 @@ module Datadog
               begin
                 request_method = request.request_method.to_s.upcase
 
-                span.service = configuration[:service_name] if configuration[:service_name]
+                if configuration[:service_name]
+                  span.service = configuration[:service_name]
+                  span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+                end
 
                 span.type = Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
 
@@ -49,7 +52,7 @@ module Datadog
                 rescue
                   # The status code is unknown to Roda and decided by the upstream web runner.
                   # In this case, spans default to status code 500 rather than a blank status code.
-                  default_error_status = '500'
+                  default_error_status = "500"
                   span.resource = "#{request_method} #{default_error_status}"
                   span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, default_error_status)
                   raise

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

@@ -2,9 +2,9 @@
 
 # typed: false
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -14,13 +14,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('2.0.0')
-          MAXIMUM_VERSION = Gem::Version.new('4.0.0')
+          MINIMUM_VERSION = Gem::Version.new("2.0.0")
+          MAXIMUM_VERSION = Gem::Version.new("4.0.0")
 
           register_as :roda
 
           def self.version
-            Gem.loaded_specs['roda']&.version
+            Gem.loaded_specs["roda"]&.version
           end
 
           def self.loaded?

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

@@ -2,9 +2,9 @@
 
 # typed: ignore
 
-require_relative '../patcher'
-require_relative 'ext'
-require_relative 'instrumentation'
+require_relative "../patcher"
+require_relative "ext"
+require_relative "instrumentation"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/semantic_logger/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/semantic_logger/ext.rb

@@ -7,7 +7,7 @@ module Datadog
         # SemanticLogger integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_SEMANTIC_LOGGER_ENABLED'
+          ENV_ENABLED = "DD_TRACE_SEMANTIC_LOGGER_ENABLED"
         end
       end
     end

data/lib/datadog/tracing/contrib/semantic_logger/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
@@ -15,13 +15,13 @@ module Datadog
           # v4 had a migration to `named_tags` instead of `payload`
           # and has been out for almost 5 years at this point
           # it's probably reasonable to nudge users to using modern ruby libs
-          MINIMUM_VERSION = Gem::Version.new('4.0.0')
+          MINIMUM_VERSION = Gem::Version.new("4.0.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :semantic_logger
 
           def self.version
-            Gem.loaded_specs['semantic_logger']&.version
+            Gem.loaded_specs["semantic_logger"]&.version
           end
 
           def self.loaded?

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'instrumentation'
+require_relative "../patcher"
+require_relative "instrumentation"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sequel/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/sequel/database.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
-require_relative 'utils'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "utils"
 
 module Datadog
   module Tracing
@@ -26,9 +26,10 @@ module Datadog
                 span.service = Datadog.configuration_for(self, :service_name) \
                                 || Datadog.configuration.tracing[:sequel][:service_name] \
                                 || Contrib::SpanAttributeSchema.fetch_service_name(
-                                  '',
+                                  "",
                                   adapter_name
                                 )
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.resource = opts[:query]
                 span.type = Tracing::Metadata::Ext::SQL::TYPE
                 Utils.set_common_tags(span, self)
@@ -45,11 +46,7 @@ module Datadog
             end
 
             def parse_opts(sql, opts)
-              db_opts = if ::Sequel::VERSION < '3.41.0' && self.class.to_s !~ /Dataset$/
-                @opts
-              elsif instance_variable_defined?(:@pool) && @pool
-                @pool.db.opts
-              end
+              db_opts = @pool.db.opts if instance_variable_defined?(:@pool) && @pool
               sql = sql.is_a?(::Sequel::SQL::Expression) ? literal(sql) : sql.to_s
 
               Utils.parse_opts(sql, opts, db_opts)

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
-require_relative 'utils'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "utils"
 
 module Datadog
   module Tracing
@@ -43,9 +43,10 @@ module Datadog
                 span.service = Datadog.configuration_for(db, :service_name) \
                                 || Datadog.configuration.tracing[:sequel][:service_name] \
                                 || Contrib::SpanAttributeSchema.fetch_service_name(
-                                  '',
+                                  "",
                                   adapter_name
                                 )
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.resource = opts[:query]
                 span.type = Tracing::Metadata::Ext::SQL::TYPE
                 Utils.set_common_tags(span, db)

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../ext"
+
 module Datadog
   module Tracing
     module Contrib
@@ -7,15 +9,17 @@ module Datadog
         # Sequel integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_SEQUEL_ENABLED'
+          ENV_ENABLED = "DD_TRACE_SEQUEL_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SEQUEL_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SEQUEL_ANALYTICS_SAMPLE_RATE'
-          SPAN_QUERY = 'sequel.query'
-          TAG_DB_VENDOR = 'sequel.db.vendor'
-          TAG_PREPARED_NAME = 'sequel.prepared.name'
-          TAG_COMPONENT = 'sequel'
-          TAG_OPERATION_QUERY = 'query'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_SEQUEL_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_SEQUEL_ANALYTICS_SAMPLE_RATE"
+          SPAN_QUERY = "sequel.query"
+          TAG_DB_VENDOR = "sequel.db.vendor"
+          TAG_PREPARED_NAME = "sequel.prepared.name"
+          TAG_COMPONENT = "sequel"
+          TAG_OPERATION_QUERY = "query"
+          TAG_DB_NAME = "sequel.db.name"
+          PEER_SERVICE_SOURCES = ([TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
         end
       end
     end

data/lib/datadog/tracing/contrib/sequel/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('3.41')
+          MINIMUM_VERSION = Gem::Version.new("3.41")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :sequel, auto_patch: false
 
           def self.version
-            Gem.loaded_specs['sequel']&.version
+            Gem.loaded_specs["sequel"]&.version
           end
 
           def self.loaded?

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'database'
-require_relative 'dataset'
+require_relative "../patcher"
+require_relative "database"
+require_relative "dataset"
 
 module Datadog
   module Tracing

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../utils/database'
+require "uri"
+
+require_relative "../../metadata/ext"
+require_relative "../utils/database"
+require_relative "ext"
+require_relative "../ext"
+require_relative "../span_attribute_schema"
 
 module Datadog
   module Tracing
@@ -9,6 +14,11 @@ module Datadog
       module Sequel
         # General purpose functions for Sequel
         module Utils
+          JDBC_URI_PATTERN = %r{\Ajdbc:(?<vendor>[a-z][a-z0-9+.-]*):(?<location>//[^\r\n]*)\z}i
+          DATABASE_PROPERTY_PATTERN =
+            /(?:\A|[&;])(?<key>databaseName|database|libraries)=(?<value>[^&;]+)/i
+          private_constant :JDBC_URI_PATTERN, :DATABASE_PROPERTY_PATTERN
+
           class << self
             # Ruby database connector library
             #
@@ -16,7 +26,7 @@ module Datadog
             def adapter_name(database)
               scheme = database.adapter_scheme.to_s
 
-              if scheme == 'jdbc'
+              if scheme == "jdbc"
                 # The subtype is more important in this case,
                 # otherwise all database adapters will be 'jdbc'.
                 database_type(database)
@@ -32,10 +42,38 @@ module Datadog
               Contrib::Utils::Database.normalize_vendor(database.database_type.to_s)
             end
 
+            # Parses URI-style JDBC connection strings, extracting host, port, and
+            # (best-effort) database name. Unsupported or ambiguous forms return empty
+            # metadata rather than potentially incorrect tags.
+            def parse_jdbc_uri(uri)
+              result = {host: nil, port: nil, database: nil}
+              return result unless uri.is_a?(String) && uri.valid_encoding?
+
+              match = JDBC_URI_PATTERN.match(uri)
+              return result unless match
+
+              vendor = match[:vendor].downcase
+              location, properties = match[:location].split(";", 2)
+
+              # Several JDBC vendors append properties with semicolons, outside the URI
+              # grammar. Parse the URI-compatible location separately from those properties.
+              parsed = URI.parse("#{vendor}:#{location}")
+
+              host = parsed.hostname
+              port = parsed.port
+
+              database = database_from_path(parsed.path) ||
+                database_from_properties(properties) || database_from_properties(parsed.query)
+
+              {host: host, port: port&.to_s, database: database}
+            rescue URI::InvalidURIError, Encoding::CompatibilityError, ArgumentError
+              result
+            end
+
             def parse_opts(sql, opts, db_opts, dataset = nil)
               # Prepared statements don't provide their sql query in the +sql+ parameter.
-              if !sql.is_a?(String) && (dataset&.respond_to?(:prepared_sql) &&
-                (resolved_sql = dataset.prepared_sql))
+              if !sql.is_a?(String) && dataset&.respond_to?(:prepared_sql) &&
+                  (resolved_sql = dataset.prepared_sql)
                 # The dataset contains the resolved SQL query and prepared statement name.
                 prepared_name = dataset.prepared_statement_name
                 sql = resolved_sql
@@ -46,31 +84,93 @@ module Datadog
                 query: sql,
                 prepared_name: prepared_name,
                 database: db_opts[:database],
-                host: db_opts[:host]
+                host: db_opts[:host],
               }
             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)
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+              span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, database_type(db))
+
+              metadata = connection_metadata(db)
 
-              # TODO: Extract host for Sequel with JDBC. The easiest way seem to be through
-              # TODO: the database URI. Unfortunately, JDBC URIs do not work with `URI.parse`.
-              # host, _port = extract_host_port_from_uri(db.uri)
-              # span.set_tag(Tracing::Metadata::Ext::TAG_DESTINATION_NAME, host)
-              span.set_tag(Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME, db.opts[:host]) if db.opts[:host]
+              peer_metadata = false
+
+              # Embedded/hostless databases (e.g. SQLite) have no network peer; skip peer-identifying tags.
+              if metadata[:host] && !metadata[:host].empty?
+                span.set_tag(Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME, metadata[:host])
+                span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, metadata[:host])
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, metadata[:host])
+                span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, metadata[:port]) if metadata[:port]
+                peer_metadata = true
+              end
+
+              if metadata[:database] && !metadata[:database].empty?
+                span.set_tag(Contrib::Ext::DB::TAG_INSTANCE, metadata[:database])
+                span.set_tag(Ext::TAG_DB_NAME, metadata[:database])
+                peer_metadata = true
+              end
+
+              if peer_metadata
+                Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
+              end
 
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
             end
 
+            # Resolves the connection host/port/database for a Sequel::Database. When the
+            # connection string is a JDBC URL (Sequel's JDBC adapter, used on JRuby), the
+            # host/port/database are parsed from it regardless of whether opts[:host] is set.
+            def connection_metadata(db)
+              opts = db.opts || {}
+              host = opts[:host]
+              port = opts[:port]
+              database = opts[:database]
+
+              # A JDBC URL (in :uri, :url, or :database) can carry credentials, so always parse
+              # it and emit only the parsed database name -- never the raw connection string.
+              conn = opts[:uri] || opts[:url] || opts[:database]
+              is_jdbc = conn.is_a?(String) && conn.byteslice(0, 5)&.casecmp("jdbc:") == 0
+              if is_jdbc
+                parsed = parse_jdbc_uri(conn)
+
+                # Sequel's JDBC adapter connects with the URL and ignores separate
+                # :host/:port options, unlike native adapters where those options take precedence.
+                if !parsed[:host].nil? || !parsed[:port].nil? || !parsed[:database].nil?
+                  host = parsed[:host]
+                  port = parsed[:port]
+                end
+                database = parsed[:database]
+              end
+
+              {host: host, port: port&.to_s, database: database}
+            end
+
             private
 
+            def database_from_path(path)
+              return unless path&.start_with?("/")
+
+              database = path[1..-1]
+              return if database.empty? || database.include?("/")
+
+              database
+            end
+
+            def database_from_properties(properties)
+              return unless properties
+
+              match = DATABASE_PROPERTY_PATTERN.match(properties)
+              return unless match
+
+              database = match[:value]
+              database = database.split(",", 2).first if match[:key].casecmp("libraries").zero?
+              database
+            end
+
             def datadog_configuration
               Datadog.configuration.tracing[:sequel]
             end

data/lib/datadog/tracing/contrib/shoryuken/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/shoryuken/ext.rb

@@ -7,19 +7,19 @@ module Datadog
         # Shoryuken integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_SHORYUKEN_ENABLED'
+          ENV_ENABLED = "DD_TRACE_SHORYUKEN_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SHORYUKEN_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SHORYUKEN_ANALYTICS_SAMPLE_RATE'
-          SERVICE_NAME = 'shoryuken'
-          SPAN_JOB = 'shoryuken.job'
-          TAG_JOB_ID = 'shoryuken.id'
-          TAG_JOB_QUEUE = 'shoryuken.queue'
-          TAG_JOB_ATTRIBUTES = 'shoryuken.attributes'
-          TAG_JOB_BODY = 'shoryuken.body'
-          TAG_COMPONENT = 'shoryuken'
-          TAG_OPERATION_JOB = 'job'
-          TAG_MESSAGING_SYSTEM = 'amazonsqs'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_SHORYUKEN_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_SHORYUKEN_ANALYTICS_SAMPLE_RATE"
+          SERVICE_NAME = "shoryuken"
+          SPAN_JOB = "shoryuken.job"
+          TAG_JOB_ID = "shoryuken.id"
+          TAG_JOB_QUEUE = "shoryuken.queue"
+          TAG_JOB_ATTRIBUTES = "shoryuken.attributes"
+          TAG_JOB_BODY = "shoryuken.body"
+          TAG_COMPONENT = "shoryuken"
+          TAG_OPERATION_JOB = "job"
+          TAG_MESSAGING_SYSTEM = "amazonsqs"
         end
       end
     end

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

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

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'tracer'
+require_relative "tracer"
 
 module Datadog
   module Tracing

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../analytics'
+require_relative "../analytics"
 
 module Datadog
   module Tracing
@@ -20,6 +20,7 @@ module Datadog
               type: Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
               on_error: @on_error
             ) do |span|
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_MESSAGING_SYSTEM)
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
@@ -50,7 +51,7 @@ module Datadog
           def resource(worker_instance, body)
             # If it's a Hash, try to get the job class from it.
             # This is for ActiveJob compatibility.
-            job_class = body['job_class'] if body.is_a?(Hash)
+            job_class = body["job_class"] if body.is_a?(Hash)
             # If nothing is available, use the worker class name.
             job_class || worker_instance.class.name
           end

data/lib/datadog/tracing/contrib/sidekiq/client_tracer.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'distributed/propagation'
-require_relative 'ext'
-require_relative 'utils'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "distributed/propagation"
+require_relative "ext"
+require_relative "utils"
 
 module Datadog
   module Tracing
@@ -24,6 +24,7 @@ module Datadog
             resource = job_resource(job)
 
             Datadog::Tracing.trace(Ext::SPAN_PUSH, service: @sidekiq_service) do |span, trace_op|
+              span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               if Tracing::Distributed::PropagationPolicy.enabled?(
                 global_config: configuration,
                 trace: trace_op
@@ -47,9 +48,9 @@ module Datadog
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
                 Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
               end
-              span.set_tag(Ext::TAG_JOB_ID, job['jid'])
-              span.set_tag(Ext::TAG_JOB_QUEUE, job['queue'])
-              span.set_tag(Ext::TAG_JOB_WRAPPER, job['class']) if job['wrapped']
+              span.set_tag(Ext::TAG_JOB_ID, job["jid"])
+              span.set_tag(Ext::TAG_JOB_QUEUE, job["queue"])
+              span.set_tag(Ext::TAG_JOB_WRAPPER, job["class"]) if job["wrapped"]
 
               yield
             end

data/lib/datadog/tracing/contrib/sidekiq/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
@@ -38,7 +38,11 @@ module Datadog
             end
 
             option :quantize, default: {}, type: :hash
-            option :distributed_tracing, default: false, type: :bool
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default false
+            end
           end
         end
       end