datadog 2.28.0 → 2.41.0

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../analytics'
+require_relative "../analytics"
 
 module Datadog
   module Tracing
@@ -12,10 +12,11 @@ module Datadog
             trace_options = {
               service: configuration[:service_name],
               type: Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
-              on_error: configuration[:on_error]
+              on_error: configuration[:on_error],
             }
 
             Tracing.trace(Ext::SPAN_JOB, **trace_options) do |request_span|
+              request_span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               request_span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
 
               request_span.resource = job.class.name.to_s

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing
@@ -34,7 +34,7 @@ module Datadog
               o.type :string, nilable: true
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  '',
+                  "",
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../active_support/notifications/event'
-require_relative '../analytics'
-require_relative 'ext'
+require_relative "../../metadata/ext"
+require_relative "../active_support/notifications/event"
+require_relative "../analytics"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -35,6 +35,7 @@ module Datadog
 
             def on_start(span, event, _id, payload)
               span.service = configuration[:service_name]
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span.resource = payload[:consumer_class]
 
               span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_MESSAGING_SYSTEM)
@@ -48,11 +49,6 @@ module Datadog
               # Measure service stats
               Contrib::Analytics.set_measured(span)
 
-              # 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(Ext::TAG_TOPIC, payload[:topic])
               span.set_tag(Ext::TAG_CONSUMER, payload[:consumer_class])
               span.set_tag(Ext::TAG_PARTITION, payload[:partition])

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../ext'
-require_relative '../event'
+require_relative "../ext"
+require_relative "../event"
 
 module Datadog
   module Tracing
@@ -12,7 +12,7 @@ module Datadog
           module Batch
             include Racecar::Event
 
-            EVENT_NAME = 'process_batch.racecar'
+            EVENT_NAME = "process_batch.racecar"
 
             module_function
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../ext'
-require_relative '../event'
+require_relative "../ext"
+require_relative "../event"
 
 module Datadog
   module Tracing
@@ -12,7 +12,7 @@ module Datadog
           module Consume
             include Racecar::Event
 
-            EVENT_NAME = 'main_loop.racecar'
+            EVENT_NAME = "main_loop.racecar"
 
             module_function
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../ext'
-require_relative '../event'
+require_relative "../ext"
+require_relative "../event"
 
 module Datadog
   module Tracing
@@ -12,7 +12,7 @@ module Datadog
           module Message
             include Racecar::Event
 
-            EVENT_NAME = 'process_message.racecar'
+            EVENT_NAME = "process_message.racecar"
 
             module_function
 

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'events/batch'
-require_relative 'events/message'
-require_relative 'events/consume'
+require_relative "events/batch"
+require_relative "events/message"
+require_relative "events/consume"
 
 module Datadog
   module Tracing
@@ -13,7 +13,7 @@ module Datadog
           ALL = [
             Events::Consume,
             Events::Batch,
-            Events::Message
+            Events::Message,
           ].freeze
 
           module_function

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

@@ -7,25 +7,25 @@ module Datadog
         # Racecar integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_RACECAR_ENABLED'
+          ENV_ENABLED = "DD_TRACE_RACECAR_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_RACECAR_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RACECAR_ANALYTICS_SAMPLE_RATE'
-          DEFAULT_PEER_SERVICE_NAME = 'racecar'
-          SPAN_CONSUME = 'racecar.consume'
-          SPAN_BATCH = 'racecar.batch'
-          SPAN_MESSAGE = 'racecar.message'
-          TAG_CONSUMER = 'kafka.consumer'
-          TAG_FIRST_OFFSET = 'kafka.first_offset'
-          TAG_MESSAGE_COUNT = 'kafka.message_count'
-          TAG_OFFSET = 'kafka.offset'
-          TAG_PARTITION = 'kafka.partition'
-          TAG_TOPIC = 'kafka.topic'
-          TAG_COMPONENT = 'racecar'
-          TAG_OPERATION_CONSUME = 'consume'
-          TAG_OPERATION_BATCH = 'batch'
-          TAG_OPERATION_MESSAGE = 'message'
-          TAG_MESSAGING_SYSTEM = 'kafka'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_RACECAR_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_RACECAR_ANALYTICS_SAMPLE_RATE"
+          DEFAULT_PEER_SERVICE_NAME = "racecar"
+          SPAN_CONSUME = "racecar.consume"
+          SPAN_BATCH = "racecar.batch"
+          SPAN_MESSAGE = "racecar.message"
+          TAG_CONSUMER = "kafka.consumer"
+          TAG_FIRST_OFFSET = "kafka.first_offset"
+          TAG_MESSAGE_COUNT = "kafka.message_count"
+          TAG_OFFSET = "kafka.offset"
+          TAG_PARTITION = "kafka.partition"
+          TAG_TOPIC = "kafka.topic"
+          TAG_COMPONENT = "racecar"
+          TAG_OPERATION_CONSUME = "consume"
+          TAG_OPERATION_BATCH = "batch"
+          TAG_OPERATION_MESSAGE = "message"
+          TAG_MESSAGING_SYSTEM = "kafka"
         end
       end
     end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -12,13 +12,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('0.3.5')
+          MINIMUM_VERSION = Gem::Version.new("0.3.5")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :racecar, auto_patch: false
 
           def self.version
-            Gem.loaded_specs['racecar']&.version
+            Gem.loaded_specs["racecar"]&.version
           end
 
           def self.loaded?

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'ext'
-require_relative 'events'
+require_relative "../patcher"
+require_relative "ext"
+require_relative "events"
 
 module Datadog
   module Tracing

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing
@@ -15,7 +15,7 @@ module Datadog
               response: %w[
                 Content-Type
                 X-Request-ID
-              ]
+              ],
             }.freeze
 
             option :enabled do |o|
@@ -37,7 +37,11 @@ module Datadog
             end
 
             option :application
-            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 :headers, default: DEFAULT_HEADERS, type: :hash
             option :middleware_names, default: false, type: :bool
             option :quantize, default: {}, type: :hash
@@ -50,6 +54,12 @@ module Datadog
               o.type :string, nilable: true
             end
 
+            option :inferred_proxy_enabled do |o|
+              o.type :bool
+              o.env Ext::ENV_INFERRED_PROXY_ENABLED
+              o.default false
+            end
+
             option :web_service_name, default: Ext::DEFAULT_PEER_WEBSERVER_SERVICE_NAME, type: :string
           end
         end

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

@@ -7,22 +7,50 @@ module Datadog
         # Rack integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_RACK_ENABLED'
+          ENV_ENABLED = "DD_TRACE_RACK_ENABLED"
+          ENV_DISTRIBUTED_TRACING = "DD_TRACE_RACK_DISTRIBUTED_TRACING"
+          ENV_INFERRED_PROXY_ENABLED = "DD_TRACE_INFERRED_PROXY_SERVICES_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_RACK_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RACK_ANALYTICS_SAMPLE_RATE'
-          RACK_ENV_REQUEST_SPAN = 'datadog.rack_request_span'
-          SPAN_HTTP_PROXY_REQUEST = 'http.proxy.request'
-          SPAN_HTTP_PROXY_QUEUE = 'http.proxy.queue'
-          SPAN_REQUEST = 'rack.request'
-          TAG_COMPONENT = 'rack'
-          TAG_COMPONENT_HTTP_PROXY = 'http_proxy'
-          TAG_OPERATION_REQUEST = 'request'
-          TAG_OPERATION_HTTP_PROXY_REQUEST = 'request'
-          TAG_OPERATION_HTTP_PROXY_QUEUE = 'queue'
-          TAG_OPERATION_HTTP_SERVER_QUEUE = 'queue'
-          WEBSERVER_APP = 'webserver'
-          DEFAULT_PEER_WEBSERVER_SERVICE_NAME = 'web-server'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_RACK_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_RACK_ANALYTICS_SAMPLE_RATE"
+          RACK_ENV_REQUEST_SPAN = "datadog.rack_request_span"
+          SPAN_HTTP_PROXY_REQUEST = "http.proxy.request"
+          SPAN_HTTP_PROXY_QUEUE = "http.proxy.queue"
+          SPAN_REQUEST = "rack.request"
+          TAG_COMPONENT = "rack"
+          TAG_COMPONENT_HTTP_PROXY = "http_proxy"
+          TAG_OPERATION_REQUEST = "request"
+          TAG_OPERATION_HTTP_PROXY_REQUEST = "request"
+          TAG_OPERATION_HTTP_PROXY_QUEUE = "queue"
+          TAG_OPERATION_HTTP_SERVER_QUEUE = "queue"
+          WEBSERVER_APP = "webserver"
+          DEFAULT_PEER_WEBSERVER_SERVICE_NAME = "web-server"
+
+          # @!visibility private
+          HEADER_X_DD_PROXY = "HTTP_X_DD_PROXY"
+          HEADER_X_DD_PROXY_REQUEST_TIME_MS = "HTTP_X_DD_PROXY_REQUEST_TIME_MS"
+          HEADER_X_DD_PROXY_PATH = "HTTP_X_DD_PROXY_PATH"
+          HEADER_X_DD_PROXY_RESOURCE_PATH = "HTTP_X_DD_PROXY_RESOURCE_PATH"
+          HEADER_X_DD_PROXY_HTTPMETHOD = "HTTP_X_DD_PROXY_HTTPMETHOD"
+          HEADER_X_DD_PROXY_DOMAIN_NAME = "HTTP_X_DD_PROXY_DOMAIN_NAME"
+          HEADER_X_DD_PROXY_STAGE = "HTTP_X_DD_PROXY_STAGE"
+          HEADER_X_DD_PROXY_ACCOUNT_ID = "HTTP_X_DD_PROXY_ACCOUNT_ID"
+          HEADER_X_DD_PROXY_API_ID = "HTTP_X_DD_PROXY_API_ID"
+          HEADER_X_DD_PROXY_REGION = "HTTP_X_DD_PROXY_REGION"
+          HEADER_X_DD_PROXY_USER = "HTTP_X_DD_PROXY_USER"
+
+          PROXY_AWS_APIGATEWAY = "aws-apigateway"
+          PROXY_AWS_HTTPAPI = "aws-httpapi"
+
+          SPAN_AWS_APIGATEWAY = "aws.apigateway"
+          SPAN_AWS_HTTPAPI = "aws.httpapi"
+
+          PROXY_SPAN_NAMES = {
+            PROXY_AWS_APIGATEWAY => SPAN_AWS_APIGATEWAY,
+            PROXY_AWS_HTTPAPI => SPAN_AWS_HTTPAPI,
+          }.freeze
+
+          TAG_INFERRED_SPAN = "_dd.inferred_span"
         end
       end
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../core/header_collection'
+require_relative "../../../core/header_collection"
 
 module Datadog
   module Tracing
@@ -31,9 +31,9 @@ module Datadog
           end
 
           def self.to_rack_header(name)
-            key = name.to_s.upcase.gsub(/[-\s]/, '_')
+            key = name.to_s.upcase.gsub(/[-\s]/, "_")
             case key
-            when 'CONTENT_TYPE', 'CONTENT_LENGTH'
+            when "CONTENT_TYPE", "CONTENT_LENGTH"
               # NOTE: The Rack spec says:
               # > The environment must not contain the keys HTTP_CONTENT_TYPE or HTTP_CONTENT_LENGTH
               # > (use the versions without HTTP_).

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

@@ -1,11 +1,18 @@
 # frozen_string_literal: true
 
+require_relative "header_collection"
+
 module Datadog
   module Tracing
     module Contrib
       module Rack
         # Matches Rack-style headers with a matcher and sets matching headers into a span.
         module HeaderTagging
+          DATADOG_REQUEST_ATTRIBUTION_HEADERS = [
+            "x-datadog-endpoint-scan",
+            "x-datadog-security-test",
+          ].freeze
+
           def self.tag_request_headers(span, env, configuration)
             # Wrap env in a case-insensitive Rack-style accessor.
             headers = env.is_a?(Header::RequestHeaderCollection) ? env : Header::RequestHeaderCollection.new(env)
@@ -25,6 +32,7 @@ module Datadog
             end
 
             span.set_tags(tags)
+            tag_datadog_request_attribution_headers(span, headers)
           end
 
           def self.tag_response_headers(span, headers, configuration)
@@ -47,7 +55,7 @@ module Datadog
                 # Rack 2.x => { 'foo' => 'bar,baz' }
                 # Rack 3.x => { 'foo' => ['bar', 'baz'] }
                 result[header_tag] = if header_value.is_a? Array
-                  header_value.join(',')
+                  header_value.join(",")
                 else
                   header_value
                 end
@@ -56,6 +64,21 @@ module Datadog
 
             span.set_tags(tags)
           end
+
+          # Datadog-originated requests use these headers for request attribution.
+          # They are tagged independently of user-configured header tagging so
+          # downstream systems can distinguish them from regular application traffic.
+          #
+          # @api private
+          private_class_method def self.tag_datadog_request_attribution_headers(span, headers)
+            DATADOG_REQUEST_ATTRIBUTION_HEADERS.each do |header|
+              header_value = headers.get(header)
+              next unless header_value
+
+              header_tag = Tracing::Metadata::Ext::HTTP::RequestHeaders.to_tag(header)
+              span.set_tag(header_tag, header_value)
+            end
+          end
         end
       end
     end

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
-require_relative '../../../core/contrib/rails/utils'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
+require_relative "../../../core/contrib/rails/utils"
 
 module Datadog
   module Tracing
@@ -13,13 +13,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('1.1.0')
+          MINIMUM_VERSION = Gem::Version.new("1.1.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :rack, auto_patch: false
 
           def self.version
-            Gem.loaded_specs['rack']&.version
+            Gem.loaded_specs["rack"]&.version
           end
 
           def self.loaded?

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

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require 'date'
-
-require_relative '../../../core/environment/variable_helpers'
-require_relative '../../../core/remote/tie/tracing'
-require_relative '../../client_ip'
-require_relative '../../metadata/ext'
-require_relative '../http'
-require_relative '../analytics'
-require_relative '../utils/quantization/http'
-require_relative 'ext'
-require_relative 'header_collection'
-require_relative 'header_tagging'
-require_relative 'request_queue'
-require_relative 'route_inference'
-require_relative 'trace_proxy_middleware'
+require "date"
+
+require_relative "../../../core/environment/variable_helpers"
+require_relative "../../../core/remote/tie/tracing"
+require_relative "../../client_ip"
+require_relative "../../metadata/ext"
+require_relative "../http"
+require_relative "../analytics"
+require_relative "../utils/quantization/http"
+require_relative "ext"
+require_relative "header_collection"
+require_relative "header_tagging"
+require_relative "request_queue"
+require_relative "route_inference"
+require_relative "trace_proxy_middleware"
 
 module Datadog
   module Tracing
@@ -111,7 +111,7 @@ module Datadog
 
             # Since it could be mutated, it would be more accurate to fetch from the original env,
             # e.g. ActionDispatch::ShowExceptions middleware with Rails exceptions_app configuration
-            original_request_method = original_env['REQUEST_METHOD']
+            original_request_method = original_env["REQUEST_METHOD"]
 
             # request_headers is subject to filtering and configuration so we
             # get the user agent separately
@@ -123,7 +123,7 @@ module Datadog
             # 3. Nested App override trace.resource
             # 4. Fallback with verb + status, eq `GET 200`
             request_span.resource ||=
-              if configuration[:middleware_names] && env['RESPONSE_MIDDLEWARE']
+              if configuration[:middleware_names] && env["RESPONSE_MIDDLEWARE"]
                 "#{env["RESPONSE_MIDDLEWARE"]}##{original_request_method}"
               elsif trace.resource_override?
                 trace.resource
@@ -135,6 +135,7 @@ module Datadog
             # Otherwise, the getter method would delegate to its root span
             trace.resource = request_span.resource unless trace.resource_override?
 
+            request_span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
             request_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
             request_span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
             request_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_SERVER)
@@ -186,7 +187,7 @@ module Datadog
               Tracing::ClientIp.set_client_ip_tag(
                 request_span,
                 headers: request_header_collection,
-                remote_ip: env['REMOTE_ADDR']
+                remote_ip: env["REMOTE_ADDR"]
               )
             end
 
@@ -226,16 +227,16 @@ module Datadog
             return if status == 404
 
             if (last_route = trace.get_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE))
-              last_script_name = trace.get_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH) || ''
+              last_script_name = trace.get_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH) || ""
 
               # This happens when processing requests to a nested rack application,
               # when parent app is instrumented, and the nested app is not instrumented
               #
               # When resource_renaming.always_simplified_endpoint is set to true,
               # we infer the route from the full request path.
-              if last_script_name == '' && env['SCRIPT_NAME'] != '' &&
+              if last_script_name == "" && env["SCRIPT_NAME"] != "" &&
                   !Datadog.configuration.tracing.resource_renaming.always_simplified_endpoint &&
-                  (inferred_route = RouteInference.infer(env['PATH_INFO']))
+                  (inferred_route = RouteInference.infer(env["PATH_INFO"]))
                 set_endpoint_tag(request_span, last_route + inferred_route)
               end
 
@@ -267,7 +268,9 @@ module Datadog
             #   1. resource renaming is enabled
             #   2. AppSec is enabled and resource renaming is disabled (by default, not explicitly)
             if Datadog.configuration.tracing.resource_renaming.enabled ||
-                Datadog.configuration.appsec.enabled && Datadog.configuration.tracing.resource_renaming.options[:enabled].default_precedence?
+                Datadog.configuration.respond_to?(:appsec) &&
+                    Datadog.configuration.appsec&.enabled &&
+                    Datadog.configuration.tracing.resource_renaming.options[:enabled].default_precedence?
               request_span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ENDPOINT, value)
             end
           end
@@ -301,10 +304,10 @@ module Datadog
             # SCRIPT_NAME is the first part of the request URL path, so that
             # the application can know its virtual location. It should be
             # prepended to PATH_INFO to reflect the correct user visible path.
-            request_uri = env['REQUEST_URI'].to_s
+            request_uri = env["REQUEST_URI"].to_s
             fullpath = if request_uri.empty?
-              query_string = original_env['QUERY_STRING'].to_s
-              path = original_env['SCRIPT_NAME'].to_s + original_env['PATH_INFO'].to_s
+              query_string = original_env["QUERY_STRING"].to_s
+              path = original_env["SCRIPT_NAME"].to_s + original_env["PATH_INFO"].to_s
 
               query_string.empty? ? path : "#{path}?#{query_string}"
             else

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

@@ -16,7 +16,7 @@ module Datadog
 
           def patch
             # Patch middleware
-            require_relative 'middlewares'
+            require_relative "middlewares"
           end
         end
 
@@ -41,7 +41,7 @@ module Datadog
             # context of middleware patching outside a Rails server process (eg. a
             # process that doesn't serve HTTP requests but has Rails environment
             # loaded such as a Resque master process)
-            Datadog.logger.debug("Error patching middleware stack: #{e}")
+            Datadog.logger.debug("Error patching middleware stack: #{e.class}: #{e.message}")
           end
 
           def retain_middleware_name(middleware)
@@ -51,12 +51,12 @@ module Datadog
               alias_method :__call, :call
 
               def call(env)
-                env['RESPONSE_MIDDLEWARE'] = self.class.to_s
+                env["RESPONSE_MIDDLEWARE"] = self.class.to_s
                 __call(env)
               end
             end
 
-            following = (middleware.instance_variable_get('@app') if middleware.instance_variable_defined?('@app'))
+            following = (middleware.instance_variable_get(:@app) if middleware.instance_variable_defined?(:@app))
 
             retain_middleware_name(following)
           end
@@ -70,7 +70,7 @@ module Datadog
         module Patcher
           PATCHERS = [
             MiddlewarePatcher,
-            MiddlewareNamePatcher
+            MiddlewareNamePatcher,
           ].freeze
 
           module_function

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

@@ -11,8 +11,8 @@ module Datadog
         # such proxy before the request made it to the Ruby
         # process.
         module QueueTime
-          REQUEST_START = 'HTTP_X_REQUEST_START'
-          QUEUE_START = 'HTTP_X_QUEUE_START'
+          REQUEST_START = "HTTP_X_REQUEST_START"
+          QUEUE_START = "HTTP_X_QUEUE_START"
           MINIMUM_ACCEPTABLE_TIME_VALUE = 1_000_000_000
 
           module_function
@@ -25,7 +25,7 @@ module Datadog
             # apache header is microseconds in the format "t=1570633834463123"
             # heroku header is milliseconds in the format "1570634024294"
             # @see https://github.com/heroku/vegur/blob/65d168f757e0ddb448f41cfb9e4b0281c747378d/README.md?plain=1#L383-L384
-            time_string = header.to_s.delete('^0-9')
+            time_string = header.to_s.delete("^0-9")
             return if time_string.nil?
 
             # Return nil if the time is clearly invalid
@@ -39,7 +39,7 @@ module Datadog
           rescue => e
             # in case of an Exception we don't create a
             # `request.queuing` span
-            Datadog.logger.debug("[rack] unable to parse request queue headers: #{e}")
+            Datadog.logger.debug("[rack] unable to parse request queue headers: #{e.class}: #{e.message}")
             nil
           end
         end