datadog 2.17.0 → 2.37.0

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

@@ -55,59 +55,53 @@ module Datadog
                 service: service,
                 on_error: on_error
               ) 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
-
-                  # Tag original global service name if not used
-                  if span.service != Datadog.configuration.service
-                    span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                  end
-
-                  span.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
-                  # TODO: Refactor the code to streamline the execution without ensure
-                  Datadog.logger.error(e.message)
-                  Datadog::Core::Telemetry::Logger.report(e)
-                ensure
-                  # the call is still executed
-                  response = super
-
-                  if response && response.respond_to?(:status)
-                    span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
-                  end
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+                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
+
+                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 => e
+                # TODO: Refactor the code to streamline the execution without ensure
+                Datadog.logger.error("#{e.class}: #{e.message}")
+                Datadog::Core::Telemetry::Logger.report(e)
+              ensure
+                # the call is still executed
+                response = super
+
+                if response&.respond_to?(:status)
+                  span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
                 end
               end
               response

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../utils/quantization/hash'
+require_relative '../utils/quantization/hash_formatter'
 
 module Datadog
   module Tracing
@@ -27,7 +27,7 @@ module Datadog
 
           def format_body(body, options = {})
             format_body!(body, options)
-          rescue StandardError
+          rescue
             options[:placeholder] || PLACEHOLDER
           end
 
@@ -40,7 +40,7 @@ module Datadog
             # Parse each statement and quantize them.
             statements.collect do |string|
               reserialize_json(string, options[:placeholder]) do |obj|
-                Contrib::Utils::Quantization::Hash.format(obj, options)
+                Contrib::Utils::Quantization::HashFormatter.format(obj, options)
               end
             end.join("\n")
           end
@@ -50,10 +50,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/ethon/configuration/settings.rb

@@ -30,7 +30,11 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
 
             option :split_by_domain, default: false, type: :bool
 

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

@@ -57,7 +57,10 @@ module Datadog
                   set_span_error_message("Request has failed: #{message}")
                 else
                   @datadog_span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response_code)
-                  if Tracing::Metadata::Ext::HTTP::ERROR_RANGE.cover?(response_code)
+                  # DEV-3.0: This was previously checking against a 500..599 range.
+                  # To not introduce breaking change, this was changed to use `http_error_statuses.server`,
+                  # but `ethon` is a client library, this check should use `http_error_statuses.client` instead.
+                  if Datadog.configuration.tracing.http_error_statuses.server.include?(response_code)
                     set_span_error_message("Request has failed with HTTP error: #{response_code}")
                   end
                 end
@@ -97,7 +100,7 @@ module Datadog
             def datadog_before_request(continue_from: nil)
               load_datadog_configuration_for(url)
 
-              trace_options = continue_from ? { continue_from: continue_from } : {}
+              trace_options = continue_from ? {continue_from: continue_from} : {}
               uri = try_parse_uri
 
               @datadog_span = Tracing.trace(
@@ -130,6 +133,7 @@ module Datadog
 
             def datadog_tag_request
               span = @datadog_span
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               method = Ext::NOT_APPLICABLE_METHOD
               method = @datadog_method.to_s if instance_variable_defined?(:@datadog_method) && !@datadog_method.nil?
               span.resource = method
@@ -141,11 +145,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
@@ -215,7 +214,7 @@ module Datadog
               # Find only well-behaved HTTP headers.
               lines.map do |line|
                 header = line.split(':', 2)
-                header.size != 2 ? nil : header
+                (header.size != 2) ? nil : header
               end.compact.to_h
             end
           end

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

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_ETHON_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_ETHON_DISTRIBUTED_TRACING'
           ENV_SERVICE_NAME = 'DD_TRACE_ETHON_SERVICE_NAME'
           ENV_PEER_SERVICE = 'DD_TRACE_ETHON_PEER_SERVICE'
 
@@ -21,10 +22,11 @@ module Datadog
           TAG_COMPONENT = 'ethon'
           TAG_OPERATION_REQUEST = 'request'
           TAG_OPERATION_MULTI_REQUEST = 'multi.request'
-          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/ethon/integration.rb

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

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

@@ -64,19 +64,12 @@ module Datadog
               )
               @datadog_multi_trace_digest = Tracing.active_trace.to_digest
 
+              @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_MULTI_REQUEST)
 
               @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
-              # Tag original global service name if not used
-              if @datadog_multi_span.service != Datadog.configuration.service
-                @datadog_multi_span.set_tag(
-                  Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE,
-                  Datadog.configuration.service
-                )
-              end
-
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(@datadog_multi_span, analytics_sample_rate) if analytics_enabled?
 

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

@@ -33,17 +33,28 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
-
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :on_error do |o|
               o.type :proc, nilable: true
             end
 
             option :error_status_codes do |o|
               o.env Ext::ENV_ERROR_STATUS_CODES
-              o.default 400...600
-              o.setter do |v|
-                Tracing::Contrib::StatusRangeMatcher.new(v) if v
+              o.setter do |value|
+                if value.nil?
+                  # Fallback to global config, which is defaulted to client (400..499) + server (500..599)
+                  # DEV-3.0: `excon` is a client library, this should fall back to `http_error_statuses.client` only.
+                  # We cannot change it without causing a breaking change.
+                  client_global_error_statuses = Datadog.configuration.tracing.http_error_statuses.client
+                  server_global_error_statuses = Datadog.configuration.tracing.http_error_statuses.server
+                  client_global_error_statuses + server_global_error_statuses
+                else
+                  Tracing::Contrib::StatusRangeMatcher.new(value)
+                end
               end
               o.env_parser do |v|
                 Tracing::Contrib::StatusRangeEnvParser.call(v) if v

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

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_EXCON_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_EXCON_DISTRIBUTED_TRACING'
           ENV_SERVICE_NAME = 'DD_TRACE_EXCON_SERVICE_NAME'
           ENV_PEER_SERVICE = 'DD_TRACE_EXCON_PEER_SERVICE'
 
@@ -19,10 +20,11 @@ module Datadog
           SPAN_REQUEST = 'excon.request'
           TAG_COMPONENT = 'excon'
           TAG_OPERATION_REQUEST = 'request'
-          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/excon/integration.rb

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

data/lib/datadog/tracing/contrib/excon/middleware.rb

@@ -39,8 +39,8 @@ module Datadog
 
                 span
               end
-            rescue StandardError => e
-              Datadog.logger.debug(e.message)
+            rescue => e
+              Datadog.logger.debug { "#{e.class}: #{e.message}" }
             end
 
             @stack.request_call(datum)
@@ -119,6 +119,7 @@ module Datadog
           def annotate!(span, datum)
             span.resource = datum[:method].to_s.upcase
             span.service = service_name(datum[:host], @options)
+            span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
             span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
             if @options[:peer_service]
@@ -128,11 +129,6 @@ module Datadog
               )
             end
 
-            # Tag original global service name if not used
-            if span.service != Datadog.configuration.service
-              span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-            end
-
             span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
             span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
@@ -179,8 +175,8 @@ module Datadog
                 datum.delete(:datadog_span)
               end
             end
-          rescue StandardError => e
-            Datadog.logger.debug(e.message)
+          rescue => e
+            Datadog.logger.debug { "#{e.class}: #{e.message}" }
           end
 
           def propagate!(trace, span, datum)

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../metadata/ext'
+
 module Datadog
   module Tracing
     module Contrib
@@ -26,7 +28,7 @@ module Datadog
           TAG_SYSTEM = 'db.system'
           TAG_STATEMENT = 'db.statement'
           TAG_ROW_COUNT = 'db.row_count'
-          PEER_SERVICE_SOURCES = Array[TAG_INSTANCE,
+          PEER_SERVICE_SOURCES = [TAG_INSTANCE,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
@@ -36,7 +38,7 @@ module Datadog
           TAG_SYSTEM = 'rpc.system'
           TAG_SERVICE = 'rpc.service'
           TAG_METHOD = 'rpc.method'
-          PEER_SERVICE_SOURCES = Array[TAG_SERVICE,
+          PEER_SERVICE_SOURCES = [TAG_SERVICE,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
@@ -49,7 +51,7 @@ module Datadog
         module Messaging
           TAG_SYSTEM = 'messaging.system'
           TAG_DESTINATION = 'messaging.destination'
-          PEER_SERVICE_SOURCES = Array[Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
+          PEER_SERVICE_SOURCES = [Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
         end
@@ -62,7 +64,7 @@ module Datadog
           TAG_PEER_SERVICE_REMAP = '_dd.peer.service.remapped_from'
 
           # Set equal to the global service when contrib span.service is overriden
-          TAG_BASE_SERVICE = '_dd.base_service'
+          TAG_BASE_SERVICE = Tracing::Metadata::Ext::TAG_BASE_SERVICE
         end
       end
     end

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

@@ -63,17 +63,17 @@ module Datadog
           # TODO: We should promote most of this logic to core parts of datadog.
           def configure(&block)
             # Reconfigure core settings
-            super(&block)
+            super
 
             # Activate integrations
             configuration = self.configuration.tracing
 
             if configuration.respond_to?(:integrations_pending_activation)
               ignore_integration_load_errors = if configuration.respond_to?(:ignore_integration_load_errors?)
-                                                 configuration.ignore_integration_load_errors?
-                                               else
-                                                 false
-                                               end
+                configuration.ignore_integration_load_errors?
+              else
+                false
+              end
 
               configuration.integrations_pending_activation.each do |integration|
                 next unless integration.respond_to?(:patch)
@@ -85,9 +85,9 @@ module Datadog
 
                 # if patching failed, only log output if verbosity is unset
                 # or if patching failure is due to compatibility or integration specific reasons
-                next unless !ignore_integration_load_errors ||
-                  ((patch_results[:available] && patch_results[:loaded]) &&
-                  (!patch_results[:compatible] || !patch_results[:patchable]))
+                next if ignore_integration_load_errors &&
+                  (!patch_results[:available] || !patch_results[:loaded] ||
+                  (patch_results[:compatible] && patch_results[:patchable]))
 
                 desc = "Available?: #{patch_results[:available]}"
                 desc += ", Loaded? #{patch_results[:loaded]}"
@@ -208,7 +208,7 @@ module Datadog
             # @return [Datadog::Tracing::Contrib::Configuration::Settings]
             def [](integration_name, key = :default)
               integration = fetch_integration(integration_name)
-              integration.resolve(key) unless integration.nil?
+              integration&.resolve(key)
             end
 
             # @!visibility private
@@ -220,12 +220,29 @@ module Datadog
             # `@instrumented_integrations` hash.
             # @!visibility private
             def instrumented_integrations
-              INSTRUMENTED_INTEGRATIONS_LOCK.synchronize { (@instrumented_integrations&.dup || {}).freeze }
+              INSTRUMENTED_INTEGRATIONS_LOCK.synchronize do
+                (if defined?(@instrumented_integrations)
+                   @instrumented_integrations&.dup
+                 end || {}).freeze
+              end
+            end
+
+            # Returns the subset of built-in integrations that are instrumented,
+            # excluding custom integrations registered through the public contrib API.
+            # This method is only for telemetry reporting.
+            # @!visibility private
+            def instrumented_built_in_integrations
+              instrumented = Set.new(instrumented_integrations.each_value)
+              Contrib::BUILT_IN_INTEGRATIONS.select { |integration| instrumented.include?(integration) }.freeze
             end
 
             # @!visibility private
             def reset!
-              INSTRUMENTED_INTEGRATIONS_LOCK.synchronize { @instrumented_integrations&.clear }
+              INSTRUMENTED_INTEGRATIONS_LOCK.synchronize do
+                if defined?(@instrumented_integrations)
+                  @instrumented_integrations&.clear
+                end
+              end
               super
             end
 

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

@@ -13,10 +13,6 @@ module Datadog
           # Custom settings for the Faraday integration
           # @public_api
           class Settings < Contrib::Configuration::Settings
-            DEFAULT_ERROR_HANDLER = lambda do |env|
-              Tracing::Metadata::Ext::HTTP::ERROR_RANGE.cover?(env[:status])
-            end
-
             option :enabled do |o|
               o.type :bool
               o.env Ext::ENV_ENABLED
@@ -36,17 +32,28 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
-
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :on_error do |o|
               o.type :proc, nilable: true
             end
 
             option :error_status_codes do |o|
               o.env Ext::ENV_ERROR_STATUS_CODES
-              o.default 400...600
-              o.setter do |v|
-                Tracing::Contrib::StatusRangeMatcher.new(v) if v
+              o.setter do |value|
+                if value.nil?
+                  # Fallback to global config, which is defaulted to client (400..499) + server (500..599)
+                  # DEV-3.0: `faraday` is a client library, this should fall back to `http_error_statuses.client` only.
+                  # We cannot change it without causing a breaking change.
+                  client_global_error_statuses = Datadog.configuration.tracing.http_error_statuses.client
+                  server_global_error_statuses = Datadog.configuration.tracing.http_error_statuses.server
+                  client_global_error_statuses + server_global_error_statuses
+                else
+                  Tracing::Contrib::StatusRangeMatcher.new(value)
+                end
               end
               o.env_parser do |v|
                 Tracing::Contrib::StatusRangeEnvParser.call(v) if v

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

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_FARADAY_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_FARADAY_DISTRIBUTED_TRACING'
           ENV_SERVICE_NAME = 'DD_TRACE_FARADAY_SERVICE_NAME'
           ENV_PEER_SERVICE = 'DD_TRACE_FARADAY_PEER_SERVICE'
           ENV_ERROR_STATUS_CODES = 'DD_TRACE_FARADAY_ERROR_STATUS_CODES'
@@ -19,10 +20,11 @@ module Datadog
           SPAN_REQUEST = 'faraday.request'
           TAG_COMPONENT = 'faraday'
           TAG_OPERATION_REQUEST = 'request'
-          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/faraday/integration.rb

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

data/lib/datadog/tracing/contrib/faraday/middleware.rb

@@ -47,6 +47,7 @@ module Datadog
           def annotate!(span, env, options)
             span.resource = resource_name(env)
             span.service = service_name(env[:url].host, options)
+            span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
             span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
             if options[:peer_service]
@@ -56,11 +57,6 @@ module Datadog
               )
             end
 
-            # Tag original global service name if not used
-            if span.service != Datadog.configuration.service
-              span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-            end
-
             span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
             span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
@@ -82,12 +78,13 @@ module Datadog
             )
 
             Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
-          rescue StandardError => e
-            Datadog.logger.error(e.message)
+          rescue => e
+            Datadog.logger.error("#{e.class}: #{e.message}")
             Datadog::Core::Telemetry::Logger.report(e)
           end
           # rubocop:enable Metrics/AbcSize
 
+          # rubocop:disable Metrics/AbcSize
           def handle_response(span, env, options)
             span.set_error(["Error #{env[:status]}", env[:body]]) if options[:error_status_codes].include? env[:status]
 
@@ -96,10 +93,11 @@ module Datadog
             span.set_tags(
               Datadog.configuration.tracing.header_tags.response_tags(env[:response_headers])
             )
-          rescue StandardError => e
-            Datadog.logger.error(e.message)
+          rescue => e
+            Datadog.logger.error("#{e.class}: #{e.message}")
             Datadog::Core::Telemetry::Logger.report(e)
           end
+          # rubocop:enable Metrics/AbcSize
 
           def propagate!(trace, span, env)
             Contrib::HTTP.inject(trace, env[:request_headers])

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

@@ -39,9 +39,13 @@ module Datadog
 
             option :error_status_codes do |o|
               o.env Ext::ENV_ERROR_STATUS_CODES
-              o.default 500...600
-              o.setter do |v|
-                Tracing::Contrib::StatusRangeMatcher.new(v) if v
+              o.setter do |value|
+                if value.nil?
+                  # Fallback to global config, which is defaulted to server (500..599)
+                  Datadog.configuration.tracing.http_error_statuses.server
+                else
+                  Tracing::Contrib::StatusRangeMatcher.new(value)
+                end
               end
               o.env_parser do |v|
                 Tracing::Contrib::StatusRangeEnvParser.call(v) if v