ddtrace 1.11.0.beta1 → 1.11.0

data/lib/datadog/core/remote/component.rb

@@ -5,6 +5,7 @@ require_relative 'client/capabilities'
 require_relative 'client'
 require_relative '../transport/http'
 require_relative '../remote'
+require_relative 'negotiation'
 
 module Datadog
   module Core
@@ -16,27 +17,43 @@ module Datadog
 
         attr_reader :client
 
-        def initialize(settings, agent_settings)
+        def initialize(settings, capabilities, agent_settings)
           transport_options = {}
           transport_options[:agent_settings] = agent_settings if agent_settings
 
+          negotiation = Negotiation.new(settings, agent_settings)
           transport_v7 = Datadog::Core::Transport::HTTP.v7(**transport_options.dup)
 
-          capabilities = Client::Capabilities.new(settings)
-
           @barrier = Barrier.new(BARRIER_TIMEOUT)
 
           @client = Client.new(transport_v7, capabilities)
+          healthy = false
+          Datadog.logger.debug { "new remote configuration client: #{@client.id}" }
+
           @worker = Worker.new(interval: settings.remote.poll_interval_seconds) do
+            unless healthy || negotiation.endpoint?('/v0.7/config')
+              @barrier.lift
+
+              next
+            end
+
             begin
               @client.sync
+              healthy ||= true
+            rescue Client::SyncError => e
+              Datadog.logger.error do
+                "remote worker client sync error: #{e.message} location: #{Array(e.backtrace).first}. skipping sync"
+              end
             rescue StandardError => e
               Datadog.logger.error do
-                "remote worker error: #{e.class.name} #{e.message} location: #{Array(e.backtrace).first}"
+                "remote worker error: #{e.class.name} #{e.message} location: #{Array(e.backtrace).first}. "\
+                'reseting client state'
               end
 
               # client state is unknown, state might be corrupted
               @client = Client.new(transport_v7, capabilities)
+              healthy = false
+              Datadog.logger.debug { "new remote configuration client: #{@client.id}" }
 
               # TODO: bail out if too many errors?
             end
@@ -116,32 +133,23 @@ module Datadog
           def build(settings, agent_settings)
             return unless settings.remote.enabled
 
-            transport_options = {}
-            transport_options[:agent_settings] = agent_settings if agent_settings
+            capabilities = Client::Capabilities.new(settings)
 
-            transport_root = Datadog::Core::Transport::HTTP.root(**transport_options.dup)
+            return if capabilities.products.empty?
 
-            res = transport_root.send_info
-            if res.ok?
-              if res.endpoints.include?('/v0.7/config')
-                Datadog.logger.debug { 'agent reachable and reports remote configuration endpoint' }
-              else
-                Datadog.logger.error do
-                  'agent reachable but does not report remote configuration endpoint: ' \
-                    'disabling remote configuration for this process.'
-                end
+            negotiation = Negotiation.new(settings, agent_settings)
 
-                return
-              end
-            else
+            unless negotiation.endpoint?('/v0.7/config')
               Datadog.logger.error do
-                'agent unreachable: disabling remote configuration for this process.'
+                'endpoint unavailable: disabling remote configuration for this process.'
               end
 
               return
             end
 
-            new(settings, agent_settings)
+            Datadog.logger.debug { 'agent reachable and reports remote configuration endpoint' }
+
+            new(settings, capabilities, agent_settings)
           end
         end
       end

data/lib/datadog/core/remote/configuration/content.rb

@@ -19,11 +19,13 @@ module Datadog
           end
 
           attr_reader :path, :data, :hashes
+          attr_accessor :version
 
           def initialize(path:, data:)
             @path = path
             @data = data
             @hashes = {}
+            @version = 0
           end
 
           def hexdigest(type)

data/lib/datadog/core/remote/configuration/repository.rb

@@ -78,7 +78,7 @@ module Datadog
               @repository = repository
               @root_version = repository.root_version
               @targets_version = repository.targets_version
-              @config_states = []
+              @config_states = contents_to_config_states(repository.contents)
               @has_error = false
               @error = ''
               @opaque_backend_state = repository.opaque_backend_state
@@ -87,6 +87,18 @@ module Datadog
 
             private
 
+            def contents_to_config_states(contents)
+              return [] if contents.empty?
+
+              contents.map do |content|
+                {
+                  id: content.path.config_id,
+                  version: content.version,
+                  product: content.path.product
+                }
+              end
+            end
+
             def contents_to_cached_target_files(contents)
               return [] if contents.empty?
 
@@ -164,6 +176,7 @@ module Datadog
               def apply(repository)
                 return unless repository[@path].nil?
 
+                @content.version = @target.version
                 repository.contents << @content
 
                 @path
@@ -184,6 +197,7 @@ module Datadog
               def apply(repository)
                 return if repository[@path].nil?
 
+                @content.version = @target.version
                 repository.contents[@path] = @content
 
                 @path

data/lib/datadog/core/remote/configuration/target.rb

@@ -48,16 +48,18 @@ module Datadog
             def parse(hash)
               length = Integer(hash['length'])
               digests = Configuration::DigestList.parse(hash['hashes'])
+              version = Integer(hash['custom']['v'])
 
-              new(digests: digests, length: length)
+              new(digests: digests, length: length, version: version)
             end
           end
 
-          attr_reader :length, :digests
+          attr_reader :length, :digests, :version
 
-          def initialize(digests:, length:)
+          def initialize(digests:, length:, version:)
             @digests = digests
             @length = length
+            @version = version
           end
 
           private_class_method :new

data/lib/datadog/core/remote/negotiation.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require_relative '../transport/http'
+
+module Datadog
+  module Core
+    module Remote
+      # Endpoint negotiation
+      class Negotiation
+        def initialize(_settings, agent_settings)
+          transport_options = {}
+          transport_options[:agent_settings] = agent_settings if agent_settings
+
+          @transport_root = Datadog::Core::Transport::HTTP.root(**transport_options.dup)
+        end
+
+        def endpoint?(path)
+          res = @transport_root.send_info
+
+          if res.internal_error? && network_error?(res.error)
+            Datadog.logger.error { "agent unreachable: cannot negotiate #{path}" }
+
+            return false
+          end
+
+          if res.not_found?
+            Datadog.logger.error { "agent reachable but has no /info endpoint: cannot negotiate #{path}" }
+
+            return false
+          end
+
+          unless res.ok?
+            Datadog.logger.error { "agent reachable but unexpected response: cannot negotiate #{path}" }
+
+            return false
+          end
+
+          unless res.endpoints.include?(path)
+            Datadog.logger.error { "agent reachable but does not report #{path}" }
+
+            return false
+          end
+
+          Datadog.logger.debug { "agent reachable and reports #{path}" }
+
+          true
+        end
+
+        private
+
+        def network_error?(error)
+          error.is_a?(Errno::ECONNREFUSED)
+        end
+      end
+    end
+  end
+end

data/lib/datadog/core/transport/http/negotiation.rb

@@ -122,7 +122,7 @@ module Datadog
                 http_response = super(env, &block)
 
                 # Process the response
-                body = JSON.parse(http_response.payload, symbolize_names: true)
+                body = JSON.parse(http_response.payload, symbolize_names: true) if http_response.ok?
 
                 # TODO: there should be more processing here to ensure a proper response_options
                 response_options = body.is_a?(Hash) ? body : {}

data/lib/datadog/core/workers/async.rb

@@ -11,6 +11,10 @@ module Datadog
           FORK_POLICY_RESTART = :restart
           SHUTDOWN_TIMEOUT = 1
 
+          # This single shared mutex is used to avoid concurrency issues during the
+          # initialization of per-instance lazy-initialized mutexes.
+          MUTEX_INIT = Mutex.new
+
           def self.included(base)
             base.prepend(PrependedMethods)
           end
@@ -86,7 +90,7 @@ module Datadog
             :result
 
           def mutex
-            @mutex ||= Mutex.new
+            @mutex || MUTEX_INIT.synchronize { @mutex ||= Mutex.new }
           end
 
           def after_fork
@@ -99,7 +103,7 @@ module Datadog
             :pid
 
           def mutex_after_fork
-            @mutex_after_fork ||= Mutex.new
+            @mutex_after_fork || MUTEX_INIT.synchronize { @mutex_after_fork ||= Mutex.new }
           end
 
           def worker

data/lib/datadog/core/workers/interval_loop.rb

@@ -10,6 +10,10 @@ module Datadog
         BACK_OFF_MAX = 5
         BASE_INTERVAL = 1
 
+        # This single shared mutex is used to avoid concurrency issues during the
+        # initialization of per-instance lazy-initialized mutexes.
+        MUTEX_INIT = Mutex.new
+
         def self.included(base)
           base.prepend(PrependedMethods)
         end
@@ -82,7 +86,7 @@ module Datadog
           :loop_base_interval
 
         def mutex
-          @mutex ||= Mutex.new
+          @mutex || MUTEX_INIT.synchronize { @mutex ||= Mutex.new }
         end
 
         private

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

@@ -28,7 +28,12 @@ module Datadog
             end
 
             option :service_name do |o|
-              o.default { Utils.adapter_name }
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  '',
+                  Utils.adapter_name
+                )
+              end
               o.lazy
             end
           end

data/lib/datadog/tracing/contrib/active_record/events/sql.rb

@@ -46,7 +46,10 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SQL)
 
               # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              end
+
               # TODO: Populate hostname for JDBC connections
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, config[:host]) if config[:host]
 

data/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb

@@ -42,8 +42,10 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CACHE)
 
-              # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, service)
+              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                # Tag as an external peer service
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, service)
+              end
 
               tracing_context[:dd_cache_span] = span
             rescue StandardError => e

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

@@ -42,9 +42,10 @@ module Datadog
             # Tag as an external peer service
             if Contrib::SpanAttributeSchema.default_span_attribute_schema?
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, context.safely(:host))
             end
 
+            span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, context.safely(:host))
+
             # Set analytics sample rate
             if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
               Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])

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

@@ -27,7 +27,12 @@ module Datadog
             end
 
             option :service_name do |o|
-              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
               o.lazy
             end
           end

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

@@ -28,7 +28,10 @@ module Datadog
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_COMMAND)
 
                 # Tag as an external peer service
-                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+                if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                  span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+                end
+
                 span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, hostname)
 
                 # Set analytics sample rate

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

@@ -29,7 +29,12 @@ module Datadog
             option :quantize, default: {}
 
             option :service_name do |o|
-              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
               o.lazy
             end
           end

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

@@ -90,7 +90,10 @@ module Datadog
                     body = JSON.generate(body) if body && !body.is_a?(String)
 
                     # Tag as an external peer service
-                    span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+                    if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                      span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+                    end
+
                     span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
 
                     # Set analytics sample rate

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

@@ -31,7 +31,12 @@ module Datadog
             option :split_by_domain, default: false
 
             option :service_name do |o|
-              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
               o.lazy
             end
           end

data/lib/datadog/tracing/contrib/ethon/easy_patch.rb

@@ -121,8 +121,11 @@ module Datadog
               method = Ext::NOT_APPLICABLE_METHOD
               method = @datadog_method.to_s if instance_variable_defined?(:@datadog_method) && !@datadog_method.nil?
               span.resource = method
-              # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+
+              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                # Tag as an external peer service
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              end
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
@@ -138,7 +141,6 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, method)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, uri.host)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, uri.port)
-
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, uri.host)
             end
 

data/lib/datadog/tracing/contrib/ethon/multi_patch.rb

@@ -69,8 +69,10 @@ module Datadog
 
               @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
-              # Tag as an external peer service
-              @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, @datadog_multi_span.service)
+              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                # Tag as an external peer service
+                @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, @datadog_multi_span.service)
+              end
 
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(@datadog_multi_span, analytics_sample_rate) if analytics_enabled?

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

@@ -31,7 +31,12 @@ module Datadog
             option :split_by_domain, default: false
 
             option :service_name do |o|
-              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
               o.lazy
             end
           end

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

@@ -119,8 +119,11 @@ module Datadog
             span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
             span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 
-            # Tag as an external peer service
-            span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+            if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+              # Tag as an external peer service
+              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+            end
+
             span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, datum[:host])
 
             # Set analytics sample rate

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

@@ -35,7 +35,12 @@ module Datadog
             option :split_by_domain, default: false
 
             option :service_name do |o|
-              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
               o.lazy
             end
           end

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

@@ -45,8 +45,11 @@ module Datadog
             span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
             span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 
-            # Tag as an external peer service
-            span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+            if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+              # Tag as an external peer service
+              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+            end
+
             span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, env[:url].host)
 
             # Set analytics sample rate

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

@@ -30,7 +30,12 @@ module Datadog
             option :distributed_tracing, default: true
 
             option :service_name do |o|
-              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
               o.lazy
             end
 

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

@@ -43,8 +43,11 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CLIENT)
 
-              # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                # Tag as an external peer service
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              end
+
               host, _port = find_host_port(call)
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
 

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

@@ -29,7 +29,12 @@ module Datadog
             option :distributed_tracing, default: true
 
             option :service_name do |o|
-              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
               o.lazy
             end
 

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

@@ -80,8 +80,11 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, host)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, port.to_s)
 
-              # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                # Tag as an external peer service
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host)
 
               # Set analytics sample rate

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

@@ -12,6 +12,7 @@ module Datadog
 
           MINIMUM_VERSION = Gem::Version.new('3.5.4')
           MINIMUM_SERVER_INTERNAL_TRACING_VERSION = Gem::Version.new('5.2.4')
+          MINIMUM_CAPSULE_VERSION = Gem::Version.new('7.0.0')
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :sidekiq
@@ -37,6 +38,13 @@ module Datadog
             version >= MINIMUM_SERVER_INTERNAL_TRACING_VERSION
           end
 
+          # Capsules are a new way of configuring Sidekiq that was introduced in version 7
+          # that change the way some of the configuration data is exposed. Certain patches
+          # are applied differently for versions of Sidekiq that support capsules.
+          def self.supports_capsules?
+            version >= MINIMUM_CAPSULE_VERSION
+          end
+
           def new_configuration
             Configuration::Settings.new
           end

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

@@ -49,9 +49,17 @@ module Datadog
           end
 
           def patch_server_heartbeat
+            require_relative 'server_internal_tracer/stop'
             require_relative 'server_internal_tracer/heartbeat'
 
-            ::Sidekiq::Launcher.prepend(ServerInternalTracer::Heartbeat)
+            ::Sidekiq::Launcher.prepend(ServerInternalTracer::Stop)
+
+            # Sidekiq 7 changed method `heartbeat` to `beat`
+            if ::Sidekiq::Launcher.private_method_defined? :heartbeat
+              ::Sidekiq::Launcher.prepend(ServerInternalTracer::Heartbeat)
+            end
+
+            ::Sidekiq::Launcher.prepend(ServerInternalTracer::Beat) if ::Sidekiq::Launcher.private_method_defined? :beat
           end
 
           def patch_server_job_fetch
@@ -69,7 +77,11 @@ module Datadog
           def patch_redis_info
             require_relative 'server_internal_tracer/redis_info'
 
-            ::Sidekiq.singleton_class.prepend(ServerInternalTracer::RedisInfo)
+            if Integration.supports_capsules?
+              ::Sidekiq::Config.prepend(ServerInternalTracer::RedisInfo)
+            else
+              ::Sidekiq.singleton_class.prepend(ServerInternalTracer::RedisInfo)
+            end
           end
         end
       end