datadog 2.38.0 → 2.39.0

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,6 +42,34 @@ 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) &&
@@ -53,19 +91,86 @@ module Datadog
             def set_common_tags(span, db)
               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)
+
+              peer_metadata = false
 
-              # 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]
+              # 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
@@ -51,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
@@ -48,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

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative '../../../distributed/fetcher'
-require_relative '../../../distributed/propagation'
-require_relative '../../../distributed/propagation_policy'
-require_relative '../../../distributed/b3_multi'
-require_relative '../../../distributed/b3_single'
-require_relative '../../../distributed/datadog'
-require_relative '../../../distributed/none'
-require_relative '../../../distributed/trace_context'
-require_relative '../../../configuration/ext'
+require_relative "../../../distributed/fetcher"
+require_relative "../../../distributed/propagation"
+require_relative "../../../distributed/propagation_policy"
+require_relative "../../../distributed/b3_multi"
+require_relative "../../../distributed/b3_single"
+require_relative "../../../distributed/datadog"
+require_relative "../../../distributed/none"
+require_relative "../../../distributed/trace_context"
+require_relative "../../../configuration/ext"
 
 module Datadog
   module Tracing

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

@@ -7,38 +7,38 @@ module Datadog
         # Sidekiq integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          CLIENT_SERVICE_NAME = 'sidekiq-client'
-          ENV_ENABLED = 'DD_TRACE_SIDEKIQ_ENABLED'
+          CLIENT_SERVICE_NAME = "sidekiq-client"
+          ENV_ENABLED = "DD_TRACE_SIDEKIQ_ENABLED"
           # @!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'
+          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'
-          SPAN_REDIS_INFO = 'sidekiq.redis_info'
-          SPAN_HEARTBEAT = 'sidekiq.heartbeat'
-          SPAN_SCHEDULED_PUSH = 'sidekiq.scheduled_push'
-          SPAN_SCHEDULED_WAIT = 'sidekiq.scheduled_poller_wait'
-          SPAN_STOP = 'sidekiq.stop'
-          TAG_JOB_DELAY = 'sidekiq.job.delay'
-          TAG_JOB_ID = 'sidekiq.job.id'
-          TAG_JOB_QUEUE = 'sidekiq.job.queue'
-          TAG_JOB_RETRY = 'sidekiq.job.retry'
-          TAG_JOB_RETRY_COUNT = 'sidekiq.job.retry_count'
-          TAG_JOB_WRAPPER = 'sidekiq.job.wrapper'
-          TAG_JOB_ARGS = 'sidekiq.job.args'
-          TAG_COMPONENT = 'sidekiq'
-          TAG_OPERATION_PUSH = 'push'
-          TAG_OPERATION_JOB = 'job'
-          TAG_OPERATION_JOB_FETCH = 'job_fetch'
-          TAG_OPERATION_REDIS_INFO = 'redis_info'
-          TAG_OPERATION_HEARTBEAT = 'heartbeat'
-          TAG_OPERATION_SCHEDULED_PUSH = 'scheduled_push'
-          TAG_OPERATION_SCHEDULED_WAIT = 'scheduled_poller_wait'
-          TAG_OPERATION_STOP = 'stop'
+          SPAN_PUSH = "sidekiq.push"
+          SPAN_JOB = "sidekiq.job"
+          SPAN_JOB_FETCH = "sidekiq.job_fetch"
+          SPAN_REDIS_INFO = "sidekiq.redis_info"
+          SPAN_HEARTBEAT = "sidekiq.heartbeat"
+          SPAN_SCHEDULED_PUSH = "sidekiq.scheduled_push"
+          SPAN_SCHEDULED_WAIT = "sidekiq.scheduled_poller_wait"
+          SPAN_STOP = "sidekiq.stop"
+          TAG_JOB_DELAY = "sidekiq.job.delay"
+          TAG_JOB_ID = "sidekiq.job.id"
+          TAG_JOB_QUEUE = "sidekiq.job.queue"
+          TAG_JOB_RETRY = "sidekiq.job.retry"
+          TAG_JOB_RETRY_COUNT = "sidekiq.job.retry_count"
+          TAG_JOB_WRAPPER = "sidekiq.job.wrapper"
+          TAG_JOB_ARGS = "sidekiq.job.args"
+          TAG_COMPONENT = "sidekiq"
+          TAG_OPERATION_PUSH = "push"
+          TAG_OPERATION_JOB = "job"
+          TAG_OPERATION_JOB_FETCH = "job_fetch"
+          TAG_OPERATION_REDIS_INFO = "redis_info"
+          TAG_OPERATION_HEARTBEAT = "heartbeat"
+          TAG_OPERATION_SCHEDULED_PUSH = "scheduled_push"
+          TAG_OPERATION_SCHEDULED_WAIT = "scheduled_poller_wait"
+          TAG_OPERATION_STOP = "stop"
         end
       end
     end

data/lib/datadog/tracing/contrib/sidekiq/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,15 +12,15 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          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')
+          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
 
           def self.version
-            Gem.loaded_specs['sidekiq']&.version
+            Gem.loaded_specs["sidekiq"]&.version
           end
 
           def self.loaded?

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
+require_relative "../patcher"
 
 module Datadog
   module Tracing
@@ -17,8 +17,8 @@ module Datadog
           end
 
           def patch
-            require_relative 'client_tracer'
-            require_relative 'server_tracer'
+            require_relative "client_tracer"
+            require_relative "server_tracer"
 
             ::Sidekiq.configure_client do |config|
               config.client_middleware do |chain|
@@ -49,8 +49,8 @@ module Datadog
           end
 
           def patch_server_heartbeat
-            require_relative 'server_internal_tracer/stop'
-            require_relative 'server_internal_tracer/heartbeat'
+            require_relative "server_internal_tracer/stop"
+            require_relative "server_internal_tracer/heartbeat"
 
             ::Sidekiq::Launcher.prepend(ServerInternalTracer::Stop)
 
@@ -63,19 +63,19 @@ module Datadog
           end
 
           def patch_server_job_fetch
-            require_relative 'server_internal_tracer/job_fetch'
+            require_relative "server_internal_tracer/job_fetch"
 
             ::Sidekiq::Processor.prepend(ServerInternalTracer::JobFetch)
           end
 
           def patch_server_scheduled_push
-            require_relative 'server_internal_tracer/scheduled_poller'
+            require_relative "server_internal_tracer/scheduled_poller"
 
             ::Sidekiq::Scheduled::Poller.prepend(ServerInternalTracer::ScheduledPoller)
           end
 
           def patch_redis_info
-            require_relative 'server_internal_tracer/redis_info'
+            require_relative "server_internal_tracer/redis_info"
 
             if Integration.supports_capsules?
               ::Sidekiq::Config.prepend(ServerInternalTracer::RedisInfo)

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
-require_relative 'utils'
-require_relative '../utils/quantization/hash_formatter'
-require_relative 'distributed/propagation'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "utils"
+require_relative "../utils/quantization/hash_formatter"
+require_relative "distributed/propagation"
 
 module Datadog
   module Tracing
@@ -57,17 +57,17 @@ module Datadog
               # Measure service stats
               Contrib::Analytics.set_measured(span)
 
-              span.set_tag(Ext::TAG_JOB_ID, job['jid'])
-              span.set_tag(Ext::TAG_JOB_RETRY, job['retry'])
-              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_ID, job["jid"])
+              span.set_tag(Ext::TAG_JOB_RETRY, job["retry"])
+              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"]
 
-              enqueued_at = job['enqueued_at']
+              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']
+              args = job["args"]
               if args && !args.empty?
                 span.set_tag(Ext::TAG_JOB_ARGS, Contrib::Utils::Quantization::HashFormatter.format(args, @quantize[:args] || {}))
               end

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'yaml'
+require "yaml"
 
-require_relative '../../../core'
-require_relative 'ext'
+require_relative "../../../core"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -17,21 +17,21 @@ module Datadog
           # is the underlying, wrapped class, and not the wrapper. This is
           # primarily to support `ActiveJob`.
           def job_resource(job)
-            if job['wrapped']
-              job['wrapped'].to_s
-            elsif job['class'] == 'Sidekiq::Extensions::DelayedClass'
+            if job["wrapped"]
+              job["wrapped"].to_s
+            elsif job["class"] == "Sidekiq::Extensions::DelayedClass"
               delay_extension_class(job).to_s
             else
-              job['class'].to_s
+              job["class"].to_s
             end
           rescue => e
             Datadog.logger.debug { "Error retrieving Sidekiq job class name (jid:#{job["jid"]}): #{e.class}: #{e.message}" }
 
-            job['class'].to_s
+            job["class"].to_s
           end
 
           def delay_extension_class(job)
-            clazz, method = YAML.parse(job['args'].first).children.first.children
+            clazz, method = YAML.parse(job["args"].first).children.first.children
 
             method = method.value[1..-1] # Remove leading `:` from method symbol
 

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'component'
-require_relative 'sidekiq/integration'
-require_relative 'sidekiq/distributed/propagation'
+require_relative "component"
+require_relative "sidekiq/integration"
+require_relative "sidekiq/distributed/propagation"
 
 module Datadog
   module Tracing
@@ -10,18 +10,18 @@ module Datadog
       # `Sidekiq` integration public API
       module Sidekiq
         def self.inject(digest, data)
-          raise 'Please invoke Datadog.configure at least once before calling this method' unless @propagation
+          raise "Please invoke Datadog.configure at least once before calling this method" unless @propagation
 
           @propagation.inject!(digest, data)
         end
 
         def self.extract(data)
-          raise 'Please invoke Datadog.configure at least once before calling this method' unless @propagation
+          raise "Please invoke Datadog.configure at least once before calling this method" unless @propagation
 
           @propagation.extract(data)
         end
 
-        Contrib::Component.register('sidekiq') do |config|
+        Contrib::Component.register("sidekiq") do |config|
           tracing = config.tracing
           tracing.propagation_style # TODO: do we still need this?
 

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'time'
+require "time"
 
-require_relative '../../metadata/ext'
-require_relative 'ext'
+require_relative "../../metadata/ext"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -22,11 +22,11 @@ module Datadog
           end
 
           def route_path(env, use_script_names: Datadog.configuration.tracing[:sinatra][:resource_script_names])
-            return unless env['sinatra.route']
+            return unless env["sinatra.route"]
 
-            _, path = env['sinatra.route'].split(' ', 2)
+            _, path = env["sinatra.route"].split(" ", 2)
             if use_script_names
-              env['SCRIPT_NAME'].to_s + path
+              env["SCRIPT_NAME"].to_s + path
             else
               path
             end