ddtrace 1.12.1 → 1.14.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,18 +7,24 @@ module Datadog
         # Dalli integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_DALLI_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_DALLI_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_DALLI_ANALYTICS_SAMPLE_RATE'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_DALLI_SERVICE_NAME'.freeze
+          ENV_ENABLED = 'DD_TRACE_DALLI_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_DALLI_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_DALLI_ANALYTICS_SAMPLE_RATE'
+          ENV_SERVICE_NAME = 'DD_TRACE_DALLI_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_DALLI_PEER_SERVICE'
+
           QUANTIZE_MAX_CMD_LENGTH = 100
-          DEFAULT_PEER_SERVICE_NAME = 'memcached'.freeze
-          SPAN_COMMAND = 'memcached.command'.freeze
-          SPAN_TYPE_COMMAND = 'memcached'.freeze
-          TAG_COMMAND = 'memcached.command'.freeze
-          TAG_COMPONENT = 'dalli'.freeze
-          TAG_OPERATION_COMMAND = 'command'.freeze
-          TAG_SYSTEM = 'memcached'.freeze
+          DEFAULT_PEER_SERVICE_NAME = 'memcached'
+          SPAN_COMMAND = 'memcached.command'
+          SPAN_TYPE_COMMAND = 'memcached'
+          TAG_COMMAND = 'memcached.command'
+          TAG_COMPONENT = 'dalli'
+          TAG_OPERATION_COMMAND = 'command'
+          TAG_SYSTEM = 'memcached'
+          PEER_SERVICE_SOURCES = Array[
+            Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
+            Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
         end
       end
     end

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

@@ -22,16 +22,17 @@ module Datadog
                 span.service = datadog_configuration[:service_name]
                 span.span_type = Ext::SPAN_TYPE_COMMAND
 
+                if datadog_configuration[:peer_service]
+                  span.set_tag(
+                    Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                    datadog_configuration[:peer_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)
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_COMMAND)
-
-                # Tag as an external peer service
-                if Contrib::SpanAttributeSchema.default_span_attribute_schema?
-                  span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-                end
-
                 span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, hostname)
 
                 # Set analytics sample rate
@@ -47,6 +48,7 @@ module Datadog
                 cmd = Quantize.format_command(op, args)
                 span.set_tag(Ext::TAG_COMMAND, cmd)
 
+                Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
                 super
               end
             end

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

@@ -13,23 +13,29 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :service_name
             option :client_service_name
-            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :error_handler do |o|
+              o.type :proc
+              o.experimental_default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+            end
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,20 +7,20 @@ module Datadog
         # DelayedJob integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_DELAYED_JOB_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_DELAYED_JOB_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_DELAYED_JOB_ANALYTICS_SAMPLE_RATE'.freeze
-          SPAN_JOB = 'delayed_job'.freeze
-          SPAN_ENQUEUE = 'delayed_job.enqueue'.freeze
-          SPAN_RESERVE_JOB = 'delayed_job.reserve_job'.freeze
-          TAG_ATTEMPTS = 'delayed_job.attempts'.freeze
-          TAG_ID = 'delayed_job.id'.freeze
-          TAG_PRIORITY = 'delayed_job.priority'.freeze
-          TAG_QUEUE = 'delayed_job.queue'.freeze
-          TAG_COMPONENT = 'delayed_job'.freeze
-          TAG_OPERATION_ENQUEUE = 'enqueue'.freeze
-          TAG_OPERATION_JOB = 'job'.freeze
-          TAG_OPERATION_RESERVE_JOB = 'reserve_job'.freeze
+          ENV_ENABLED = 'DD_TRACE_DELAYED_JOB_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_DELAYED_JOB_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_DELAYED_JOB_ANALYTICS_SAMPLE_RATE'
+          SPAN_JOB = 'delayed_job'
+          SPAN_ENQUEUE = 'delayed_job.enqueue'
+          SPAN_RESERVE_JOB = 'delayed_job.reserve_job'
+          TAG_ATTEMPTS = 'delayed_job.attempts'
+          TAG_ID = 'delayed_job.id'
+          TAG_PRIORITY = 'delayed_job.priority'
+          TAG_QUEUE = 'delayed_job.queue'
+          TAG_COMPONENT = 'delayed_job'
+          TAG_OPERATION_ENQUEUE = 'enqueue'
+          TAG_OPERATION_JOB = 'job'
+          TAG_OPERATION_RESERVE_JOB = 'reserve_job'
         end
       end
     end

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

@@ -12,18 +12,21 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :quantize, default: {}
@@ -35,7 +38,11 @@ module Datadog
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
-              o.lazy
+            end
+
+            option :peer_service do |o|
+              o.type :string, nilable: true
+              o.env Ext::ENV_PEER_SERVICE
             end
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,21 +7,25 @@ module Datadog
         # Elasticsearch integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_ELASTICSEARCH_ENABLED'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_ELASTICSEARCH_SERVICE_NAME'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ELASTICSEARCH_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ELASTICSEARCH_ANALYTICS_SAMPLE_RATE'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'elasticsearch'.freeze
-          SPAN_QUERY = 'elasticsearch.query'.freeze
-          SPAN_TYPE_QUERY = 'elasticsearch'.freeze
-          TAG_BODY = 'elasticsearch.body'.freeze
-          TAG_METHOD = 'elasticsearch.method'.freeze
-          TAG_PARAMS = 'elasticsearch.params'.freeze
-          TAG_URL = 'elasticsearch.url'.freeze
-          TAG_COMPONENT = 'elasticsearch'.freeze
-          TAG_OPERATION_QUERY = 'query'.freeze
-
-          TAG_SYSTEM = 'elasticsearch'.freeze
+          ENV_ENABLED = 'DD_TRACE_ELASTICSEARCH_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_ELASTICSEARCH_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_ELASTICSEARCH_PEER_SERVICE'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ELASTICSEARCH_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ELASTICSEARCH_ANALYTICS_SAMPLE_RATE'
+          DEFAULT_PEER_SERVICE_NAME = 'elasticsearch'
+          SPAN_QUERY = 'elasticsearch.query'
+          SPAN_TYPE_QUERY = 'elasticsearch'
+          TAG_BODY = 'elasticsearch.body'
+          TAG_METHOD = 'elasticsearch.method'
+          TAG_PARAMS = 'elasticsearch.params'
+          TAG_URL = 'elasticsearch.url'
+          TAG_COMPONENT = 'elasticsearch'
+          TAG_OPERATION_QUERY = 'query'
+          TAG_SYSTEM = 'elasticsearch'
+          PEER_SERVICE_SOURCES = Array[
+            Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
+            Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
         end
       end
     end

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

@@ -24,120 +24,120 @@ module Datadog
             require 'json'
             require_relative 'quantize'
 
-            patch_elasticsearch_transport_client
+            transport_module::Client.prepend(Client)
           end
 
           SELF_DEPRECATION_ONLY_ONCE = Core::Utils::OnlyOnce.new
 
-          # rubocop:disable Metrics/MethodLength
-          # rubocop:disable Metrics/AbcSize
-          # rubocop:disable Metrics/CyclomaticComplexity
-          # rubocop:disable Metrics/PerceivedComplexity
-          def patch_elasticsearch_transport_client
-            # rubocop:disable Metrics/BlockLength
-            transport_module::Client.class_eval do
-              alias_method :perform_request_without_datadog, :perform_request
-              remove_method :perform_request
-
-              def perform_request(*args)
-                # DEV-2.0: Remove this access, as `Client#self` in this context is not exposed to the user
-                # since `elasticsearch` v8.0.0. In contrast, `Client#transport` is always available across
-                # all `elasticsearch` gem versions and should be used instead.
-                service = Datadog.configuration_for(self, :service_name)
-
-                if service
-                  SELF_DEPRECATION_ONLY_ONCE.run do
-                    Datadog.logger.warn(
-                      'Providing configuration though the Elasticsearch client object is deprecated.' \
-                      'Configure the `client#transport` object instead: ' \
-                      'Datadog.configure_onto(client.transport, service_name: service_name, ...)'
+          # Patches Elasticsearch::Transport::Client module
+          module Client
+            # rubocop:disable Metrics/MethodLength
+            # rubocop:disable Metrics/AbcSize
+            def perform_request(*args)
+              # DEV-2.0: Remove this access, as `Client#self` in this context is not exposed to the user
+              # since `elasticsearch` v8.0.0. In contrast, `Client#transport` is always available across
+              # all `elasticsearch` gem versions and should be used instead.
+              service = Datadog.configuration_for(self, :service_name)
+
+              if service
+                SELF_DEPRECATION_ONLY_ONCE.run do
+                  Datadog.logger.warn(
+                    'Providing configuration though the Elasticsearch client object is deprecated.' \
+                    'Configure the `client#transport` object instead: ' \
+                    'Datadog.configure_onto(client.transport, service_name: service_name, ...)'
+                  )
+                end
+              end
+
+              # `Client#transport` is most convenient object both this integration and the library
+              # user have shared access to across all `elasticsearch` versions.
+              #
+              # `Client#self` in this context is an internal object that the library user
+              # does not have access to since `elasticsearch` v8.0.0.
+              service ||= Datadog.configuration_for(transport, :service_name) || datadog_configuration[:service_name]
+
+              method = args[0]
+              path = args[1]
+              params = args[2]
+              body = args[3]
+              full_url = URI.parse(path)
+              url = full_url.path
+              response = nil
+
+              Tracing.trace(Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_QUERY, service: service) do |span|
+                begin
+                  connection = transport.connections.first
+                  host = connection.host[:host] if connection
+                  port = connection.host[:port] if connection
+
+                  if datadog_configuration[:peer_service]
+                    span.set_tag(
+                      Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                      datadog_configuration[:peer_service]
                     )
                   end
-                end
 
-                # `Client#transport` is most convenient object both this integration and the library
-                # user have shared access to across all `elasticsearch` versions.
-                #
-                # `Client#self` in this context is an internal object that the library user
-                # does not have access to since `elasticsearch` v8.0.0.
-                service ||= Datadog.configuration_for(transport, :service_name) || datadog_configuration[:service_name]
-
-                method = args[0]
-                path = args[1]
-                params = args[2]
-                body = args[3]
-                full_url = URI.parse(path)
-
-                url = full_url.path
-                response = nil
-
-                Tracing.trace(Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_QUERY, service: service) do |span|
-                  begin
-                    connection = transport.connections.first
-                    host = connection.host[:host] if connection
-                    port = connection.host[:port] if connection
-
-                    span.span_type = Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_TYPE_QUERY
-
-                    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, Ext::TAG_SYSTEM)
-
-                    # load JSON for the following fields unless they're already strings
-                    params = JSON.generate(params) if params && !params.is_a?(String)
-                    body = JSON.generate(body) if body && !body.is_a?(String)
-
-                    # Tag as an external peer service
-                    if Contrib::SpanAttributeSchema.default_span_attribute_schema?
-                      span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-                    end
-
-                    span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
-
-                    # Set analytics sample rate
-                    if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
-                      Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
-                    end
-
-                    span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_METHOD, method)
-                    span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_URL, url)
-                    span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_PARAMS, params) if params
-                    if body
-                      quantize_options = datadog_configuration[:quantize]
-                      quantized_body = Datadog::Tracing::Contrib::Elasticsearch::Quantize.format_body(
-                        body,
-                        quantize_options
-                      )
-                      span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_BODY, quantized_body)
-                    end
-                    span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, host) if host
-                    span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, port) if port
-
-                    quantized_url = Datadog::Tracing::Contrib::Elasticsearch::Quantize.format_url(url)
-                    span.resource = "#{method} #{quantized_url}"
-                  rescue StandardError => e
-                    Datadog.logger.error(e.message)
-                  ensure
-                    # the call is still executed
-                    response = perform_request_without_datadog(*args)
-                    span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
+                  span.span_type = Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_TYPE_QUERY
+
+                  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, Ext::TAG_SYSTEM)
+
+                  span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
+
+                  # Set analytics sample rate
+                  if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
+                    Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
                   end
+
+                  span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_METHOD, method)
+                  tag_params(params, span)
+                  tag_body(body, span)
+                  span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_URL, url)
+                  span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, host) if host
+                  span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, port) if port
+
+                  quantized_url = Datadog::Tracing::Contrib::Elasticsearch::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)
+                ensure
+                  # the call is still executed
+                  response = super
+                  span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
                 end
-                response
               end
+              response
+            end
 
-              def datadog_configuration
-                Datadog.configuration.tracing[:elasticsearch]
-              end
+            def tag_params(params, span)
+              return unless params
+
+              params = JSON.generate(params) unless params.is_a?(String)
+              span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_PARAMS, params)
+            end
+
+            def tag_body(body, span)
+              return unless body
+
+              body = JSON.generate(body) unless body.is_a?(String)
+              quantize_options = datadog_configuration[:quantize]
+              quantized_body = Datadog::Tracing::Contrib::Elasticsearch::Quantize.format_body(
+                body,
+                quantize_options
+              )
+              span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_BODY, quantized_body)
+            end
+
+            def datadog_configuration
+              Datadog.configuration.tracing[:elasticsearch]
             end
-            # rubocop:enable Metrics/BlockLength
           end
           # rubocop:enable Metrics/MethodLength
           # rubocop:enable Metrics/AbcSize
-          # rubocop:enable Metrics/CyclomaticComplexity
-          # rubocop:enable Metrics/PerceivedComplexity
 
           # `Elasticsearch` namespace renamed to `Elastic` in version 8.0.0 of the transport gem:
           # @see https://github.com/elastic/elastic-transport-ruby/commit/ef804cbbd284f2a82d825221f87124f8b5ff823c

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

@@ -12,23 +12,26 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
-            option :distributed_tracing, default: true
+            option :distributed_tracing, default: true, type: :bool
 
-            option :split_by_domain, default: false
+            option :split_by_domain, default: false, type: :bool
 
             option :service_name do |o|
               o.default do
@@ -37,7 +40,11 @@ module Datadog
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
-              o.lazy
+            end
+
+            option :peer_service do |o|
+              o.type :string, nilable: true
+              o.env Ext::ENV_PEER_SERVICE
             end
           end
         end

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

@@ -1,5 +1,6 @@
 require 'uri'
 
+require_relative '../../../core/utils/hash'
 require_relative '../../metadata/ext'
 require_relative '../../propagation/http'
 require_relative 'ext'
@@ -58,6 +59,12 @@ module Datadog
                     set_span_error_message("Request has failed with HTTP error: #{response_code}")
                   end
                 end
+
+                @datadog_span.set_tags(
+                  Datadog.configuration.tracing.header_tags.response_tags(
+                    Core::Utils::Hash::CaseInsensitiveWrapper.new(parse_response_headers)
+                  )
+                )
               ensure
                 @datadog_span.finish
                 @datadog_span = nil
@@ -122,10 +129,13 @@ module Datadog
               method = @datadog_method.to_s if instance_variable_defined?(:@datadog_method) && !@datadog_method.nil?
               span.resource = method
 
-              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
-                # Tag as an external peer service
-                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              if datadog_configuration[:peer_service]
+                span.set_tag(
+                  Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                  datadog_configuration[:peer_service]
+                )
               end
+
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
@@ -142,6 +152,16 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, uri.host)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, uri.port)
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, uri.host)
+
+              if @datadog_original_headers
+                span.set_tags(
+                  Datadog.configuration.tracing.header_tags.request_tags(
+                    Core::Utils::Hash::CaseInsensitiveWrapper.new(@datadog_original_headers)
+                  )
+                )
+              end
+
+              Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
             end
 
             def set_span_error_message(message)
@@ -168,6 +188,26 @@ module Datadog
             def analytics_sample_rate
               datadog_configuration[:analytics_sample_rate]
             end
+
+            # `#response_headers` returns a "\n" concatenated String containing:
+            # * The HTTP Status-Line.
+            # * The response headers.
+            # * A trailing "\n".
+            #
+            # This method extracts only the headers from it.
+            def parse_response_headers
+              return {} if response_headers.empty?
+
+              lines = response_headers.split("\n")
+
+              lines = lines[1..(lines.size - 1)] # Remove Status-Line and trailing whitespace.
+
+              # Find only well-behaved HTTP headers.
+              lines.map do |line|
+                header = line.split(':', 2)
+                header.size != 2 ? nil : header
+              end.compact.to_h
+            end
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,17 +7,23 @@ module Datadog
         # Ethon integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_ETHON_ENABLED'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_ETHON_SERVICE_NAME'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ETHON_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ETHON_ANALYTICS_SAMPLE_RATE'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'ethon'.freeze
-          SPAN_REQUEST = 'ethon.request'.freeze
-          SPAN_MULTI_REQUEST = 'ethon.multi.request'.freeze
-          NOT_APPLICABLE_METHOD = 'N/A'.freeze
-          TAG_COMPONENT = 'ethon'.freeze
-          TAG_OPERATION_REQUEST = 'request'.freeze
-          TAG_OPERATION_MULTI_REQUEST = 'multi.request'.freeze
+          ENV_ENABLED = 'DD_TRACE_ETHON_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_ETHON_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_ETHON_PEER_SERVICE'
+
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ETHON_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ETHON_ANALYTICS_SAMPLE_RATE'
+          DEFAULT_PEER_SERVICE_NAME = 'ethon'
+          SPAN_REQUEST = 'ethon.request'
+          SPAN_MULTI_REQUEST = 'ethon.multi.request'
+          NOT_APPLICABLE_METHOD = 'N/A'
+          TAG_COMPONENT = 'ethon'
+          TAG_OPERATION_REQUEST = 'request'
+          TAG_OPERATION_MULTI_REQUEST = 'multi.request'
+          PEER_SERVICE_SOURCES = Array[
+            Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
+            Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
         end
       end
     end

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

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