datadog 2.28.0 → 2.41.0

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../../../ruby_version"
+
 module Datadog
   module Tracing
     module Contrib
@@ -15,37 +17,49 @@ module Datadog
           HEX_ID_PARAM_REGEX = /\A(?=.*\d)[A-Fa-f0-9._-]{6,}\z/.freeze
           STRING_PARAM_REGEX = /\A.{20,}|.*[%&'()*+,:=@].*\z/.freeze
 
-          DATADOG_INFERRED_ROUTE_ENV_KEY = 'datadog.inferred_route'
+          DATADOG_INFERRED_ROUTE_ENV_KEY = "datadog.inferred_route"
 
           module_function
 
           def read_or_infer(request_env)
             request_env[DATADOG_INFERRED_ROUTE_ENV_KEY] ||=
-              infer(request_env['SCRIPT_NAME'].to_s + request_env['PATH_INFO'].to_s)
+              infer(request_env["SCRIPT_NAME"].to_s + request_env["PATH_INFO"].to_s)
           end
 
           def infer(path)
-            segments = path.delete_prefix('/').split('/', MAX_NUMBER_OF_SEGMENTS + 1).first(MAX_NUMBER_OF_SEGMENTS)
+            count = 0
+            result = []
 
-            segments.map! do |segment| #: Array[String?]
+            split(path, "/") do |segment|
               next if segment.empty?
+              break if count >= MAX_NUMBER_OF_SEGMENTS
+              count += 1
 
-              case segment
-              when INT_PARAM_REGEX then '{param:int}'
-              when INT_ID_PARAM_REGEX then '{param:int_id}'
-              when HEX_PARAM_REGEX then '{param:hex}'
-              when HEX_ID_PARAM_REGEX then '{param:hex_id}'
-              when STRING_PARAM_REGEX then '{param:str}'
+              result << case segment
+              when INT_PARAM_REGEX then "{param:int}"
+              when INT_ID_PARAM_REGEX then "{param:int_id}"
+              when HEX_PARAM_REGEX then "{param:hex}"
+              when HEX_ID_PARAM_REGEX then "{param:hex_id}"
+              when STRING_PARAM_REGEX then "{param:str}"
               else segment
               end
             end
 
-            segments.compact! #: Array[String]
-
-            "/#{segments.join("/")}"
+            result.empty? ? "/" : "/#{result.join("/")}"
           rescue
             nil
           end
+
+          if RubyVersion.is?(">= 2.6")
+            def split(path, pattern = nil, &block)
+              path.split(pattern, &block)
+            end
+          else
+            def split(path, pattern = nil, &block)
+              path.split(pattern).each(&block)
+              path
+            end
+          end
         end
       end
     end

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
-require_relative 'request_queue'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "request_queue"
 
 module Datadog
   module Tracing
@@ -13,7 +13,11 @@ module Datadog
         module TraceProxyMiddleware
           module_function
 
-          def call(env, configuration)
+          def call(env, configuration, &block)
+            if configuration[:inferred_proxy_enabled] &&
+                (proxy_type = env[Ext::HEADER_X_DD_PROXY]) && !proxy_type.empty?
+              return call_with_inferred_proxy(env, proxy_type, &block)
+            end
             return yield unless configuration[:request_queuing]
 
             # parse the request queue time
@@ -23,17 +27,19 @@ module Datadog
             options = {
               service: configuration[:web_service_name],
               start_time: start_time,
-              type: Tracing::Metadata::Ext::HTTP::TYPE_PROXY
+              type: Tracing::Metadata::Ext::HTTP::TYPE_PROXY,
             }
 
             request_span = Tracing.trace(Ext::SPAN_HTTP_PROXY_REQUEST, **options)
 
+            request_span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT_HTTP_PROXY)
             request_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT_HTTP_PROXY)
             request_span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_HTTP_PROXY_REQUEST)
             request_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_PROXY)
 
             queue_span = Tracing.trace(Ext::SPAN_HTTP_PROXY_QUEUE, **options)
 
+            queue_span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT_HTTP_PROXY)
             queue_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT_HTTP_PROXY)
             queue_span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_HTTP_PROXY_QUEUE)
             queue_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_PROXY)
@@ -51,6 +57,118 @@ module Datadog
             queue_span&.finish
             request_span&.finish
           end
+
+          # Creates a virtual parent span representing the upstream proxy
+          # that wraps the actual request processing.
+          #
+          # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          def call_with_inferred_proxy(env, proxy_type)
+            span_name = Ext::PROXY_SPAN_NAMES[proxy_type]
+            return yield unless span_name
+
+            request_time_ms = env[Ext::HEADER_X_DD_PROXY_REQUEST_TIME_MS].to_f
+            return yield unless request_time_ms.positive?
+
+            path = env[Ext::HEADER_X_DD_PROXY_PATH]
+            stage = env[Ext::HEADER_X_DD_PROXY_STAGE]
+            domain = env[Ext::HEADER_X_DD_PROXY_DOMAIN_NAME]
+            http_method = env[Ext::HEADER_X_DD_PROXY_HTTPMETHOD]
+            resource_path = env[Ext::HEADER_X_DD_PROXY_RESOURCE_PATH]
+
+            # NOTE: resource_path is the parameterized route (e.g. /users/{id}) vs literal path
+            resource = "#{http_method} #{resource_path || path}" if http_method
+
+            inferred_span = Tracing.trace(
+              span_name,
+              service: domain,
+              type: Tracing::Metadata::Ext::AppTypes::TYPE_WEB,
+              start_time: Time.at(request_time_ms / 1_000),
+            )
+            inferred_span.resource = resource if resource
+            inferred_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, proxy_type)
+            inferred_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_SERVER)
+            inferred_span.set_tag("stage", stage) if stage
+            inferred_span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, http_method) if http_method
+            inferred_span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, "https://#{domain}#{path}") if domain && path
+            inferred_span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE, resource_path) if resource_path
+            inferred_span.set_metric(Ext::TAG_INFERRED_SPAN, 1)
+
+            set_optional_tags(inferred_span, env: env, proxy_type: proxy_type)
+
+            yield
+          # NOTE: The underlying {Rack::TraceMiddleware} rescues {Exception}
+          #       to tag the request span with error details.
+          #       We must propagate errors to the inferred proxy parent span.
+          rescue Exception => e # rubocop:disable Lint/RescueException
+            inferred_span&.set_error(e)
+            raise
+          ensure
+            if inferred_span
+              propagate_request_span_tags(inferred_span, env: env)
+
+              if (trace = Tracing.active_trace) && resource
+                trace.resource = resource
+              end
+
+              inferred_span.finish
+            end
+          end
+          # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+          # Sets cloud provider metadata and constructs the resource ARN.
+          #
+          # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          def set_optional_tags(span, env:, proxy_type:)
+            api_id = env[Ext::HEADER_X_DD_PROXY_API_ID]
+            region = env[Ext::HEADER_X_DD_PROXY_REGION]
+
+            # API Gateway v1 sends region as a single-quoted string
+            region = region.delete("'") if region
+
+            span.set_tag("apiid", api_id) if api_id
+            span.set_tag("region", region) if region
+
+            if (account_id = env[Ext::HEADER_X_DD_PROXY_ACCOUNT_ID])
+              span.set_tag("account_id", account_id)
+            end
+
+            if (user = env[Ext::HEADER_X_DD_PROXY_USER])
+              span.set_tag("aws_user", user)
+            end
+
+            if api_id && region
+              # NOTE: Update this when adding non-AWS proxy types.
+              restapi_prefix = (proxy_type == Ext::PROXY_AWS_APIGATEWAY) ? "restapis" : "apis"
+              span.set_tag("dd_resource_key", "arn:aws:apigateway:#{region}::/#{restapi_prefix}/#{api_id}")
+            end
+          end
+          # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+          # Propagates response-level and security tags from the request span to
+          # the inferred parent.
+          def propagate_request_span_tags(span, env:)
+            rack_span = env[Ext::RACK_ENV_REQUEST_SPAN]
+            return unless rack_span
+
+            if (status_code = rack_span.get_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE))
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, status_code)
+              span.status = rack_span.status
+            end
+
+            if (user_agent = rack_span.get_tag(Tracing::Metadata::Ext::HTTP::TAG_USER_AGENT))
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_USER_AGENT, user_agent)
+            end
+
+            # NOTE: Tracing shouldn't know about AppSec tags.
+            if (appsec_enabled = rack_span.get_metric("_dd.appsec.enabled"))
+              span.set_metric("_dd.appsec.enabled", appsec_enabled)
+            end
+
+            # NOTE: Tracing shouldn't know about AppSec tags.
+            if (appsec_json = rack_span.get_tag("_dd.appsec.json"))
+              span.set_tag("_dd.appsec.json", appsec_json)
+            end
+          end
         end
       end
     end

data/lib/datadog/tracing/contrib/rails/auto_instrument_railtie.rb

@@ -4,7 +4,7 @@
 class DatadogAutoInstrumentRailtie < Rails::Railtie
   # we want to load before config initializers so that any user supplied config
   # in config/initializers/datadog.rb will take precedence
-  initializer 'datadog.start_tracer', before: :load_config_initializers do
+  initializer "datadog.start_tracer", before: :load_config_initializers do
     Datadog::Tracing::Contrib::AutoInstrument.patch_all!
   end
 end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
+require_relative "../../configuration/settings"
 
-require_relative '../../../../core'
+require_relative "../../../../core"
 
 module Datadog
   module Tracing
@@ -51,8 +51,11 @@ module Datadog
               end
             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 :request_queuing do |o|
               o.type :bool
               o.default false
@@ -62,7 +65,7 @@ module Datadog
             option :middleware_names, default: false, type: :bool
             option :template_base_path do |o|
               o.type :string
-              o.default 'views/'
+              o.default "views/"
               o.after_set do |value|
                 # Update ActionView template base path too
                 Datadog.configuration.tracing[:action_view][:template_base_path] = value

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

@@ -7,25 +7,26 @@ module Datadog
         # Rails integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          APP = 'rails'
-          ENV_ENABLED = 'DD_TRACE_RAILS_ENABLED'
+          APP = "rails"
+          ENV_ENABLED = "DD_TRACE_RAILS_ENABLED"
+          ENV_DISTRIBUTED_TRACING = "DD_TRACE_RAILS_DISTRIBUTED_TRACING"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_RAILS_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RAILS_ANALYTICS_SAMPLE_RATE'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_RAILS_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_RAILS_ANALYTICS_SAMPLE_RATE"
           # Note: Alias (previous name DISABLE_DATADOG_RAILS) defined in supported-configurations.json
-          ENV_DISABLE = 'DD_DISABLE_DATADOG_RAILS'
+          ENV_DISABLE = "DD_DISABLE_DATADOG_RAILS"
 
-          SPAN_RUNNER_FILE = 'rails.runner.file'
-          SPAN_RUNNER_INLINE = 'rails.runner.inline'
-          SPAN_RUNNER_STDIN = 'rails.runner.stdin'
-          TAG_COMPONENT = 'rails'
-          TAG_OPERATION_FILE = 'runner.file'
-          TAG_OPERATION_INLINE = 'runner.inline'
-          TAG_OPERATION_STDIN = 'runner.stdin'
-          TAG_RUNNER_SOURCE = 'source'
+          SPAN_RUNNER_FILE = "rails.runner.file"
+          SPAN_RUNNER_INLINE = "rails.runner.inline"
+          SPAN_RUNNER_STDIN = "rails.runner.stdin"
+          TAG_COMPONENT = "rails"
+          TAG_OPERATION_FILE = "runner.file"
+          TAG_OPERATION_INLINE = "runner.inline"
+          TAG_OPERATION_STDIN = "runner.stdin"
+          TAG_RUNNER_SOURCE = "source"
 
           # @!visibility private
-          MINIMUM_VERSION = Gem::Version.new('4')
+          MINIMUM_VERSION = Gem::Version.new("4")
         end
       end
     end

data/lib/datadog/tracing/contrib/rails/framework.rb

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-require_relative '../action_cable/integration'
-require_relative '../action_mailer/integration'
-require_relative '../action_pack/integration'
-require_relative '../action_view/integration'
-require_relative '../active_record/integration'
-require_relative '../active_support/integration'
-require_relative '../grape/endpoint'
-require_relative '../lograge/integration'
-require_relative 'ext'
-require_relative '../../../core/contrib/rails/utils'
-require_relative '../semantic_logger/integration'
+require_relative "../action_cable/integration"
+require_relative "../action_mailer/integration"
+require_relative "../action_pack/integration"
+require_relative "../action_view/integration"
+require_relative "../active_record/integration"
+require_relative "../active_support/integration"
+require_relative "../grape/endpoint"
+require_relative "../lograge/integration"
+require_relative "ext"
+require_relative "../../../core/contrib/rails/utils"
+require_relative "../semantic_logger/integration"
 
 module Datadog
   module Tracing

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
+require_relative "../integration"
 
-require_relative 'ext'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "ext"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -23,7 +23,7 @@ module Datadog
           register_as :rails, auto_patch: false
 
           def self.version
-            Gem.loaded_specs['railties']&.version
+            Gem.loaded_specs["railties"]&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/rails/log_injection.rb

@@ -18,7 +18,7 @@ module Datadog
             app_config.log_tags << proc { Tracing.log_correlation if Datadog.configuration.tracing.log_injection }
           rescue => e
             Datadog.logger.warn(
-              "Unable to add Datadog Trace context to ActiveSupport::TaggedLogging: #{e.class.name} #{e.message}"
+              "Unable to add Datadog Trace context to ActiveSupport::TaggedLogging: #{e.class}: #{e.message}"
             )
             false
           end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../action_pack/utils'
+require_relative "../action_pack/utils"
 
 module Datadog
   module Tracing

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

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../../core/utils/only_once'
-require_relative '../rack/middlewares'
-require_relative 'framework'
-require_relative 'log_injection'
-require_relative 'middlewares'
-require_relative 'runner'
-require_relative '../../../core/contrib/rails/utils'
-require_relative '../semantic_logger/patcher'
+require_relative "../../../core/utils/only_once"
+require_relative "../rack/middlewares"
+require_relative "framework"
+require_relative "log_injection"
+require_relative "middlewares"
+require_relative "runner"
+require_relative "../semantic_logger/patcher"
 
 module Datadog
   module Tracing
@@ -87,7 +86,7 @@ module Datadog
           # Instruments the `bin/rails runner` command.
           def patch_rails_runner
             # The `RunnerCommand` class is only available in Rails 5.1 and later.
-            if defined?(::Rails::Command::RunnerCommand) && Integration.version >= Gem::Version.new('5.1')
+            if defined?(::Rails::Command::RunnerCommand) && Integration.version >= Gem::Version.new("5.1")
               ::Rails::Command::RunnerCommand.prepend(Runner)
             end
           end

data/lib/datadog/tracing/contrib/rails/railtie.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative 'framework'
-require_relative 'middlewares'
-require_relative '../rack/middlewares'
+require_relative "framework"
+require_relative "middlewares"
+require_relative "../rack/middlewares"
 
 module Datadog
   # Railtie class initializes
   class Railtie < Rails::Railtie
     # Add the trace middleware to the application stack
-    initializer 'datadog.before_initialize' do |app|
+    initializer "datadog.before_initialize" do |app|
       Tracing::Contrib::Rails::Patcher.before_initialize(app)
     end
 

data/lib/datadog/tracing/contrib/rails/runner.rb

@@ -41,7 +41,7 @@ module Datadog
           def eval(*args)
             source = args[0]
 
-            if args[2] == 'stdin'
+            if args[2] == "stdin"
               name = Ext::SPAN_RUNNER_STDIN
               operation = Ext::TAG_OPERATION_STDIN
             else
@@ -53,6 +53,7 @@ module Datadog
               name,
               service: Datadog.configuration.tracing[:rails][:service_name],
               tags: {
+                Tracing::Metadata::Ext::TAG_SVC_SRC => Ext::TAG_COMPONENT,
                 Tracing::Metadata::Ext::TAG_COMPONENT => Ext::TAG_COMPONENT,
                 Tracing::Metadata::Ext::TAG_OPERATION => operation,
               }
@@ -86,7 +87,7 @@ module Datadog
                 # Reads one more byte than the limit to allow us to check if the source exceeds the limit.
                 source = File.read(file, MAX_TAG_VALUE_SIZE + 1)
               rescue => e
-                Datadog.logger.debug("Failed to read file '#{file}' for Rails runner: #{e.message}")
+                Datadog.logger.debug { "Failed to read file '#{file}' for Rails runner: #{e.class}: #{e.message}" }
               end
 
               Tracing.trace(
@@ -94,6 +95,7 @@ module Datadog
                 service: Datadog.configuration.tracing[:rails][:service_name],
                 resource: resource,
                 tags: {
+                  Tracing::Metadata::Ext::TAG_SVC_SRC => Ext::TAG_COMPONENT,
                   Tracing::Metadata::Ext::TAG_COMPONENT => Ext::TAG_COMPONENT,
                   Tracing::Metadata::Ext::TAG_OPERATION => operation,
                 }

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'set'
+require "set"
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing

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

@@ -7,19 +7,19 @@ module Datadog
         # Rake integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_RAKE_ENABLED'
+          ENV_ENABLED = "DD_TRACE_RAKE_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_RAKE_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RAKE_ANALYTICS_SAMPLE_RATE'
-          SERVICE_NAME = 'rake'
-          SPAN_INVOKE = 'rake.invoke'
-          SPAN_EXECUTE = 'rake.execute'
-          TAG_EXECUTE_ARGS = 'rake.execute.args'
-          TAG_INVOKE_ARGS = 'rake.invoke.args'
-          TAG_TASK_ARG_NAMES = 'rake.task.arg_names'
-          TAG_COMPONENT = 'rake'
-          TAG_OPERATION_EXECUTE = 'execute'
-          TAG_OPERATION_INVOKE = 'invoke'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_RAKE_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_RAKE_ANALYTICS_SAMPLE_RATE"
+          SERVICE_NAME = "rake"
+          SPAN_INVOKE = "rake.invoke"
+          SPAN_EXECUTE = "rake.execute"
+          TAG_EXECUTE_ARGS = "rake.execute.args"
+          TAG_INVOKE_ARGS = "rake.invoke.args"
+          TAG_TASK_ARG_NAMES = "rake.task.arg_names"
+          TAG_COMPONENT = "rake"
+          TAG_OPERATION_EXECUTE = "execute"
+          TAG_OPERATION_INVOKE = "invoke"
         end
       end
     end

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
-require_relative '../utils/quantization/hash'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "../utils/quantization/hash_formatter"
 
 module Datadog
   module Tracing
@@ -53,6 +53,7 @@ module Datadog
 
             def annotate_invoke!(span, args)
               span.resource = name
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
                 Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
@@ -66,21 +67,22 @@ module Datadog
               span.set_tag(Ext::TAG_TASK_ARG_NAMES, arg_names)
               span.set_tag(Ext::TAG_INVOKE_ARGS, quantize_args(args)) unless args.nil?
             rescue => e
-              Datadog.logger.debug("Error while tracing Rake invoke: #{e.class.name} #{e.message}")
+              Datadog.logger.debug { "Error while tracing Rake invoke: #{e.class}: #{e.message}" }
             end
 
             def annotate_execute!(span, args)
               span.resource = name
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_EXECUTE)
               span.set_tag(Ext::TAG_EXECUTE_ARGS, quantize_args(args.to_hash)) unless args.nil?
             rescue => e
-              Datadog.logger.debug("Error while tracing Rake execute: #{e.class.name} #{e.message}")
+              Datadog.logger.debug { "Error while tracing Rake execute: #{e.class}: #{e.message}" }
             end
 
             def quantize_args(args)
               quantize_options = configuration[:quantize][:args]
-              Contrib::Utils::Quantization::Hash.format(args, quantize_options)
+              Contrib::Utils::Quantization::HashFormatter.format(args, quantize_options)
             end
 
             def enabled?

data/lib/datadog/tracing/contrib/rake/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('12.0')
+          MINIMUM_VERSION = Gem::Version.new("12.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :rake
 
           def self.version
-            Gem.loaded_specs['rake']&.version
+            Gem.loaded_specs["rake"]&.version
           end
 
           def self.loaded?

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

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

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../vendor/resolver'
+require_relative "../vendor/resolver"
 
 module Datadog
   module Tracing
     module Contrib
       module Redis
         module Configuration
-          UNIX_SCHEME = 'unix'
+          UNIX_SCHEME = "unix"
 
           # Converts String URLs and Hashes to a normalized connection settings Hash.
           class Resolver < Contrib::Configuration::Resolver
@@ -34,7 +34,7 @@ module Datadog
                 host: hash[:host],
                 port: hash[:port],
                 db: hash[:db],
-                scheme: hash[:scheme]
+                scheme: hash[:scheme],
               }
             end
 

data/lib/datadog/tracing/contrib/redis/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