datadog 2.18.0 → 2.20.0

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

@@ -40,7 +40,7 @@ module Datadog
 
                   # Add additional request specific tags to the span.
                   annotate_span_with_request!(span, req, request_options)
-                rescue StandardError => e
+                rescue => e
                   logger.error("error preparing span for http.rb request: #{e}, Source: #{e.backtrace}")
                   Datadog::Core::Telemetry::Logger.report(e)
                 ensure
@@ -74,7 +74,7 @@ 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)
 
-              if req.verb && req.verb.is_a?(String) || req.verb.is_a?(Symbol)
+              if req.verb&.is_a?(String) || req.verb.is_a?(Symbol)
                 http_method = req.verb.to_s.upcase
                 span.resource = http_method
                 span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, http_method)
@@ -103,7 +103,7 @@ module Datadog
             end
 
             def annotate_span_with_response!(span, response, request_options)
-              return unless response && response.code
+              return unless response&.code
 
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.code)
 
@@ -116,7 +116,7 @@ module Datadog
               span.set_tags(
                 Datadog.configuration.tracing.header_tags.response_tags(response.headers)
               )
-            rescue StandardError => e
+            rescue => e
               logger.error("error preparing span from http.rb response: #{e}, Source: #{e.backtrace}")
               Datadog::Core::Telemetry::Logger.report(e)
             end

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

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

data/lib/datadog/tracing/contrib/kafka/event.rb

@@ -22,7 +22,7 @@ module Datadog
             end
 
             def span_options
-              { service: configuration[:service_name] }
+              {service: configuration[:service_name]}
             end
 
             def configuration

data/lib/datadog/tracing/contrib/kafka/events/connection/request.rb

@@ -31,7 +31,7 @@ module Datadog
               end
 
               def span_options
-                super.merge({ tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_CONNECTION_REQUEST } })
+                super.merge({tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_CONNECTION_REQUEST}})
               end
             end
           end

data/lib/datadog/tracing/contrib/kafka/events/consumer/process_batch.rb

@@ -38,7 +38,7 @@ module Datadog
               end
 
               def span_options
-                super.merge({ tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_PROCESS_BATCH } })
+                super.merge({tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_PROCESS_BATCH}})
               end
             end
           end

data/lib/datadog/tracing/contrib/kafka/events/consumer/process_message.rb

@@ -36,7 +36,7 @@ module Datadog
               end
 
               def span_options
-                super.merge({ tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_PROCESS_MESSAGE } })
+                super.merge({tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_PROCESS_MESSAGE}})
               end
             end
           end

data/lib/datadog/tracing/contrib/kafka/events/consumer_group/heartbeat.rb

@@ -36,7 +36,7 @@ module Datadog
               end
 
               def span_options
-                super.merge({ tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_CONSUMER_HEARTBEAT } })
+                super.merge({tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_CONSUMER_HEARTBEAT}})
               end
             end
           end

data/lib/datadog/tracing/contrib/kafka/events/consumer_group/join_group.rb

@@ -26,7 +26,7 @@ module Datadog
               end
 
               def span_options
-                super.merge({ tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_CONSUMER_JOIN_GROUP } })
+                super.merge({tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_CONSUMER_JOIN_GROUP}})
               end
             end
           end

data/lib/datadog/tracing/contrib/kafka/events/consumer_group/leave_group.rb

@@ -26,7 +26,7 @@ module Datadog
               end
 
               def span_options
-                super.merge({ tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_CONSUMER_LEAVE_GROUP } })
+                super.merge({tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_CONSUMER_LEAVE_GROUP}})
               end
             end
           end

data/lib/datadog/tracing/contrib/kafka/events/consumer_group/sync_group.rb

@@ -26,7 +26,7 @@ module Datadog
               end
 
               def span_options
-                super.merge({ tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_CONSUMER_SYNC_GROUP } })
+                super.merge({tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_CONSUMER_SYNC_GROUP}})
               end
             end
           end

data/lib/datadog/tracing/contrib/kafka/events/produce_operation/send_messages.rb

@@ -30,7 +30,7 @@ module Datadog
               end
 
               def span_options
-                super.merge({ tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_SEND_MESSAGES } })
+                super.merge({tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_SEND_MESSAGES}})
               end
             end
           end

data/lib/datadog/tracing/contrib/kafka/events/producer/deliver_messages.rb

@@ -33,7 +33,7 @@ module Datadog
               end
 
               def span_options
-                super.merge({ tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_DELIVER_MESSAGES } })
+                super.merge({tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_DELIVER_MESSAGES}})
               end
             end
           end

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

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

data/lib/datadog/tracing/contrib/karafka/monitor.rb

@@ -24,19 +24,19 @@ module Datadog
               consumer = job.executor.topic.consumer
 
               action = case job_type
-                       when 'Periodic', 'PeriodicNonBlocking'
-                         'tick'
-                       when 'Shutdown'
-                         'shutdown'
-                       when 'Revoked', 'RevokedNonBlocking'
-                         'revoked'
-                       when 'Idle'
-                         'idle'
-                       when 'Eofed', 'EofedNonBlocking'
-                         'eofed'
-                       else
-                         'consume'
-                       end
+              when 'Periodic', 'PeriodicNonBlocking'
+                'tick'
+              when 'Shutdown'
+                'shutdown'
+              when 'Revoked', 'RevokedNonBlocking'
+                'revoked'
+              when 'Idle'
+                'idle'
+              when 'Eofed', 'EofedNonBlocking'
+                'eofed'
+              else
+                'consume'
+              end
 
               span.resource = "#{consumer}##{action}"
 

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

@@ -27,10 +27,10 @@ module Datadog
             @messages_array.each do |message|
               if configuration[:distributed_tracing]
                 headers = if message.metadata.respond_to?(:raw_headers)
-                            message.metadata.raw_headers
-                          else
-                            message.metadata.headers
-                          end
+                  message.metadata.raw_headers
+                else
+                  message.metadata.headers
+                end
                 trace_digest = Karafka.extract(headers)
                 Datadog::Tracing.continue_trace!(trace_digest) if trace_digest
               end

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

@@ -16,7 +16,7 @@ module Datadog
               return super unless Datadog.configuration.tracing.log_injection
               return super unless Datadog.configuration.tracing[:lograge].enabled
 
-              original_custom_options = super(event)
+              original_custom_options = super
 
               # Retrieves trace information for current thread
               correlation = Tracing.correlation

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

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

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

@@ -11,7 +11,7 @@ module Datadog
           # Custom settings for the MongoDB integration
           # @public_api
           class Settings < Contrib::Configuration::Settings
-            DEFAULT_QUANTIZE = { show: [:collection, :database, :operation] }.freeze
+            DEFAULT_QUANTIZE = {show: [:collection, :database, :operation]}.freeze
 
             option :enabled do |o|
               o.type :bool

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

@@ -25,7 +25,7 @@ module Datadog
           TAG_COMPONENT = 'mongodb'
           TAG_OPERATION_COMMAND = 'command'
           TAG_SYSTEM = 'mongodb'
-          PEER_SERVICE_SOURCES = (Array[Ext::TAG_DB] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
+          PEER_SERVICE_SOURCES = ([Ext::TAG_DB] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
 
           # Temporary namespace to accommodate unified tags which has naming collision, before
           # making breaking changes

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

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

data/lib/datadog/tracing/contrib/mongodb/parsers.rb

@@ -9,7 +9,7 @@ module Datadog
       module MongoDB
         EXCLUDE_KEYS = [:_id].freeze
         SHOW_KEYS = [].freeze
-        DEFAULT_OPTIONS = { exclude: EXCLUDE_KEYS, show: SHOW_KEYS }.freeze
+        DEFAULT_OPTIONS = {exclude: EXCLUDE_KEYS, show: SHOW_KEYS}.freeze
 
         module_function
 

data/lib/datadog/tracing/contrib/mongodb/subscribers.rb

@@ -72,7 +72,7 @@ module Datadog
 
             # set the resource with the quantized query
             span.resource = serialized_query
-          rescue StandardError => e
+          rescue => e
             Datadog.logger.debug("error when handling MongoDB 'started' event: #{e}")
           end
           # rubocop:enable Metrics/AbcSize
@@ -84,12 +84,12 @@ module Datadog
             # the failure is not a real exception because it's handled by
             # the framework itself, so we set only the error and the message
             span.set_error(event)
-          rescue StandardError => e
+          rescue => e
             Datadog.logger.debug("error when handling MongoDB 'failed' event: #{e}")
           ensure
             # whatever happens, the Span must be removed from the local storage and
             # it must be finished to prevent any leak
-            span.finish unless span.nil?
+            span&.finish
             clear_span(event)
           end
 
@@ -100,12 +100,12 @@ module Datadog
             # add fields that are available only after executing the query
             rows = event.reply.fetch('n', nil)
             span.set_tag(Ext::TAG_ROWS, rows) unless rows.nil?
-          rescue StandardError => e
+          rescue => e
             Datadog.logger.debug("error when handling MongoDB 'succeeded' event: #{e}")
           ensure
             # whatever happens, the Span must be removed from the local storage and
             # it must be finished to prevent any leak
-            span.finish unless span.nil?
+            span&.finish
             clear_span(event)
           end
 
@@ -118,7 +118,7 @@ module Datadog
               # Incorrect Hash#to_s serialization. The Mongo command should only be encoded as JSON.
               # This code path should be removed, and is only kept to avoid a breaking change.
               Datadog::Core.log_deprecation(key: :mongo_json_command) do
-                'MongoDB integration: `json_command: false` causes invalid command serialization. '\
+                'MongoDB integration: `json_command: false` causes invalid command serialization. ' \
                 'Use `json_command: true` or `DD_TRACE_MONGO_JSON_COMMAND=1` instead.'
               end
 

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

@@ -20,7 +20,7 @@ module Datadog
           TAG_COMPONENT = 'mysql2'
           TAG_OPERATION_QUERY = 'query'
           TAG_SYSTEM = 'mysql'
-          PEER_SERVICE_SOURCES = (Array[Ext::TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
+          PEER_SERVICE_SOURCES = ([Ext::TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
         end
       end
     end

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

@@ -45,16 +45,13 @@ module Datadog
                 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_PEER_HOSTNAME, query_options[:host])
+                tag_database_instance(span, query_options[:database])
+
+                set_span_tags(span, query_options)
 
                 # Set analytics sample rate
                 Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
-                span.set_tag(Contrib::Ext::DB::TAG_INSTANCE, query_options[:database])
-                span.set_tag(Ext::TAG_DB_NAME, query_options[:database])
-                span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, query_options[:host])
-                span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, query_options[:port])
-
                 Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
 
                 sql = inject_propagation(span, sql, trace_op)
@@ -91,6 +88,19 @@ module Datadog
             def analytics_sample_rate
               datadog_configuration[:analytics_sample_rate]
             end
+
+            def tag_database_instance(span, database)
+              return if database.nil? || database.empty?
+
+              span.set_tag(Contrib::Ext::DB::TAG_INSTANCE, database)
+              span.set_tag(Ext::TAG_DB_NAME, database)
+            end
+
+            def set_span_tags(span, query_options)
+              span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, query_options[:host])
+              span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, query_options[:port])
+              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, query_options[:host])
+            end
           end
         end
       end

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

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

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

@@ -56,7 +56,7 @@ module Datadog
 
                 Datadog.logger.warn(
                   "Invalid resource pattern: #{value}. " \
-                  "Supported values are: #{Ext::VALID_RESOURCE_PATTERNS.join(' | ')}. " \
+                  "Supported values are: #{Ext::VALID_RESOURCE_PATTERNS.join(" | ")}. " \
                   "Using default value: #{Ext::DEFAULT_RESOURCE_PATTERN}."
                 )
 

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

@@ -36,10 +36,11 @@ module Datadog
           TAG_PORT = 'http.url_details.port'
           TAG_SCHEME = 'http.url_details.scheme'
           TAG_RESPONSE_CONTENT_LENGTH = 'http.response.content_length'
-          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/opensearch/integration.rb

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

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

@@ -34,79 +34,77 @@ module Datadog
               response = nil
               # rubocop:disable Metrics/BlockLength
               Tracing.trace('opensearch.query', service: datadog_configuration[:service_name]) do |span|
-                begin
-                  # Set generic tags
-                  span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
-                  span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
-                  span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
-
-                  # Set argument tags
-                  span.set_tag(OpenSearch::Ext::TAG_METHOD, method)
-                  span.set_tag(OpenSearch::Ext::TAG_PATH, path)
-
-                  tag_params(params, span)
-                  tag_body(body, span)
-
-                  # Parse url
-                  original_url = transport.get_connection.full_url(path, {})
-                  url = URI.parse(original_url)
-                  host = url.host
-                  port = url.port
-                  scheme = url.scheme
-                  # Set url.user to nil to remove sensitive information (i.e. user's username and password)
-                  url.user = nil
-
-                  if datadog_configuration[:peer_service]
-                    span.set_tag(
-                      Tracing::Metadata::Ext::TAG_PEER_SERVICE,
-                      datadog_configuration[:peer_service]
-                    )
-                  end
+                # Set generic tags
+                span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+                span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
+
+                # Set argument tags
+                span.set_tag(OpenSearch::Ext::TAG_METHOD, method)
+                span.set_tag(OpenSearch::Ext::TAG_PATH, path)
+
+                tag_params(params, span)
+                tag_body(body, span)
+
+                # Parse url
+                original_url = transport.get_connection.full_url(path, {})
+                url = URI.parse(original_url)
+                host = url.host
+                port = url.port
+                scheme = url.scheme
+                # Set url.user to nil to remove sensitive information (i.e. user's username and password)
+                url.user = nil
+
+                if datadog_configuration[:peer_service]
+                  span.set_tag(
+                    Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                    datadog_configuration[:peer_service]
+                  )
+                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
+                # 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
 
-                  # Set url tags
-                  span.set_tag(OpenSearch::Ext::TAG_URL, url)
-                  span.set_tag(OpenSearch::Ext::TAG_HOST, host)
-                  span.set_tag(OpenSearch::Ext::TAG_PORT, port)
-                  span.set_tag(OpenSearch::Ext::TAG_SCHEME, scheme)
-
-                  span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
-
-                  # Define span resource
-                  quantized_url = if datadog_configuration[:resource_pattern] == Ext::RELATIVE_RESOURCE_PATTERN
-                                    OpenSearch::Quantize.format_url(url.path)
-                                  else # Default to Ext::ABSOLUTE_RESOURCE_PATTERN
-                                    OpenSearch::Quantize.format_url(url)
-                                  end
-                  span.resource = "#{method} #{quantized_url}"
-                  Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
-                rescue StandardError => e
-                  Datadog.logger.error(e.message)
-                  Datadog::Core::Telemetry::Logger.report(e)
-                  # TODO: Refactor the code to streamline the execution without ensure
-                ensure
-                  begin
-                    response = super
-                  rescue => e
-                    status_code = ::OpenSearch::Transport::Transport::ERRORS.key(e.class)
-                    span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, status_code) if status_code
-                    raise
+                # Set url tags
+                span.set_tag(OpenSearch::Ext::TAG_URL, url)
+                span.set_tag(OpenSearch::Ext::TAG_HOST, host)
+                span.set_tag(OpenSearch::Ext::TAG_PORT, port)
+                span.set_tag(OpenSearch::Ext::TAG_SCHEME, scheme)
+
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
+
+                # Define span resource
+                quantized_url = if datadog_configuration[:resource_pattern] == Ext::RELATIVE_RESOURCE_PATTERN
+                  OpenSearch::Quantize.format_url(url.path)
+                else # Default to Ext::ABSOLUTE_RESOURCE_PATTERN
+                  OpenSearch::Quantize.format_url(url)
+                end
+                span.resource = "#{method} #{quantized_url}"
+                Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
+              rescue => e
+                Datadog.logger.error(e.message)
+                Datadog::Core::Telemetry::Logger.report(e)
+                # TODO: Refactor the code to streamline the execution without ensure
+              ensure
+                begin
+                  response = super
+                rescue => e
+                  status_code = ::OpenSearch::Transport::Transport::ERRORS.key(e.class)
+                  span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, status_code) if status_code
+                  raise
+                end
+                # Set post-response tags
+                if response
+                  if response.respond_to?(:status)
+                    span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
                   end
-                  # Set post-response tags
-                  if response
-                    if response.respond_to?(:status)
-                      span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
-                    end
-                    if response.respond_to?(:headers) && (response.headers || {})['content-length']
-                      span.set_tag(
-                        OpenSearch::Ext::TAG_RESPONSE_CONTENT_LENGTH,
-                        response.headers['content-length'].to_i
-                      )
-                    end
+                  if response.respond_to?(:headers) && (response.headers || {})['content-length']
+                    span.set_tag(
+                      OpenSearch::Ext::TAG_RESPONSE_CONTENT_LENGTH,
+                      response.headers['content-length'].to_i
+                    )
                   end
                 end
               end

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

@@ -28,7 +28,7 @@ module Datadog
           # Use Elasticsearch implementation
           def format_body(body, options = {})
             format_body!(body, options)
-          rescue StandardError
+          rescue
             options[:placeholder] || DEFAULT_PLACEHOLDER
           end
 
@@ -51,10 +51,10 @@ module Datadog
               # Show
               # If either is :all, value becomes :all
               options[:show] = if original[:show] == :all || additional[:show] == :all
-                                 :all
-                               else
-                                 (original[:show] || []).dup.concat(additional[:show] || []).uniq
-                               end
+                :all
+              else
+                (original[:show] || []).dup.concat(additional[:show] || []).uniq
+              end
 
               # Exclude
               options[:exclude] = (original[:exclude] || []).dup.concat(additional[:exclude] || []).uniq

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

@@ -27,7 +27,7 @@ module Datadog
           end
 
           def patch_name
-            self.class != Class && self.class != Module ? self.class.name : name
+            (self.class != Class && self.class != Module) ? self.class.name : name
           end
 
           def patched?
@@ -38,15 +38,13 @@ module Datadog
             return unless defined?(super)
 
             patch_only_once.run do
-              begin
-                super.tap do
-                  # Emit a metric
-                  Datadog.health_metrics.instrumentation_patched(1, tags: default_tags)
-                  @patch_successful = true
-                end
-              rescue StandardError => e
-                on_patch_error(e)
+              super.tap do
+                # Emit a metric
+                Datadog.health_metrics.instrumentation_patched(1, tags: default_tags)
+                @patch_successful = true
               end
+            rescue => e
+              on_patch_error(e)
             end
           end
 

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

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

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

@@ -29,7 +29,7 @@ module Datadog
           TAG_OPERATION_QUERY = 'query'
           TAG_OPERATION_KILL = 'kill'
           TAG_SYSTEM = 'presto'
-          PEER_SERVICE_SOURCES = (Array[Ext::TAG_SCHEMA_NAME] +
+          PEER_SERVICE_SOURCES = ([Ext::TAG_SCHEMA_NAME] +
                                             Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
         end
       end