ddtrace 1.12.1 → 1.14.0

data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb

@@ -4,6 +4,7 @@ require_relative '../distributed/propagation'
 require_relative '../../analytics'
 require_relative '../ext'
 require_relative '../../ext'
+require_relative '../formatting'
 
 module Datadog
   module Tracing
@@ -17,11 +18,12 @@ module Datadog
           # its tracing context with a parent client-side context
           class Server < Base
             def trace(keywords)
-              method = keywords[:method]
+              formatter = GRPC::Formatting::MethodObjectFormatter.new(keywords[:method])
+
               options = {
                 span_type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
                 service: service_name, # TODO: Remove server-side service name configuration
-                resource: format_resource(method),
+                resource: formatter.resource_name,
                 on_error: error_handler
               }
               metadata = keywords[:call].metadata
@@ -29,13 +31,18 @@ module Datadog
               set_distributed_context!(metadata)
 
               Tracing.trace(Ext::SPAN_SERVICE, **options) do |span|
-                span.set_tag(Contrib::Ext::RPC::TAG_SYSTEM, Ext::TAG_SYSTEM)
-                span.set_tag(Contrib::Ext::RPC::TAG_SERVICE, method.owner.to_s)
-                span.set_tag(Contrib::Ext::RPC::TAG_METHOD,  method.name)
+                annotate!(span, metadata, formatter)
 
-                annotate!(span, metadata)
+                begin
+                  yield
+                rescue StandardError => e
+                  code = e.is_a?(::GRPC::BadStatus) ? e.code : ::GRPC::Core::StatusCodes::UNKNOWN
+                  span.set_tag(Contrib::Ext::RPC::GRPC::TAG_STATUS_CODE, code)
 
-                yield
+                  raise
+                else
+                  span.set_tag(Contrib::Ext::RPC::GRPC::TAG_STATUS_CODE, ::GRPC::Core::StatusCodes::OK)
+                end
               end
             end
 
@@ -49,7 +56,7 @@ module Datadog
               )
             end
 
-            def annotate!(span, metadata)
+            def annotate!(span, metadata, formatter)
               metadata.each do |header, value|
                 # Datadog propagation headers are considered internal implementation detail.
                 next if header.to_s.start_with?(Tracing::Distributed::Datadog::TAGS_PREFIX)
@@ -58,27 +65,21 @@ module Datadog
               end
 
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_SERVER)
-
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SERVICE)
 
+              span.set_tag(Contrib::Ext::RPC::TAG_SYSTEM, Ext::TAG_SYSTEM)
+              span.set_tag(Contrib::Ext::RPC::TAG_SERVICE, formatter.legacy_grpc_service)
+              span.set_tag(Contrib::Ext::RPC::TAG_METHOD, formatter.legacy_grpc_method)
+              span.set_tag(Contrib::Ext::RPC::GRPC::TAG_FULL_METHOD, formatter.grpc_full_method)
+
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
               # Measure service stats
               Contrib::Analytics.set_measured(span)
             rescue StandardError => e
-              Datadog.logger.debug("GRPC client trace failed: #{e}")
-            end
-
-            def format_resource(proto_method)
-              proto_method
-                .owner
-                .to_s
-                .downcase
-                .split('::')
-                .<<(proto_method.name)
-                .join('.')
+              Datadog.logger.debug("GRPC server trace failed: #{e}")
             end
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,19 +7,20 @@ module Datadog
         # gRPC integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_GRPC_ENABLED'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_GRPC_SERVICE_NAME'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_GRPC_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_GRPC_ANALYTICS_SAMPLE_RATE'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'grpc'.freeze
-          SPAN_CLIENT = 'grpc.client'.freeze
-          SPAN_SERVICE = 'grpc.service'.freeze
-          TAG_CLIENT_DEADLINE = 'grpc.client.deadline'.freeze
-          TAG_COMPONENT = 'grpc'.freeze
-          TAG_OPERATION_CLIENT = 'client'.freeze
-          TAG_OPERATION_SERVICE = 'service'.freeze
-
-          TAG_SYSTEM = 'grpc'.freeze
+          ENV_ENABLED = 'DD_TRACE_GRPC_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_GRPC_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_GRPC_PEER_SERVICE'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_GRPC_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_GRPC_ANALYTICS_SAMPLE_RATE'
+          DEFAULT_PEER_SERVICE_NAME = 'grpc'
+          SPAN_CLIENT = 'grpc.client'
+          SPAN_SERVICE = 'grpc.service'
+          TAG_CLIENT_DEADLINE = 'grpc.client.deadline'
+          TAG_COMPONENT = 'grpc'
+          TAG_OPERATION_CLIENT = 'client'
+          TAG_OPERATION_SERVICE = 'service'
+          TAG_SYSTEM = 'grpc'
+          PEER_SERVICE_SOURCES = Contrib::Ext::RPC::PEER_SERVICE_SOURCES.freeze
         end
       end
     end

data/lib/datadog/tracing/contrib/grpc/formatting.rb

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Tracing
+    module Contrib
+      module GRPC
+        module Formatting
+          VALUE_UNKNOWN = 'unknown'
+
+          # A class to extract GRPC span attributes from the GRPC implementing class method object.
+          class MethodObjectFormatter
+            # grpc_full_method is a string containing all the rpc method information (from the Protobuf definition)
+            # in a single string with the following format: /$package.$service/$method
+            attr_reader :grpc_full_method
+
+            # legacy_grpc_service is built using the Ruby GRPC service implementation package and class name instead
+            # of the rpc interface representation from Protobuf. It's kept for compatibility.
+            attr_reader :legacy_grpc_service
+
+            # legacy_grpc_method is built using the Ruby GRPC service implementation method name instead of the rpc
+            # interface representation from Protobuf. It's kept for compatibility.
+            attr_reader :legacy_grpc_method
+
+            # resource_name is used for the span resource name.
+            attr_reader :resource_name
+
+            def initialize(grpc_method_object)
+              @grpc_full_method = format_full_method(grpc_method_object)
+              @resource_name = format_resource_name(grpc_method_object)
+              @legacy_grpc_method = extract_legacy_grpc_method(grpc_method_object)
+              @legacy_grpc_service = extract_legacy_grpc_service(grpc_method_object)
+            end
+
+            private
+
+            def format_full_method(grpc_method_object)
+              service = extract_grpc_service(grpc_method_object)
+              method = extract_grpc_method(grpc_method_object)
+              "/#{service}/#{method}"
+            end
+
+            def extract_grpc_service(grpc_method_object)
+              owner = grpc_method_object.owner
+              return VALUE_UNKNOWN unless owner.instance_variable_defined?(:@service_name)
+
+              # Ruby protoc generated code includes this variable which directly contains the value from the original
+              # protobuf definition
+              owner.service_name.to_s
+            end
+
+            # extract_grpc_method attempts to find the original method name from the Protobuf file definition,
+            # since grpc gem forces the implementation method name to be in snake_case.
+            def extract_grpc_method(grpc_method_object)
+              owner = grpc_method_object.owner
+
+              return VALUE_UNKNOWN unless owner.instance_variable_defined?(:@rpc_descs)
+
+              method, = owner.rpc_descs.find do |k, _|
+                ::GRPC::GenericService.underscore(k.to_s) == grpc_method_object.name.to_s
+              end
+
+              return VALUE_UNKNOWN if method.nil?
+
+              method.to_s
+            end
+
+            def extract_legacy_grpc_service(grpc_method_object)
+              grpc_method_object.owner.to_s
+            end
+
+            def extract_legacy_grpc_method(grpc_method_object)
+              grpc_method_object.name
+            end
+
+            def format_resource_name(grpc_method_object)
+              grpc_method_object
+                .owner
+                .to_s
+                .downcase
+                .split('::')
+                .<<(grpc_method_object.name)
+                .join('.')
+            end
+          end
+
+          # A class to extract GRPC span attributes from the full method string.
+          class FullMethodStringFormatter
+            # grpc_full_method is a string containing all the rpc method information (from the Protobuf definition)
+            # in a single string with the following format: /$package.$service/$method
+            attr_reader :grpc_full_method
+
+            # resource_name is used for the span resource name.
+            attr_reader :resource_name
+
+            # rpc_service represents the $package.$service part of the grpc_full_method string.
+            attr_reader :rpc_service
+
+            def initialize(grpc_full_method)
+              @grpc_full_method = grpc_full_method
+              @resource_name = format_resource_name(grpc_full_method)
+              @rpc_service = extract_grpc_service(grpc_full_method)
+            end
+
+            private
+
+            def format_resource_name(grpc_full_method)
+              grpc_full_method
+                .downcase
+                .split('/')
+                .reject(&:empty?)
+                .join('.')
+            end
+
+            def extract_grpc_service(grpc_full_method)
+              parts = grpc_full_method.split('/')
+              if parts.length < 3
+                ''
+              else
+                parts[1]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,8 +11,9 @@ module Datadog
           # Configuration for Hanami instrumentation
           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
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,16 +7,16 @@ module Datadog
         # Hanami integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_HANAMI_ENABLED'.freeze
+          ENV_ENABLED = 'DD_TRACE_HANAMI_ENABLED'
 
-          SPAN_ACTION =  'hanami.action'.freeze
-          SPAN_ROUTING = 'hanami.routing'.freeze
-          SPAN_RENDER =  'hanami.render'.freeze
+          SPAN_ACTION =  'hanami.action'
+          SPAN_ROUTING = 'hanami.routing'
+          SPAN_RENDER =  'hanami.render'
 
-          TAG_COMPONENT = 'hanami'.freeze
-          TAG_OPERATION_ACTION = 'action'.freeze
-          TAG_OPERATION_ROUTING = 'routing'.freeze
-          TAG_OPERATION_RENDER = 'render'.freeze
+          TAG_COMPONENT = 'hanami'
+          TAG_OPERATION_ACTION = 'action'
+          TAG_OPERATION_ROUTING = 'routing'
+          TAG_OPERATION_RENDER = 'render'
         end
       end
     end

data/lib/datadog/tracing/contrib/http/circuit_breaker.rb

@@ -10,7 +10,7 @@ module Datadog
         # For avoiding recursive traces.
         module CircuitBreaker
           def should_skip_tracing?(request)
-            return true if datadog_http_request?(request)
+            return true if internal_request?(request)
 
             # we don't want a "shotgun" effect with two nested traces for one
             # logical get, and request is likely to call itself recursively
@@ -23,12 +23,9 @@ module Datadog
           # We don't want to trace our own call to the API (they use net/http)
           # TODO: We don't want this kind of soft-check on HTTP requests.
           #       Remove this when transport implements its own "skip tracing" mechanism.
-          def datadog_http_request?(request)
-            if request[Datadog::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION]
-              true
-            else
-              false
-            end
+          def internal_request?(request)
+            !!(request[Datadog::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION] ||
+              request[Transport::Ext::HTTP::HEADER_DD_INTERNAL_UNTRACED_REQUEST])
           end
 
           def should_skip_distributed_tracing?(client_config)

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

@@ -12,21 +12,24 @@ 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 :service_name do |o|
               o.default do
@@ -35,15 +38,34 @@ module Datadog
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
-              o.lazy
             end
 
             option :error_status_codes do |o|
-              o.default { env_to_list(Ext::ENV_ERROR_STATUS_CODES, 400...600, comma_separated_only: false) }
-              o.lazy
+              o.env Ext::ENV_ERROR_STATUS_CODES
+              o.default 400...600
+              o.env_parser do |value|
+                values = if value.include?(',')
+                           value.split(',')
+                         else
+                           value.split
+                         end
+                values.map! do |v|
+                  v.gsub!(/\A[\s,]*|[\s,]*\Z/, '')
+
+                  v.empty? ? nil : v
+                end
+
+                values.compact!
+                values
+              end
+            end
+
+            option :peer_service do |o|
+              o.type :string, nilable: true
+              o.env Ext::ENV_PEER_SERVICE
             end
 
-            option :split_by_domain, default: false
+            option :split_by_domain, default: false, type: :bool
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,15 +7,20 @@ module Datadog
         # HTTP integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_HTTP_ENABLED'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_NET_HTTP_SERVICE_NAME'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_HTTP_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_HTTP_ANALYTICS_SAMPLE_RATE'.freeze
-          ENV_ERROR_STATUS_CODES = 'DD_TRACE_HTTP_ERROR_STATUS_CODES'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'net/http'.freeze
-          SPAN_REQUEST = 'http.request'.freeze
-          TAG_COMPONENT = 'net/http'.freeze
-          TAG_OPERATION_REQUEST = 'request'.freeze
+          ENV_ENABLED = 'DD_TRACE_HTTP_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_NET_HTTP_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_NET_HTTP_PEER_SERVICE'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_HTTP_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_HTTP_ANALYTICS_SAMPLE_RATE'
+          ENV_ERROR_STATUS_CODES = 'DD_TRACE_HTTP_ERROR_STATUS_CODES'
+          DEFAULT_PEER_SERVICE_NAME = 'net/http'
+          SPAN_REQUEST = 'http.request'
+          TAG_COMPONENT = 'net/http'
+          TAG_OPERATION_REQUEST = '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/http/instrumentation.rb

@@ -3,6 +3,7 @@ require 'uri'
 require_relative '../../metadata/ext'
 require_relative '../analytics'
 require_relative '../http_annotation_helper'
+require_relative '../utils/quantization/http'
 
 module Datadog
   module Tracing
@@ -68,27 +69,37 @@ module Datadog
             end
 
             def annotate_span_with_request!(span, request, request_options)
+              if request_options[:peer_service]
+                span.set_tag(
+                  Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                  request_options[: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_REQUEST)
-
-              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, request.path)
+              span.set_tag(
+                Tracing::Metadata::Ext::HTTP::TAG_URL,
+                Contrib::Utils::Quantization::HTTP.url(request.path, { query: { exclude: :all } })
+              )
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, request.method)
 
               host, port = host_and_port(request)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, host)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, port.to_s)
 
-              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
-                # Tag as an external peer service
-                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host)
 
               # Set analytics sample rate
               set_analytics_sample_rate(span, request_options)
+
+              span.set_tags(
+                Datadog.configuration.tracing.header_tags.request_tags(request)
+              )
+
+              Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
             end
 
             def annotate_span_with_response!(span, response, request_options)
@@ -97,6 +108,10 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.code)
 
               span.set_error(response) if request_options[:error_status_codes].include? response.code.to_i
+
+              span.set_tags(
+                Datadog.configuration.tracing.header_tags.response_tags(response)
+              )
             end
 
             def annotate_span_with_error!(span, error)

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

@@ -12,21 +12,24 @@ 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 :service_name do |o|
               o.default do
@@ -35,15 +38,34 @@ module Datadog
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
-              o.lazy
             end
 
             option :error_status_codes do |o|
-              o.default { env_to_list(Ext::ENV_ERROR_STATUS_CODES, 400...600, comma_separated_only: false) }
-              o.lazy
+              o.env Ext::ENV_ERROR_STATUS_CODES
+              o.default 400...600
+              o.env_parser do |value|
+                values = if value.include?(',')
+                           value.split(',')
+                         else
+                           value.split
+                         end
+                values.map! do |v|
+                  v.gsub!(/\A[\s,]*|[\s,]*\Z/, '')
+
+                  v.empty? ? nil : v
+                end
+
+                values.compact!
+                values
+              end
+            end
+
+            option :peer_service do |o|
+              o.type :string, nilable: true
+              o.env Ext::ENV_PEER_SERVICE
             end
 
-            option :split_by_domain, default: false
+            option :split_by_domain, default: false, type: :bool
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,15 +7,21 @@ module Datadog
         # Httpclient integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_HTTPCLIENT_ENABLED'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_HTTPCLIENT_SERVICE_NAME'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_HTTPCLIENT_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_HTTPCLIENT_ANALYTICS_SAMPLE_RATE'.freeze
-          ENV_ERROR_STATUS_CODES = 'DD_TRACE_HTTPCLIENT_ERROR_STATUS_CODES'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'httpclient'.freeze
-          SPAN_REQUEST = 'httpclient.request'.freeze
-          TAG_COMPONENT = 'httpclient'.freeze
-          TAG_OPERATION_REQUEST = 'request'.freeze
+          ENV_ENABLED = 'DD_TRACE_HTTPCLIENT_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_HTTPCLIENT_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_HTTPCLIENT_PEER_SERVICE'
+
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_HTTPCLIENT_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_HTTPCLIENT_ANALYTICS_SAMPLE_RATE'
+          ENV_ERROR_STATUS_CODES = 'DD_TRACE_HTTPCLIENT_ERROR_STATUS_CODES'
+          DEFAULT_PEER_SERVICE_NAME = 'httpclient'
+          SPAN_REQUEST = 'httpclient.request'
+          TAG_COMPONENT = 'httpclient'
+          TAG_OPERATION_REQUEST = '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/httpclient/instrumentation.rb

@@ -51,6 +51,13 @@ module Datadog
             def annotate_span_with_request!(span, req, req_options)
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
+              if req_options[:peer_service]
+                span.set_tag(
+                  Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                  req_options[:peer_service]
+                )
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 
@@ -63,14 +70,15 @@ 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)
 
-              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
-                # Tag as an external peer service
-                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, uri.host)
 
               set_analytics_sample_rate(span, req_options)
+
+              span.set_tags(
+                Datadog.configuration.tracing.header_tags.request_tags(req.http_header)
+              )
+
+              Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
             end
 
             def annotate_span_with_response!(span, response, request_options)
@@ -81,6 +89,10 @@ module Datadog
               if request_options[:error_status_codes].include? response.code.to_i
                 span.set_error(["Error #{response.status}", response.body])
               end
+
+              span.set_tags(
+                Datadog.configuration.tracing.header_tags.response_tags(response.header)
+              )
             end
 
             def annotate_span_with_error!(span, error)