datadog 2.46.0 → 2.48.0

data/lib/datadog/tracing/component.rb

@@ -21,14 +21,14 @@ module Datadog
         tracer = settings.tracing.instance
         return tracer unless tracer.nil?
 
+        sampler = build_sampler(settings)
+
         # Apply test mode settings if test mode is activated
         if settings.tracing.test_mode.enabled
           trace_flush = build_test_mode_trace_flush(settings)
-          sampler = build_test_mode_sampler
           writer = build_test_mode_writer(settings, agent_settings)
         else
           trace_flush = build_trace_flush(settings)
-          sampler = build_sampler(settings)
           writer = build_writer(settings, agent_settings)
         end
 
@@ -55,7 +55,7 @@ module Datadog
       def build_trace_flush(settings)
         if settings.tracing.partial_flush.enabled
           Tracing::Flush::Partial.new(
-            min_spans_before_partial_flush: settings.tracing.partial_flush.min_spans_threshold
+            min_spans_before_partial_flush: settings.tracing.partial_flush.min_spans_threshold,
           )
         else
           Tracing::Flush::Finished.new
@@ -76,7 +76,12 @@ module Datadog
         nil
       end
 
+      # Builds the sampler for the given settings: the sampler that keeps
+      # every trace when test mode is enabled, otherwise the sampler built
+      # from the custom sampler, sampling rules and rates.
       def build_sampler(settings)
+        return build_test_mode_sampler if settings.tracing.test_mode.enabled
+
         # A custom sampler is provided
         if (sampler = settings.tracing.sampler)
           return sampler
@@ -93,7 +98,7 @@ module Datadog
           post_sampler = Tracing::Sampling::RuleSampler.parse(
             rules,
             settings.tracing.sampling.rate_limit,
-            settings.tracing.sampling.default_rate
+            settings.tracing.sampling.default_rate,
           )
         end
 
@@ -101,12 +106,12 @@ module Datadog
         # Used if no custom sampler is provided, or if sampling rule parsing fails.
         post_sampler ||= Tracing::Sampling::RuleSampler.new(
           rate_limit: settings.tracing.sampling.rate_limit,
-          default_sample_rate: settings.tracing.sampling.default_rate
+          default_sample_rate: settings.tracing.sampling.default_rate,
         )
 
         Tracing::Sampling::PrioritySampler.new(
           base_sampler: Tracing::Sampling::AllSampler.new,
-          post_sampler: post_sampler
+          post_sampler: post_sampler,
         )
       end
 
@@ -133,14 +138,14 @@ module Datadog
         unless Transport::Native.supported?
           Datadog.logger.warn(
             "Native transport requested but not available: #{Transport::Native::UNSUPPORTED_REASON}. " \
-            "Falling back to default HTTP transport."
+            "Falling back to default HTTP transport.",
           )
           return nil
         end
 
         Transport::Native::Transport.new(
           agent_settings: agent_settings,
-          logger: Datadog.logger
+          logger: Datadog.logger,
         )
       end
 
@@ -230,7 +235,7 @@ module Datadog
       def build_rate_limit_post_sampler(seconds:)
         Tracing::Sampling::RuleSampler.new(
           rate_limiter: Datadog::Core::TokenBucket.new(1.0 / seconds, 1.0),
-          default_sample_rate: 1.0
+          default_sample_rate: 1.0,
         )
       end
 
@@ -246,7 +251,7 @@ module Datadog
         # Set priority sampler to ensure the agent doesn't drop any traces.
         Tracing::Sampling::PrioritySampler.new(
           base_sampler: Tracing::Sampling::AllSampler.new,
-          post_sampler: Tracing::Sampling::AllSampler.new
+          post_sampler: Tracing::Sampling::AllSampler.new,
         )
       end
 

data/lib/datadog/tracing/configuration/dynamic/option.rb

@@ -49,13 +49,13 @@ module Datadog
               # Restore the local configuration value
               configuration_object.unset_option(
                 @setting_key,
-                precedence: Core::Configuration::Option::Precedence::REMOTE_CONFIGURATION
+                precedence: Core::Configuration::Option::Precedence::REMOTE_CONFIGURATION,
               )
             else
               configuration_object.set_option(
                 @setting_key,
                 value,
-                precedence: Core::Configuration::Option::Precedence::REMOTE_CONFIGURATION
+                precedence: Core::Configuration::Option::Precedence::REMOTE_CONFIGURATION,
               )
             end
 

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

@@ -128,6 +128,8 @@ module Datadog
           ENV_SERVER_ERROR_STATUSES = "DD_TRACE_HTTP_SERVER_ERROR_STATUSES"
           ENV_CLIENT_ERROR_STATUSES = "DD_TRACE_HTTP_CLIENT_ERROR_STATUSES"
         end
+
+        ENV_HTTP_CLIENT_RESOURCE_NAME_QUANTIZE = "DD_TRACE_HTTP_CLIENT_RESOURCE_NAME_QUANTIZE"
       end
     end
   end

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

@@ -57,7 +57,7 @@ module Datadog
                     Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG,
                     Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT,
                     Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_BAGGAGE,
-                  ]
+                  ],
                 )
                 o.after_set do |styles|
                   # Make values case-insensitive
@@ -446,7 +446,7 @@ module Datadog
                           "Both DD_SPAN_SAMPLING_RULES and DD_SPAN_SAMPLING_RULES_FILE were provided: only " \
                             "DD_SPAN_SAMPLING_RULES will be used. Please do not provide DD_SPAN_SAMPLING_RULES_FILE when " \
                             "also providing DD_SPAN_SAMPLING_RULES as their configuration conflicts. " \
-                            "DD_SPAN_SAMPLING_RULES_FILE=#{rules_file} DD_SPAN_SAMPLING_RULES=#{rules}"
+                            "DD_SPAN_SAMPLING_RULES_FILE=#{rules_file} DD_SPAN_SAMPLING_RULES=#{rules}",
                         )
                       end
                       rules
@@ -457,7 +457,7 @@ module Datadog
                         # `File#read` errors have clear and actionable messages, no need to add extra exception info.
                         Datadog.logger.warn(
                           "Cannot read span sampling rules file `#{rules_file}`: #{e.class}: #{e.message}." \
-                          "No span sampling rules will be applied."
+                          "No span sampling rules will be applied.",
                         )
                         nil
                       end
@@ -568,6 +568,17 @@ module Datadog
                 o.default 512
               end
 
+              # Whether outbound HTTP client resource names include a quantized request path.
+              # URL tags and outgoing requests are unchanged.
+              #
+              # @default `DD_TRACE_HTTP_CLIENT_RESOURCE_NAME_QUANTIZE` environment variable, otherwise `false`.
+              # @return [Boolean]
+              option :http_client_resource_name_quantize do |o|
+                o.env Tracing::Configuration::Ext::ENV_HTTP_CLIENT_RESOURCE_NAME_QUANTIZE
+                o.default false
+                o.type :bool
+              end
+
               # HTTP error statuses configuration
               # @public_api
               settings :http_error_statuses do

data/lib/datadog/tracing/context.rb

@@ -63,7 +63,7 @@ module Datadog
 
         self.class.new(
           trace: forked_trace,
-          otel_thread_context: @otel_thread_context
+          otel_thread_context: @otel_thread_context,
         )
       end
 

data/lib/datadog/tracing/context_provider.rb

@@ -21,6 +21,14 @@ module Datadog
       def context=(ctx)
         ctx.otel_thread_context = @otel_thread_context if ctx.respond_to?(:otel_thread_context=)
 
+        if (otel_thread_context = @otel_thread_context)
+          if (trace = ctx&.active_trace)
+            otel_thread_context.update_from_trace_op(trace)
+          else
+            otel_thread_context.clear
+          end
+        end
+
         @context.local = ctx
       end
 

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

@@ -39,14 +39,14 @@ module Datadog
                   :subscribe,
                   :around,
                   ->(channel, block) { Tracer.trace(channel, :subscribe, &block) },
-                  prepend: true
+                  prepend: true,
                 )
 
                 set_callback(
                   :unsubscribe,
                   :around,
                   ->(channel, block) { Tracer.trace(channel, :unsubscribe, &block) },
-                  prepend: true
+                  prepend: true,
                 )
               end
             end

data/lib/datadog/tracing/contrib/active_job/data_streams.rb

@@ -27,7 +27,7 @@ module Datadog
               Datadog::DataStreams.set_produce_checkpoint(
                 type: Ext::TAG_COMPONENT,
                 destination: queue_name,
-                auto_instrumentation: true
+                auto_instrumentation: true,
               ) do |key, value|
                 job_data[key] = value
               end
@@ -44,10 +44,14 @@ module Datadog
             return unless Datadog::DataStreams.enabled?
 
             begin
+              # false stands in for "thread had no context", leaving nil to mean nothing to restore.
+              @datadog_pathway_context_before_job = Datadog::DataStreams.pathway_context || false
+              # A headerless job would otherwise checkpoint into, and mutate, the saved context.
+              Datadog::DataStreams.pathway_context = nil
               Datadog::DataStreams.set_consume_checkpoint(
                 type: Ext::TAG_COMPONENT,
                 source: queue_name,
-                auto_instrumentation: true
+                auto_instrumentation: true,
               ) do |key|
                 job_data[key]
               end
@@ -55,6 +59,27 @@ module Datadog
               Datadog.logger.debug { "Error setting DSM consume checkpoint: #{e.class}: #{e.message}" }
             end
           end
+
+          # Adapters run `deserialize` then `perform_now` on a pooled worker thread. Restoring the
+          # pre-job context stops the job's pathway leaking into the thread's later, unrelated work.
+          def perform_now
+            super
+          ensure
+            restore_datadog_pathway_context
+          end
+
+          private
+
+          def restore_datadog_pathway_context
+            return if @datadog_pathway_context_before_job.nil?
+
+            # `|| nil` undoes the false sentinel set in `deserialize`.
+            context_before_job = @datadog_pathway_context_before_job || nil
+            @datadog_pathway_context_before_job = nil
+            Datadog::DataStreams.pathway_context = context_before_job
+          rescue => e
+            Datadog.logger.debug { "Error restoring DSM pathway context: #{e.class}: #{e.message}" }
+          end
         end
       end
     end

data/lib/datadog/tracing/contrib/active_record/configuration/resolver.rb

@@ -76,7 +76,7 @@ module Datadog
               #
               Datadog.logger.error(
                 "Failed to resolve ActiveRecord database configuration. " \
-                "Cause: #{e.class} Source: #{Array(e.backtrace).first}"
+                "Cause: #{e.class} Source: #{Array(e.backtrace).first}",
               )
               Core::Telemetry::Logger.report(e, description: "Failed to resolve ActiveRecord database configuration")
 
@@ -96,7 +96,7 @@ module Datadog
             rescue => e
               Datadog.logger.error(
                 "Failed to resolve key #{matcher.inspect}. " \
-                "Cause: #{e.class} Source: #{Array(e.backtrace).first}"
+                "Cause: #{e.class} Source: #{Array(e.backtrace).first}",
               )
               Core::Telemetry::Logger.report(e, description: "Failed to resolve key")
 

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

@@ -36,7 +36,7 @@ module Datadog
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(
                   "",
-                  Utils.adapter_name
+                  Utils.adapter_name,
                 )
               end
             end

data/lib/datadog/tracing/contrib/active_record/utils.rb

@@ -77,7 +77,7 @@ module Datadog
               # in case.
               Datadog.logger.debug(
                 "connection_id #{connection_id} does not represent a valid object. " \
-                        "Cause: #{e.class}: #{e.message} Source: #{Array(e.backtrace).first}"
+                        "Cause: #{e.class}: #{e.message} Source: #{Array(e.backtrace).first}",
               )
             end
           else

data/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb

@@ -49,7 +49,7 @@ module Datadog
                 Ext::SPAN_CACHE,
                 type: Ext::SPAN_TYPE_CACHE,
                 service: Datadog.configuration.tracing[:active_support][:cache_service],
-                resource: action
+                resource: action,
               ) do |span|
                 span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

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

@@ -35,7 +35,7 @@ module Datadog
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(
                   "",
-                  Ext::SERVICE_CACHE
+                  Ext::SERVICE_CACHE,
                 )
               end
             end

data/lib/datadog/tracing/contrib/active_support/notifications/subscriber.rb

@@ -51,7 +51,7 @@ module Datadog
                   span_options,
                   on_start: on_start,
                   on_finish: on_finish,
-                  trace: trace
+                  trace: trace,
                 ).tap do |subscription|
                   subscription.subscribe(pattern)
                 end
@@ -65,7 +65,7 @@ module Datadog
                   span_options,
                   on_start: on_start,
                   on_finish: on_finish,
-                  trace: trace
+                  trace: trace,
                 ).tap do |subscription|
                   subscriptions << subscription
                 end

data/lib/datadog/tracing/contrib/active_support/notifications/subscription.rb

@@ -125,7 +125,7 @@ module Datadog
                 @block&.call(span, name, id, payload)
               rescue => e
                 Datadog.logger.debug(
-                  "ActiveSupport::Notifications handler for '#{name}' failed: #{e.class}: #{e.message}"
+                  "ActiveSupport::Notifications handler for '#{name}' failed: #{e.class}: #{e.message}",
                 )
               end
             end
@@ -147,7 +147,7 @@ module Datadog
                   callback.call(event, key, *args)
                 rescue => e
                   Datadog.logger.debug(
-                    "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.class}: #{e.message}"
+                    "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.class}: #{e.message}",
                   )
                 end
               end

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

@@ -36,7 +36,7 @@ module Datadog
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(
                   Ext::ENV_SERVICE_NAME,
-                  Ext::DEFAULT_PEER_SERVICE_NAME
+                  Ext::DEFAULT_PEER_SERVICE_NAME,
                 )
               end
             end

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

@@ -58,7 +58,7 @@ module Datadog
             if configuration[:peer_service]
               span.set_tag(
                 Tracing::Metadata::Ext::TAG_PEER_SERVICE,
-                configuration[:peer_service]
+                configuration[:peer_service],
               )
             end
 

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

@@ -35,7 +35,7 @@ module Datadog
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(
                   Ext::ENV_SERVICE_NAME,
-                  Ext::DEFAULT_PEER_SERVICE_NAME
+                  Ext::DEFAULT_PEER_SERVICE_NAME,
                 )
               end
             end

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

@@ -28,7 +28,7 @@ module Datadog
                 if datadog_configuration[:peer_service]
                   span.set_tag(
                     Tracing::Metadata::Ext::TAG_PEER_SERVICE,
-                    datadog_configuration[:peer_service]
+                    datadog_configuration[:peer_service],
                   )
                 end
 

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

@@ -19,7 +19,7 @@ module Datadog
               Ext::SPAN_JOB,
               service: configuration[:service_name],
               resource: job_name(job),
-              on_error: configuration[:on_error]
+              on_error: configuration[:on_error],
             ) do |span|
               span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               set_sample_rate(span)
@@ -50,7 +50,7 @@ module Datadog
             Tracing.trace(
               Ext::SPAN_ENQUEUE,
               service: configuration[:client_service_name],
-              resource: job_name(job)
+              resource: job_name(job),
             ) do |span|
               span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               set_sample_rate(span)

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

@@ -40,7 +40,7 @@ module Datadog
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(
                   Ext::ENV_SERVICE_NAME,
-                  Ext::DEFAULT_PEER_SERVICE_NAME
+                  Ext::DEFAULT_PEER_SERVICE_NAME,
                 )
               end
             end

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

@@ -53,7 +53,7 @@ module Datadog
               Tracing.trace(
                 Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_QUERY,
                 service: service,
-                on_error: on_error
+                on_error: on_error,
               ) do |span|
                 span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 connection = transport.connections.first
@@ -63,7 +63,7 @@ module Datadog
                 if datadog_configuration[:peer_service]
                   span.set_tag(
                     Tracing::Metadata::Ext::TAG_PEER_SERVICE,
-                    datadog_configuration[:peer_service]
+                    datadog_configuration[:peer_service],
                   )
                 end
 
@@ -121,7 +121,7 @@ module Datadog
               quantize_options = datadog_configuration[:quantize]
               quantized_body = Datadog::Tracing::Contrib::Elasticsearch::Quantize.format_body(
                 body,
-                quantize_options
+                quantize_options,
               )
               span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_BODY, quantized_body)
             end

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

@@ -43,7 +43,7 @@ module Datadog
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(
                   Ext::ENV_SERVICE_NAME,
-                  Ext::DEFAULT_PEER_SERVICE_NAME
+                  Ext::DEFAULT_PEER_SERVICE_NAME,
                 )
               end
             end

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

@@ -7,6 +7,7 @@ require_relative "../../metadata/ext"
 require_relative "../http"
 require_relative "ext"
 require_relative "../http_annotation_helper"
+require_relative "../utils/quantization/http"
 
 module Datadog
   module Tracing
@@ -67,8 +68,8 @@ module Datadog
 
                 @datadog_span.set_tags(
                   Datadog.configuration.tracing.header_tags.response_tags(
-                    Core::Utils::Hash::CaseInsensitiveWrapper.new(parse_response_headers)
-                  )
+                    Core::Utils::Hash::CaseInsensitiveWrapper.new(parse_response_headers),
+                  ),
                 )
               ensure
                 @datadog_span.finish
@@ -107,15 +108,15 @@ module Datadog
                 Ext::SPAN_REQUEST,
                 service: uri ? service_name(uri.host, datadog_configuration) : datadog_configuration[:service_name],
                 type: Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND,
-                **trace_options
+                **trace_options,
               )
               datadog_trace = Tracing.active_trace
 
-              datadog_tag_request
+              datadog_tag_request(uri)
 
               if Tracing::Distributed::PropagationPolicy.enabled?(
                 global_config: datadog_configuration,
-                trace: datadog_trace
+                trace: datadog_trace,
               )
                 @datadog_original_headers ||= {}
                 Contrib::HTTP.inject(datadog_trace, @datadog_original_headers)
@@ -131,17 +132,22 @@ module Datadog
 
             attr_reader :datadog_configuration
 
-            def datadog_tag_request
+            def datadog_tag_request(uri)
               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
+              path = uri&.path
+              span.resource = Contrib::Utils::Quantization::HTTP.client_resource(
+                method,
+                path,
+                enabled: Datadog.configuration.tracing.http_client_resource_name_quantize,
+              )
 
               if datadog_configuration[:peer_service]
                 span.set_tag(
                   Tracing::Metadata::Ext::TAG_PEER_SERVICE,
-                  datadog_configuration[:peer_service]
+                  datadog_configuration[:peer_service],
                 )
               end
 
@@ -153,10 +159,9 @@ module Datadog
 
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
-              uri = try_parse_uri
               return unless uri
 
-              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, uri.path)
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, path)
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, method)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, uri.host)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, uri.port)
@@ -165,8 +170,8 @@ module Datadog
               if @datadog_original_headers
                 span.set_tags(
                   Datadog.configuration.tracing.header_tags.request_tags(
-                    Core::Utils::Hash::CaseInsensitiveWrapper.new(@datadog_original_headers)
-                  )
+                    Core::Utils::Hash::CaseInsensitiveWrapper.new(@datadog_original_headers),
+                  ),
                 )
               end
 

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

@@ -60,7 +60,7 @@ module Datadog
 
               @datadog_multi_span = Tracing.trace(
                 Ext::SPAN_MULTI_REQUEST,
-                service: datadog_configuration[:service_name]
+                service: datadog_configuration[:service_name],
               )
               @datadog_multi_trace_digest = Tracing.active_trace.to_digest
 

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

@@ -68,7 +68,7 @@ module Datadog
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(
                   Ext::ENV_SERVICE_NAME,
-                  Ext::DEFAULT_PEER_SERVICE_NAME
+                  Ext::DEFAULT_PEER_SERVICE_NAME,
                 )
               end
             end

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

@@ -8,6 +8,7 @@ require_relative "../http"
 require_relative "../analytics"
 require_relative "ext"
 require_relative "../http_annotation_helper"
+require_relative "../utils/quantization/http"
 
 module Datadog
   module Tracing
@@ -32,7 +33,7 @@ module Datadog
                 annotate!(span, datum)
                 if Tracing::Distributed::PropagationPolicy.enabled?(
                   global_config: @options,
-                  trace: trace
+                  trace: trace,
                 )
                   propagate!(trace, span, datum)
                 end
@@ -117,7 +118,13 @@ module Datadog
           end
 
           def annotate!(span, datum)
-            span.resource = datum[:method].to_s.upcase
+            http_method = datum[:method].to_s.upcase
+            path = datum[:path]
+            span.resource = Contrib::Utils::Quantization::HTTP.client_resource(
+              http_method,
+              path,
+              enabled: Datadog.configuration.tracing.http_client_resource_name_quantize,
+            )
             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
@@ -125,7 +132,7 @@ module Datadog
             if @options[:peer_service]
               span.set_tag(
                 Tracing::Metadata::Ext::TAG_PEER_SERVICE,
-                @options[:peer_service]
+                @options[:peer_service],
               )
             end
 
@@ -139,14 +146,14 @@ module Datadog
             # Set analytics sample rate
             Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
-            span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, datum[:path])
-            span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, datum[:method].to_s.upcase)
+            span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, path)
+            span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, http_method)
             span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, datum[:host])
             span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, datum[:port])
             span.set_tags(
               Datadog.configuration.tracing.header_tags.request_tags(
-                Core::Utils::Hash::CaseInsensitiveWrapper.new(datum[:headers])
-              )
+                Core::Utils::Hash::CaseInsensitiveWrapper.new(datum[:headers]),
+              ),
             )
 
             Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
@@ -166,8 +173,8 @@ module Datadog
 
                   span.set_tags(
                     Datadog.configuration.tracing.header_tags.response_tags(
-                      Core::Utils::Hash::CaseInsensitiveWrapper.new(response[:headers])
-                    )
+                      Core::Utils::Hash::CaseInsensitiveWrapper.new(response[:headers]),
+                    ),
                   )
                 end
                 on_error.call(span, datum[:error]) if datum.key?(:error)

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

@@ -67,7 +67,7 @@ module Datadog
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(
                   Ext::ENV_SERVICE_NAME,
-                  Ext::DEFAULT_PEER_SERVICE_NAME
+                  Ext::DEFAULT_PEER_SERVICE_NAME,
                 )
               end
             end