datadog 2.12.0 → 2.22.0

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 require_relative '../analytics'
 require_relative 'ext'
 require_relative '../ext'
@@ -30,7 +32,7 @@ module Datadog
 
             # build a quantized Query using the Parser module
             query = MongoDB.query_builder(event.command_name, event.database_name, event.command)
-            serialized_query = query.to_s
+            serialized_query = serialize_query(query)
 
             if datadog_configuration[:peer_service]
               span.set_tag(
@@ -70,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
@@ -82,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
 
@@ -98,17 +100,32 @@ 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
 
           private
 
+          def serialize_query(query)
+            if datadog_configuration[:json_command]
+              query.to_json
+            else
+              # 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. ' \
+                'Use `json_command: true` or `DD_TRACE_MONGO_JSON_COMMAND=1` instead.'
+              end
+
+              query.to_s
+            end
+          end
+
           def get_span(event)
             Thread.current[:datadog_mongo_span] \
               && Thread.current[:datadog_mongo_span][event.request_id]

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

@@ -46,6 +46,23 @@ module Datadog
               o.type :string, nilable: true
               o.env Ext::ENV_PEER_SERVICE
             end
+
+            option :resource_pattern do |o|
+              o.type :string
+              o.env Ext::ENV_RESOURCE_PATTERN
+              o.default Ext::DEFAULT_RESOURCE_PATTERN
+              o.setter do |value|
+                next value if Ext::VALID_RESOURCE_PATTERNS.include?(value)
+
+                Datadog.logger.warn(
+                  "Invalid resource pattern: #{value}. " \
+                  "Supported values are: #{Ext::VALID_RESOURCE_PATTERNS.join(" | ")}. " \
+                  "Using default value: #{Ext::DEFAULT_RESOURCE_PATTERN}."
+                )
+
+                Ext::DEFAULT_RESOURCE_PATTERN
+              end
+            end
           end
         end
       end

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

@@ -13,6 +13,15 @@ module Datadog
           # @!visibility private
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_OPENSEARCH_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_OPENSEARCH_ANALYTICS_SAMPLE_RATE'
+          ENV_RESOURCE_PATTERN = 'DD_TRACE_OPENSEARCH_RESOURCE_PATTERN'
+          ABSOLUTE_RESOURCE_PATTERN = 'absolute'
+          RELATIVE_RESOURCE_PATTERN = 'relative'
+          VALID_RESOURCE_PATTERNS = [
+            ABSOLUTE_RESOURCE_PATTERN,
+            RELATIVE_RESOURCE_PATTERN
+          ].freeze
+          # Default should be changed to RELATIVE in 3.0 to match the Elasticsearch integration
+          DEFAULT_RESOURCE_PATTERN = ABSOLUTE_RESOURCE_PATTERN
           DEFAULT_PEER_SERVICE_NAME = 'opensearch'
           SPAN_QUERY = 'opensearch.query'
           SPAN_TYPE_QUERY = 'opensearch'
@@ -27,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,75 +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 = OpenSearch::Quantize.format_url(url)
-                  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

@@ -20,11 +20,14 @@ module Datadog
         # @public_api
         module CommonMethods
           attr_accessor \
-            :patch_error_result,
-            :patch_successful
+            :patch_error_result
+
+          def patch_successful
+            !!@patch_successful
+          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?
@@ -35,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

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

@@ -27,7 +27,7 @@ module Datadog
                     span.resource = query
                     span.type = Tracing::Metadata::Ext::SQL::TYPE
                     span.set_tag(Ext::TAG_QUERY_ASYNC, false)
-                  rescue StandardError => e
+                  rescue => e
                     Datadog.logger.debug("error preparing span for presto: #{e}")
                   end
 
@@ -45,7 +45,7 @@ module Datadog
                     span.resource = query
                     span.type = Tracing::Metadata::Ext::SQL::TYPE
                     span.set_tag(Ext::TAG_QUERY_ASYNC, !blk.nil?)
-                  rescue StandardError => e
+                  rescue => e
                     Datadog.logger.debug("error preparing span for presto: #{e}")
                   end
 
@@ -64,7 +64,7 @@ module Datadog
                     span.type = Tracing::Metadata::Ext::AppTypes::TYPE_DB
                     # ^ not an SQL type span, since there's no SQL query
                     span.set_tag(Ext::TAG_QUERY_ID, query_id)
-                  rescue StandardError => e
+                  rescue => e
                     Datadog.logger.debug("error preparing span for presto: #{e}")
                   end
 

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

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

data/lib/datadog/tracing/contrib/propagation/sql_comment/comment.rb

@@ -15,7 +15,7 @@ module Datadog
 
             def to_s
               @string ||= begin
-                ret = String.new
+                ret = +''
 
                 @hash.each do |key, value|
                   next if value.nil?

data/lib/datadog/tracing/contrib/propagation/sql_comment.rb

@@ -48,7 +48,7 @@ module Datadog
                   Tracing::Distributed::TraceContext.new(fetcher: nil).send(:build_traceparent, trace_op.to_digest)
               else
                 Datadog.logger.warn(
-                  'Sql comment propagation with `full` mode is aborted, because tracing is disabled. '\
+                  'Sql comment propagation with `full` mode is aborted, because tracing is disabled. ' \
                   'Please set `Datadog.configuration.tracing.enabled = true` to continue.'
                 )
               end

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

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

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

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

data/lib/datadog/tracing/contrib/racecar/events/batch.rb

@@ -26,8 +26,8 @@ module Datadog
 
             def span_options
               super.merge(
-                tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_BATCH,
-                        Tracing::Metadata::Ext::TAG_KIND => Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER }
+                tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_BATCH,
+                       Tracing::Metadata::Ext::TAG_KIND => Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER}
               )
             end
           end

data/lib/datadog/tracing/contrib/racecar/events/consume.rb

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

data/lib/datadog/tracing/contrib/racecar/events/message.rb

@@ -26,8 +26,8 @@ module Datadog
 
             def span_options
               super.merge(
-                tags: { Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_MESSAGE,
-                        Tracing::Metadata::Ext::TAG_KIND => Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER }
+                tags: {Tracing::Metadata::Ext::TAG_OPERATION => Ext::TAG_OPERATION_MESSAGE,
+                       Tracing::Metadata::Ext::TAG_KIND => Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER}
               )
             end
           end

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

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

data/lib/datadog/tracing/contrib/rack/header_collection.rb

@@ -22,7 +22,7 @@ module Datadog
             end
 
             # Allows this class to have a similar API to a {Hash}.
-            alias [] get
+            alias_method :[], :get
 
             # Tests whether a header with the given name exists in the environment.
             def key?(header_name)

data/lib/datadog/tracing/contrib/rack/header_tagging.rb

@@ -12,17 +12,17 @@ module Datadog
 
             # Use global DD_TRACE_HEADER_TAGS if integration-level configuration is not provided
             tags = if configuration.using_default?(:headers) && !Datadog.configuration.tracing.using_default?(:header_tags)
-                     Datadog.configuration.tracing.header_tags.request_tags(headers)
-                   else
-                     whitelist = configuration[:headers][:request] || []
-                     whitelist.each_with_object({}) do |header, result|
-                       header_value = headers.get(header)
-                       unless header_value.nil?
-                         header_tag = Tracing::Metadata::Ext::HTTP::RequestHeaders.to_tag(header)
-                         result[header_tag] = header_value
-                       end
-                     end
-                   end
+              Datadog.configuration.tracing.header_tags.request_tags(headers)
+            else
+              whitelist = configuration[:headers][:request] || []
+              whitelist.each_with_object({}) do |header, result|
+                header_value = headers.get(header)
+                unless header_value.nil?
+                  header_tag = Tracing::Metadata::Ext::HTTP::RequestHeaders.to_tag(header)
+                  result[header_tag] = header_value
+                end
+              end
+            end
 
             span.set_tags(tags)
           end
@@ -32,27 +32,27 @@ module Datadog
 
             # Use global DD_TRACE_HEADER_TAGS if integration-level configuration is not provided
             tags = if configuration.using_default?(:headers) && !Datadog.configuration.tracing.using_default?(:header_tags)
-                     Datadog.configuration.tracing.header_tags.response_tags(headers)
-                   else
-                     whitelist = configuration[:headers][:response] || []
-                     whitelist.each_with_object({}) do |header, result|
-                       header_value = headers[header]
-
-                       next if header_value.nil?
-
-                       header_tag = Tracing::Metadata::Ext::HTTP::ResponseHeaders.to_tag(header)
-
-                       # Maintain the value format between Rack 2 and 3
-                       #
-                       # Rack 2.x => { 'foo' => 'bar,baz' }
-                       # Rack 3.x => { 'foo' => ['bar', 'baz'] }
-                       result[header_tag] = if header_value.is_a? Array
-                                              header_value.join(',')
-                                            else
-                                              header_value
-                                            end
-                     end
-                   end
+              Datadog.configuration.tracing.header_tags.response_tags(headers)
+            else
+              whitelist = configuration[:headers][:response] || []
+              whitelist.each_with_object({}) do |header, result|
+                header_value = headers[header]
+
+                next if header_value.nil?
+
+                header_tag = Tracing::Metadata::Ext::HTTP::ResponseHeaders.to_tag(header)
+
+                # Maintain the value format between Rack 2 and 3
+                #
+                # Rack 2.x => { 'foo' => 'bar,baz' }
+                # Rack 3.x => { 'foo' => ['bar', 'baz'] }
+                result[header_tag] = if header_value.is_a? Array
+                  header_value.join(',')
+                else
+                  header_value
+                end
+              end
+            end
 
             span.set_tags(tags)
           end