datadog 2.17.0 → 2.37.0

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

@@ -38,16 +38,22 @@ module Datadog
 
               # DEV: Look for other uses of `ActiveSupport::Cache::Store#instrument`, to find other useful event keys.
               MAPPING = {
-                'cache_delete.active_support' => { resource: Ext::RESOURCE_CACHE_DELETE },
-                'cache_read.active_support' => { resource: Ext::RESOURCE_CACHE_GET },
-                'cache_read_multi.active_support' => { resource: Ext::RESOURCE_CACHE_MGET, multi_key: true },
-                'cache_write.active_support' => { resource: Ext::RESOURCE_CACHE_SET },
-                'cache_write_multi.active_support' => { resource: Ext::RESOURCE_CACHE_MSET, multi_key: true }
+                'cache_delete.active_support' => {resource: Ext::RESOURCE_CACHE_DELETE},
+                'cache_read.active_support' => {resource: Ext::RESOURCE_CACHE_GET},
+                'cache_read_multi.active_support' => {resource: Ext::RESOURCE_CACHE_MGET, multi_key: true},
+                'cache_write.active_support' => {resource: Ext::RESOURCE_CACHE_SET},
+                'cache_write_multi.active_support' => {resource: Ext::RESOURCE_CACHE_MSET, multi_key: true}
               }.freeze
 
-              def trace?(event, _payload)
+              def trace?(event, payload)
                 return false if !Tracing.enabled? || !configuration.enabled
 
+                if (cache_store = configuration[:cache_store])
+                  store = cache_backend(payload[:store])
+
+                  return false unless cache_store.include?(store)
+                end
+
                 # DEV-3.0: Backwards compatibility code for the 2.x gem series.
                 # DEV-3.0: See documentation at {Datadog::Tracing::Contrib::ActiveSupport::Cache::Instrumentation}
                 # DEV-3.0: for the complete information about this backwards compatibility code.
@@ -71,15 +77,12 @@ module Datadog
                 mapping = MAPPING.fetch(event)
 
                 span.service = configuration[:cache_service]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.resource = mapping[:resource]
 
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CACHE)
 
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Ext::TAG_CACHE_BACKEND, cache_backend(store))
 
                 span.set_tag('EVENT', event)
@@ -87,8 +90,8 @@ module Datadog
                 if Datadog.configuration.tracing[:active_support][:cache_key].enabled
                   set_cache_key(span, key, mapping[:multi_key])
                 end
-              rescue StandardError => e
-                Datadog.logger.error(e.message)
+              rescue => e
+                Datadog.logger.error("#{e.class}: #{e.message}")
                 Datadog::Core::Telemetry::Logger.report(e)
               end
 

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

@@ -51,13 +51,10 @@ module Datadog
                 service: Datadog.configuration.tracing[:active_support][:cache_service],
                 resource: action
               ) do |span|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CACHE)
 
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Ext::TAG_CACHE_BACKEND, store) if store
 
                 set_cache_key(span, key, multi_key) if Datadog.configuration.tracing[:active_support][:cache_key].enabled

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

@@ -49,6 +49,19 @@ module Datadog
                 o.default true
               end
             end
+
+            # Specifies which cache stores to trace.
+            # Accepts a list, with the same format as `config.cache_store`
+            # (e.g. `memory_store`, `file_store`, or symbols like `:file_store`).
+            # Defaults to `nil`, which traces all cache stores.
+            # @see https://github.com/rails/rails/blob/b7520a13adda46c0cc5f3fb4a4c1726633af2bba/guides/source/caching_with_rails.md?plain=1#L576-L582
+            option :cache_store do |o|
+              o.type :array, nilable: true
+              o.default nil
+              o.after_set do |stores|
+                stores&.map!(&:to_s) # Convert symbols to strings to match the Rails configuration format
+              end
+            end
           end
         end
       end

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

@@ -24,7 +24,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['activesupport'] && Gem.loaded_specs['activesupport'].version
+            Gem.loaded_specs['activesupport']&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/active_support/notifications/event.rb

@@ -67,7 +67,8 @@ module Datadog
                   payload[:exception] # Fallback for ActiveSupport < 5.0
               end
 
-              def on_start(_span, _event, _id, _payload); end
+              def on_start(_span, _event, _id, _payload)
+              end
 
               def on_finish(span, _event, _id, payload)
                 record_exception(span, payload)

data/lib/datadog/tracing/contrib/active_support/notifications/subscription.rb

@@ -122,10 +122,10 @@ module Datadog
               end
 
               def run(span, name, id, payload)
-                @block.call(span, name, id, payload) if @block
-              rescue StandardError => e
+                @block&.call(span, name, id, payload)
+              rescue => e
                 Datadog.logger.debug(
-                  "ActiveSupport::Notifications handler for '#{name}' failed: #{e.class.name} #{e.message}"
+                  "ActiveSupport::Notifications handler for '#{name}' failed: #{e.class}: #{e.message}"
                 )
               end
             end
@@ -144,13 +144,11 @@ module Datadog
 
               def run(event, key, *args)
                 blocks_for(key).each do |callback|
-                  begin
-                    callback.call(event, key, *args)
-                  rescue StandardError => e
-                    Datadog.logger.debug(
-                      "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.class.name} #{e.message}"
-                    )
-                  end
+                  callback.call(event, key, *args)
+                rescue => e
+                  Datadog.logger.debug(
+                    "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.class}: #{e.message}"
+                  )
                 end
               end
 

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

@@ -33,7 +33,7 @@ module Datadog
           TAG_RULE_NAME = 'rulename'
           TAG_STATE_MACHINE_NAME = 'statemachinename'
           TAG_BUCKET_NAME = 'bucketname'
-          PEER_SERVICE_SOURCES = Array[TAG_QUEUE_NAME,
+          PEER_SERVICE_SOURCES = [TAG_QUEUE_NAME,
             TAG_TOPIC_NAME,
             TAG_STREAM_NAME,
             TAG_TABLE_NAME,

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

@@ -32,12 +32,15 @@ module Datadog
           # rubocop:disable Metrics/MethodLength
           def annotate!(span, context)
             span.service = configuration[:service_name]
+            span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
             span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
             span.name = Ext::SPAN_COMMAND
             span.resource = context.safely(:resource)
 
-            # Set error on the span if the Response Status Code is in error range
-            if Tracing::Metadata::Ext::HTTP::ERROR_RANGE.cover?(context.safely(:status_code))
+            # DEV-3.0: This was previously checking against a 500..599 range.
+            # To not introduce breaking change, this was changed to use `http_error_statuses.server`,
+            # but `aws` is a client library, this check should use `http_error_statuses.client` instead.
+            if Datadog.configuration.tracing.http_error_statuses.server.include?(context.safely(:status_code))
               # At this point we do not have any additional diagnostics
               # besides the HTTP status code which is recorded in the span tags
               # later in this method.
@@ -59,11 +62,6 @@ module Datadog
               )
             end
 
-            # Tag original global service name if not used
-            if span.service != Datadog.configuration.service
-              span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-            end
-
             span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
             span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
@@ -87,8 +85,8 @@ module Datadog
             span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, context.safely(:status_code))
 
             Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
-          rescue StandardError => e
-            Datadog.logger.error(e.message)
+          rescue => e
+            Datadog.logger.error("#{e.class}: #{e.message}")
             Datadog::Core::Telemetry::Logger.report(e)
           end
           # rubocop:enable Metrics/MethodLength
@@ -123,7 +121,7 @@ module Datadog
               request.handlers.remove(Handler)
             end
 
-            super(*args, &block)
+            super
           end
 
           ruby2_keywords :sign_but_dont_send if respond_to?(:ruby2_keywords, true)

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

@@ -11,7 +11,9 @@ module Datadog
           end
 
           def safely(attr, fallback = nil)
-            public_send(attr) rescue fallback
+            public_send(attr)
+          rescue
+            fallback
           end
 
           def resource

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

@@ -43,7 +43,11 @@ module Datadog
             available_services.each_with_object([]) do |service, constants|
               next if ::Aws.autoload?(service)
 
-              constants << ::Aws.const_get(service, false).const_get(:Client, false) rescue next
+              begin
+                constants << ::Aws.const_get(service, false).const_get(:Client, false)
+              rescue
+                next
+              end
             end
           end
 

data/lib/datadog/tracing/contrib/aws/service/base.rb

@@ -7,7 +7,8 @@ module Datadog
         module Service
           # Base class for all AWS service-specific tag handlers.
           class Base
-            def add_tags(span, params); end
+            def add_tags(span, params)
+            end
           end
         end
       end

data/lib/datadog/tracing/contrib/aws/service/dynamodb.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/aws/service/eventbridge.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/aws/service/kinesis.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/aws/service/s3.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/aws/service/sns.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/aws/service/sqs.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/aws/service/states.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative './service/sqs'
-require_relative './service/sns'
-require_relative './service/dynamodb'
-require_relative './service/kinesis'
-require_relative './service/eventbridge'
-require_relative './service/states'
-require_relative './service/s3'
+require_relative 'service/sqs'
+require_relative 'service/sns'
+require_relative 'service/dynamodb'
+require_relative 'service/kinesis'
+require_relative 'service/eventbridge'
+require_relative 'service/states'
+require_relative 'service/s3'
 
 module Datadog
   module Tracing

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

@@ -9,18 +9,18 @@ module Datadog
           # Register a callback to be invoked when components are reconfigured.
           # @param name [String] the name of the integration
           # @param callback [Proc] the callback to invoke
-          # @yieldparam config [Datadog::Configuration] the configuration to pass to callbacks
+          # @yieldparam config [Datadog::Core::Configuration::Settings] the configuration to pass to callbacks
           def register(name, &callback)
             @registry[name] = callback
           end
 
           # Invoke all registered callbacks with the given configuration.
-          # @param config [Datadog::Configuration] the configuration to pass to callbacks
+          # @param config [Datadog::Core::Configuration::Settings] the configuration to pass to callbacks
           def configure(config)
             @registry.each do |name, callback|
               callback.call(config)
             rescue => e
-              Datadog.logger.warn("Error configuring integration #{name}: #{e}")
+              Datadog.logger.warn("Error configuring integration #{name}: #{e.class}: #{e.message}")
             end
           end
 

data/lib/datadog/tracing/contrib/concurrent_ruby/async_patch.rb

@@ -9,7 +9,7 @@ module Datadog
         # This patches the Async - to wrap executor service using ContextCompositeExecutorService
         module AsyncPatch
           def initialize(delegate)
-            super(delegate)
+            super
 
             @executor = ContextCompositeExecutorService.new(@executor)
           end

data/lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb

@@ -19,7 +19,7 @@ module Datadog
           # post method runs the task within composited executor - in a different thread. The original arguments are
           # captured to be propagated to the composited executor post method
           def post(*args, &task)
-            digest = Tracing.active_trace && Tracing.active_trace.to_digest
+            digest = Tracing.active_trace&.to_digest
             executor = @composited_executor.is_a?(Symbol) ? Concurrent.executor(@composited_executor) : @composited_executor
 
             # Pass the original arguments to the composited executor, which

data/lib/datadog/tracing/contrib/concurrent_ruby/future_patch.rb

@@ -9,7 +9,7 @@ module Datadog
         # This patches the Future - to wrap executor service using ContextCompositeExecutorService
         module FuturePatch
           def ns_initialize(value, opts)
-            super(value, opts)
+            super
 
             @executor = ContextCompositeExecutorService.new(@executor)
           end

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

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

data/lib/datadog/tracing/contrib/concurrent_ruby/promises_future_patch.rb

@@ -13,7 +13,7 @@ module Datadog
               default_executor = ContextCompositeExecutorService.new(default_executor)
             end
 
-            super(default_executor, *args, &task)
+            super
           end
         end
       end

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

@@ -43,14 +43,17 @@ module Datadog
           # the provided `options` and `&block`.
           def configure(matcher = :default, options = {}, &block)
             config = if matcher == :default
-                       default_configuration
-                     else
-                       # Get or add the configuration
-                       resolver.get(matcher) || resolver.add(matcher, new_configuration)
-                     end
+              default_configuration
+            else
+              resolver.get(matcher) || begin
+                new_config = new_configuration
+                set_integration_settings_path!(new_config)
+                resolver.add(matcher, new_config)
+              end
+            end
 
             # Apply the settings
-            config.configure(options, &block) if config
+            config&.configure(options, &block)
             config
           end
 
@@ -67,11 +70,23 @@ module Datadog
           #
           # @return [Datadog::Tracing::Contrib::Configuration::Settings] the memoized integration-specific settings object
           def default_configuration
-            @default_configuration ||= new_configuration
+            @default_configuration ||= begin
+              configuration = new_configuration
+              set_integration_settings_path!(configuration)
+              configuration
+            end
           end
 
           protected
 
+          def set_integration_settings_path!(configuration)
+            # name is called from Registerable::InstanceMethods#name
+            # which is set by register_as
+            return unless respond_to?(:name)
+
+            configuration.class.settings_path = "tracing.#{name}" if configuration.class.respond_to?(:settings_path=)
+          end
+
           # Returns a new configuration object for this integration.
           #
           # This method normally needs to be overridden for each integration

data/lib/datadog/tracing/contrib/configuration/resolver.rb

@@ -95,14 +95,24 @@ module Datadog
             super(*args)
 
             @cache_limit = cache_limit
-            @cache = {}
+            # Workaround for Ruby VM < 3.2.8, < 3.3.8 and < 3.4.3 (see https://bugs.ruby-lang.org/issues/21170)
+            # We initialize the hash with 10 dummy entries + clear it to force Ruby to use an
+            # "st_table" representation for the Hash, not an "ar_table" (since Ruby will not
+            # shrink a Hash using an "st_table" back to an "ar_table")
+            @cache = Hash[*1..20]
+            @cache.clear
+            # Workaround for the segfault from https://github.com/DataDog/dd-trace-rb/issues/5718#issuecomment-4421844775.
+            # It crashes on a simple {Hash} lookup, {Hash#key?}, called from `@cache.fetch(value)`.
+            # Using an identity-based {Hash} avoids {Hash#key?} calls.
+            # We should attempt to remove this workaround when we only support Ruby 4+,
+            # as large change around the crash site was done in that version (https://github.com/ruby/ruby/pull/14039/changes#diff-884a5a8a369ef1b4c7597e00aa65974cec8c5f54f25f03ad5d24848f64892869R1743),
+            # where `RClass.cc_table` (the NULL dereferenced pointer) became a GC-managed object,
+            @cache.compare_by_identity
           end
 
           # (see Resolver#resolve)
           def resolve(value)
-            if @cache.key?(value)
-              @cache[value]
-            else
+            @cache.fetch(value) do
               if @cache.size >= @cache_limit
                 @cache.shift # Remove the oldest entry if cache is full
               end

data/lib/datadog/tracing/contrib/configuration/resolvers/pattern_resolver.rb

@@ -17,10 +17,10 @@ module Datadog
               # Try to find a matching pattern
               _, config = configurations.reverse_each.find do |matcher, _|
                 matcher === if matcher.is_a?(Proc)
-                              value
-                            else
-                              value.to_s
-                            end
+                  value
+                else
+                  value.to_s
+                end
               end
 
               config

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

@@ -29,10 +29,11 @@ module Datadog
           TAG_COMPONENT = 'dalli'
           TAG_OPERATION_COMMAND = 'command'
           TAG_SYSTEM = 'memcached'
-          PEER_SERVICE_SOURCES = Array[
+          PEER_SERVICE_SOURCES = [
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
-            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,
+          ].freeze
         end
       end
     end

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

@@ -22,6 +22,7 @@ module Datadog
               Tracing.trace(Ext::SPAN_COMMAND) do |span|
                 span.resource = op.to_s.upcase
                 span.service = datadog_configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.type = Ext::SPAN_TYPE_COMMAND
 
                 if datadog_configuration[:peer_service]
@@ -31,11 +32,6 @@ module Datadog
                   )
                 end
 
-                # Tag original global service name if not used
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

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

@@ -14,12 +14,13 @@ module Datadog
 
           MINIMUM_VERSION = Gem::Version.new('2.0.0')
           DALLI_PROTOCOL_BINARY_VERSION = Gem::Version.new('3.0.0')
+          DALLI_PROTOCOL_META_VERSION = Gem::Version.new('5.0.0')
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :dalli, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['dalli'] && Gem.loaded_specs['dalli'].version
+            Gem.loaded_specs['dalli']&.version
           end
 
           def self.loaded?
@@ -31,7 +32,9 @@ module Datadog
           end
 
           def self.dalli_class
-            if version >= DALLI_PROTOCOL_BINARY_VERSION
+            if version >= DALLI_PROTOCOL_META_VERSION
+              ::Dalli::Protocol::Meta
+            elsif version >= DALLI_PROTOCOL_BINARY_VERSION
               ::Dalli::Protocol::Binary
             else
               ::Dalli::Server

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

@@ -16,7 +16,7 @@ module Datadog
             command = Core::Utils.utf8_encode(command, binary: true, placeholder: placeholder)
             Core::Utils.truncate(command, Ext::QUANTIZE_MAX_CMD_LENGTH)
           rescue => e
-            Datadog.logger.debug("Error sanitizing Dalli operation: #{e}")
+            Datadog.logger.debug("Error sanitizing Dalli operation: #{e.class}: #{e.message}")
             placeholder
           end
         end

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

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

data/lib/datadog/tracing/contrib/delayed_job/plugin.rb

@@ -21,6 +21,7 @@ module Datadog
               resource: job_name(job),
               on_error: configuration[:on_error]
             ) do |span|
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               set_sample_rate(span)
 
               # Measure service stats
@@ -51,6 +52,7 @@ module Datadog
               service: configuration[:client_service_name],
               resource: job_name(job)
             ) do |span|
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               set_sample_rate(span)
 
               # Measure service stats

data/lib/datadog/tracing/contrib/delayed_job/server_internal_tracer/worker.rb

@@ -11,6 +11,7 @@ module Datadog
               configuration = Datadog.configuration.tracing[:delayed_job]
 
               Datadog::Tracing.trace(Ext::SPAN_RESERVE_JOB, 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/elasticsearch/ext.rb

@@ -23,10 +23,11 @@ module Datadog
           TAG_COMPONENT = 'elasticsearch'
           TAG_OPERATION_QUERY = 'query'
           TAG_SYSTEM = 'elasticsearch'
-          PEER_SERVICE_SOURCES = Array[
+          PEER_SERVICE_SOURCES = [
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
-            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,
+          ].freeze
         end
       end
     end

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

@@ -20,10 +20,10 @@ module Datadog
           def self.version
             # elastic-transport gem for version >= 8.0.0
             # elasticsearch-transport gem for version < 8.0.0
-            Gem.loaded_specs['elastic-transport'] \
-              && Gem.loaded_specs['elastic-transport'].version || \
-              Gem.loaded_specs['elasticsearch-transport'] \
-                && Gem.loaded_specs['elasticsearch-transport'].version
+
+            Gem.loaded_specs['elastic-transport']&.version ||
+
+              Gem.loaded_specs['elasticsearch-transport']&.version
           end
 
           def self.loaded?