datadog 2.17.0 → 2.37.0

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

@@ -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
 
@@ -46,7 +49,7 @@ module Datadog
               ensure
                 begin
                   response = yield
-                rescue StandardError
+                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'
@@ -61,7 +64,9 @@ module Datadog
               # Adds status code to the resource name once the resource comes back
               span.resource = "#{request_method} #{status_code}"
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, status_code)
-              span.status = 1 if status_code.to_s.start_with?('5')
+              if Datadog.configuration.tracing.http_error_statuses.server.include?(status_code)
+                span.status = Tracing::Metadata::Ext::Errors::STATUS
+              end
               response
             end
           end

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

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

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

@@ -25,7 +25,7 @@ module Datadog
               # if the user already has conflicting log_tags
               # we want them to clobber ours, because we should allow them to override if needed.
               log.named_tags = correlation.to_h.merge(original_named_tags)
-              super(log, message, progname, &block)
+              super
             end
           end
         end

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

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

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

@@ -23,12 +23,13 @@ module Datadog
               response = nil
 
               Tracing.trace(Ext::SPAN_QUERY) do |span|
-                span.service =  Datadog.configuration_for(self, :service_name) \
+                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)
@@ -46,10 +47,10 @@ module Datadog
 
             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
+                @opts
+              elsif instance_variable_defined?(:@pool) && @pool
+                @pool.db.opts
+              end
               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

@@ -40,12 +40,13 @@ module Datadog
               response = nil
 
               Tracing.trace(Ext::SPAN_QUERY) do |span|
-                span.service =  Datadog.configuration_for(db, :service_name) \
+                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/integration.rb

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

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

@@ -34,7 +34,7 @@ module Datadog
 
             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 && dataset.respond_to?(: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
@@ -51,11 +51,6 @@ module Datadog
             end
 
             def set_common_tags(span, db)
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
 

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

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

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

@@ -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)

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

@@ -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

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

@@ -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

data/lib/datadog/tracing/contrib/sidekiq/distributed/propagation.rb

@@ -20,6 +20,7 @@ module Datadog
             def initialize(
               propagation_style_inject:,
               propagation_style_extract:,
+              propagation_behavior_extract:,
               propagation_extract_first:
             )
               super(
@@ -38,6 +39,7 @@ module Datadog
                 },
                 propagation_style_inject: propagation_style_inject,
                 propagation_style_extract: propagation_style_extract,
+                propagation_behavior_extract: propagation_behavior_extract,
                 propagation_extract_first: propagation_extract_first
               )
             end

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

@@ -12,7 +12,9 @@ module Datadog
           # @!visibility private
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_SIDEKIQ_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SIDEKIQ_ANALYTICS_SAMPLE_RATE'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_SIDEKIQ_DISTRIBUTED_TRACING'
           SERVICE_NAME = 'sidekiq'
+          SIDEKIQ_8_SECONDS_PER_INTEGER = 0.001 # Sidekiq 8 uses integer epoch milliseconds, rather than epoch floats
           SPAN_PUSH = 'sidekiq.push'
           SPAN_JOB = 'sidekiq.job'
           SPAN_JOB_FETCH = 'sidekiq.job_fetch'

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

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

data/lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/heartbeat.rb

@@ -13,6 +13,7 @@ module Datadog
               configuration = Datadog.configuration.tracing[:sidekiq]
 
               Datadog::Tracing.trace(Ext::SPAN_HEARTBEAT, service: configuration[:service_name]) do |span|
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
                 span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
@@ -38,6 +39,7 @@ module Datadog
               configuration = Datadog.configuration.tracing[:sidekiq]
 
               Datadog::Tracing.trace(Ext::SPAN_HEARTBEAT, service: configuration[:service_name]) do |span|
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
                 span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)

data/lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/job_fetch.rb

@@ -13,6 +13,7 @@ module Datadog
               configuration = Datadog.configuration.tracing[:sidekiq]
 
               Datadog::Tracing.trace(Ext::SPAN_JOB_FETCH, service: configuration[:service_name]) do |span|
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
                 span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)

data/lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/redis_info.rb

@@ -11,6 +11,7 @@ module Datadog
               configuration = Datadog.configuration.tracing[:sidekiq]
 
               Datadog::Tracing.trace(Ext::SPAN_REDIS_INFO, service: configuration[:service_name]) do |span|
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
                 span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)

data/lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/scheduled_poller.rb

@@ -12,6 +12,7 @@ module Datadog
               configuration = Datadog.configuration.tracing[:sidekiq]
 
               Datadog::Tracing.trace(Ext::SPAN_SCHEDULED_PUSH, service: configuration[:service_name]) do |span|
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
                 span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
@@ -34,6 +35,7 @@ module Datadog
               configuration = Datadog.configuration.tracing[:sidekiq]
 
               Datadog::Tracing.trace(Ext::SPAN_SCHEDULED_WAIT, service: configuration[:service_name]) do |span|
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
                 span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)

data/lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/stop.rb

@@ -11,6 +11,7 @@ module Datadog
               configuration = Datadog.configuration.tracing[:sidekiq]
 
               Datadog::Tracing.trace(Ext::SPAN_STOP, service: configuration[:service_name]) do |span|
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
                 span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)

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

@@ -4,7 +4,7 @@ require_relative '../../metadata/ext'
 require_relative '../analytics'
 require_relative 'ext'
 require_relative 'utils'
-require_relative '../utils/quantization/hash'
+require_relative '../utils/quantization/hash_formatter'
 require_relative 'distributed/propagation'
 
 module Datadog
@@ -22,7 +22,7 @@ module Datadog
             @quantize = options[:quantize] || configuration[:quantize]
           end
 
-          def call(worker, job, queue)
+          def call(worker, job, queue) # rubocop:disable Metrics/MethodLength
             resource = job_resource(job)
 
             if @distributed_tracing
@@ -36,6 +36,7 @@ module Datadog
               type: Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
               on_error: @on_error
             ) do |span|
+              span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span.resource = resource
 
               span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
@@ -61,11 +62,14 @@ module Datadog
               span.set_tag(Ext::TAG_JOB_RETRY_COUNT, job['retry_count'])
               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_DELAY, 1000.0 * (Core::Utils::Time.now.utc.to_f - job['enqueued_at'].to_f))
+
+              enqueued_at = job['enqueued_at']
+              enqueued_at *= Ext::SIDEKIQ_8_SECONDS_PER_INTEGER if enqueued_at.is_a?(Integer)
+              span.set_tag(Ext::TAG_JOB_DELAY, 1000.0 * (Core::Utils::Time.now.utc.to_f - enqueued_at.to_f))
 
               args = job['args']
               if args && !args.empty?
-                span.set_tag(Ext::TAG_JOB_ARGS, Contrib::Utils::Quantization::Hash.format(args, (@quantize[:args] || {})))
+                span.set_tag(Ext::TAG_JOB_ARGS, Contrib::Utils::Quantization::HashFormatter.format(args, (@quantize[:args] || {})))
               end
 
               yield

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

@@ -25,7 +25,7 @@ module Datadog
               job['class'].to_s
             end
           rescue => e
-            Datadog.logger.debug { "Error retrieving Sidekiq job class name (jid:#{job['jid']}): #{e}" }
+            Datadog.logger.debug { "Error retrieving Sidekiq job class name (jid:#{job["jid"]}): #{e.class}: #{e.message}" }
 
             job['class'].to_s
           end

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

@@ -28,6 +28,7 @@ module Datadog
           @propagation = Sidekiq::Distributed::Propagation.new(
             propagation_style_inject: tracing.propagation_style_inject,
             propagation_style_extract: tracing.propagation_style_extract,
+            propagation_behavior_extract: tracing.propagation_behavior_extract,
             propagation_extract_first: tracing.propagation_extract_first
           )
         end

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

@@ -33,7 +33,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 :headers, default: DEFAULT_HEADERS, type: :hash
             option :resource_script_names, default: false, type: :bool
 

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

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_SINATRA_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_SINATRA_DISTRIBUTED_TRACING'
           # @!visibility private
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_SINATRA_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SINATRA_ANALYTICS_SAMPLE_RATE'

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

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

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

@@ -57,6 +57,7 @@ module Datadog
                 type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
                 resource: "#{request.request_method} #{datadog_route}",
               ) do |span, trace|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.set_tag(Ext::TAG_APP_NAME, settings.name || settings.superclass.name)
                 span.set_tag(Ext::TAG_ROUTE_PATH, datadog_route)
 

data/lib/datadog/tracing/contrib/sinatra/tracer_middleware.rb

@@ -28,63 +28,64 @@ module Datadog
               service: configuration[:service_name],
               type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span|
-              begin
-                # this is kept nil until we set a correct one (either in the route or with a fallback in the ensure below)
-                # the nil signals that there's no good one yet and is also seen by profiler, when sampling the resource
-                span.resource = nil
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              # this is kept nil until we set a correct one (either in the route or with a fallback in the ensure below)
+              # the nil signals that there's no good one yet and is also seen by profiler, when sampling the resource
+              span.resource = nil
 
-                Sinatra::Env.set_datadog_span(env, span)
+              Sinatra::Env.set_datadog_span(env, span)
 
-                response = @app.call(env)
-              ensure
-                Contrib::Rack::HeaderTagging.tag_request_headers(span, env, configuration)
+              response = @app.call(env)
+            ensure
+              Contrib::Rack::HeaderTagging.tag_request_headers(span, env, configuration)
 
-                span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
-                span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
+              span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+              span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 
-                request = ::Sinatra::Request.new(env)
+              request = ::Sinatra::Request.new(env)
 
-                span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, request.path)
-                span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, request.request_method)
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, request.path)
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, request.request_method)
 
-                datadog_route = Sinatra::Env.route_path(env)
+              datadog_route = Sinatra::Env.route_path(env)
 
-                span.set_tag(Ext::TAG_ROUTE_PATH, datadog_route) if datadog_route
+              span.set_tag(Ext::TAG_ROUTE_PATH, datadog_route) if datadog_route
 
-                if request.script_name && !request.script_name.empty?
-                  span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name)
-                end
+              if request.script_name && !request.script_name.empty?
+                span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name)
+              end
 
-                # If this app handled the request, then Contrib::Sinatra::Tracer OR Contrib::Sinatra::Base set the
-                # resource; if no resource was set, let's use a fallback
-                span.resource = env['REQUEST_METHOD'] if span.resource.nil?
+              # If this app handled the request, then Contrib::Sinatra::Tracer OR Contrib::Sinatra::Base set the
+              # resource; if no resource was set, let's use a fallback
+              span.resource = env['REQUEST_METHOD'] if span.resource.nil?
 
-                rack_request_span = env[Contrib::Rack::Ext::RACK_ENV_REQUEST_SPAN]
+              rack_request_span = env[Contrib::Rack::Ext::RACK_ENV_REQUEST_SPAN]
 
-                # This propagates the Sinatra resource to the Rack span,
-                # since the latter is unaware of what the resource might be
-                # and would fallback to a generic resource name when unset
-                rack_request_span.resource ||= span.resource if rack_request_span
+              # This propagates the Sinatra resource to the Rack span,
+              # since the latter is unaware of what the resource might be
+              # and would fallback to a generic resource name when unset
+              rack_request_span.resource ||= span.resource if rack_request_span
 
-                if response
-                  if (status = response[0])
-                    sinatra_response = ::Sinatra::Response.new([], status) # Build object to use status code helpers
+              if response
+                if (status = response[0])
+                  sinatra_response = ::Sinatra::Response.new([], status) # Build object to use status code helpers
 
-                    span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, sinatra_response.status)
-                    span.set_error(env['sinatra.error']) if sinatra_response.server_error?
+                  span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, sinatra_response.status)
+                  if Datadog.configuration.tracing.http_error_statuses.server.include?(sinatra_response.status)
+                    span.set_error(env['sinatra.error'])
                   end
+                end
 
-                  if (headers = response[1])
-                    Contrib::Rack::HeaderTagging.tag_response_headers(span, headers, configuration)
-                  end
+                if (headers = response[1])
+                  Contrib::Rack::HeaderTagging.tag_response_headers(span, headers, configuration)
                 end
+              end
 
-                # Set analytics sample rate
-                Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
+              # Set analytics sample rate
+              Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
-                # Measure service stats
-                Contrib::Analytics.set_measured(span)
-              end
+              # Measure service stats
+              Contrib::Analytics.set_measured(span)
             end
           end
           # rubocop:enable Metrics/MethodLength

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

@@ -13,13 +13,24 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('2.12.0')
+          MINIMUM_SNEAKERS_VERSION = Gem::Version.new('2.12.0')
+          # All versions are supported. Kicks first version is 3.0.0.
+          MINIMUM_KICKS_VERSION = Gem::Version.new('3.0.0')
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :sneakers, auto_patch: true
-
+          register_alias_for :sneakers, as: :kicks
+
+          # Sneakers development continues in the Kicks gem.
+          # The **only** thing that has changed is the gem name,
+          # even the file naming and module namespacing are the same (require 'sneakers', `::Sneakers`).
+          #
+          # The last version of Sneakers is 2.12.0.
+          # The first version of Kicks is 3.0.0. We currently support all versions of Kicks.
+          #
+          # @see https://github.com/jondot/sneakers/commit/9780692624c666b6db8266d2d5710f709cb0f2e2
           def self.version
-            Gem.loaded_specs['sneakers'] && Gem.loaded_specs['sneakers'].version
+            Gem.loaded_specs['sneakers']&.version || Gem.loaded_specs['kicks']&.version
           end
 
           def self.loaded?
@@ -27,7 +38,7 @@ module Datadog
           end
 
           def self.compatible?
-            super && version >= MINIMUM_VERSION
+            super && !!(version&.>= MINIMUM_SNEAKERS_VERSION)
           end
 
           def new_configuration

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

@@ -22,6 +22,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_MESSAGING_SYSTEM)
 
               request_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

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

@@ -11,7 +11,7 @@ module Datadog
         NO_SOURCE = [].freeze
 
         def self.fetch_service_name(env, default)
-          ENV.fetch(env) do
+          DATADOG_ENV.fetch(env) do
             if Datadog.configuration.tracing.contrib.global_default_service_name.enabled
               return Datadog.configuration.service
             end

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

@@ -5,9 +5,17 @@ module Datadog
     module Contrib
       # Useful checking whether the defined range covers status code
       class StatusRangeMatcher
+        attr_reader :ranges
+
         def initialize(ranges)
-          @ranges = Array(ranges)
+          # Steep: https://github.com/ruby/rbs/issues/1874
+          @ranges = Array(ranges) # steep:ignore IncompatibleAssignment
+        end
+
+        def +(other)
+          StatusRangeMatcher.new(@ranges + other.ranges)
         end
+        alias_method :concat, :+
 
         def include?(status)
           @ranges.any? do |e|
@@ -19,6 +27,10 @@ module Datadog
             end
           end
         end
+
+        def to_s
+          @ranges.map { |range| range.is_a?(Range) ? "#{range.begin}-#{range.end}" : range.to_s }.join(',')
+        end
       end
     end
   end

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

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

data/lib/datadog/tracing/contrib/stripe/request.rb

@@ -54,8 +54,8 @@ module Datadog
             span.set_tag(Ext::TAG_REQUEST_METHOD, event.method)
             span.set_tag(Ext::TAG_REQUEST_PATH, event.path)
             span.set_tag(Ext::TAG_REQUEST_NUM_RETRIES, event.num_retries.to_s)
-          rescue StandardError => e
-            Datadog.logger.debug(e.message)
+          rescue => e
+            Datadog.logger.debug { "#{e.class}: #{e.message}" }
           end
 
           def configuration

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

@@ -86,6 +86,7 @@ module Datadog
 
               def __with_instrumentation(name)
                 Datadog::Tracing.trace(name, service: datadog_configuration[:service_name]) do |span|
+                  span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                   span.type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
                   span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                   span.set_tag(Ext::TAG_QUEUE, to_s)

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

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

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

@@ -51,6 +51,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