ddtrace 1.4.2 → 1.19.0

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative '../../configuration/settings'
 require_relative '../ext'
@@ -12,18 +12,21 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :service_name

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative '../analytics'
 require_relative '../active_support/notifications/event'

data/lib/datadog/tracing/contrib/action_mailer/events/deliver.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../../metadata/ext'
 require_relative '../ext'
 require_relative '../event'

data/lib/datadog/tracing/contrib/action_mailer/events/process.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../../metadata/ext'
 require_relative '../ext'
 require_relative '../event'

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative 'events/process'
 require_relative 'events/deliver'

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -7,25 +7,25 @@ module Datadog
         # ActionMailer integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_ACTION_MAILER_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTION_MAILER_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTION_MAILER_ANALYTICS_SAMPLE_RATE'.freeze
-          SPAN_PROCESS = 'action_mailer.process'.freeze
-          SPAN_DELIVER = 'action_mailer.deliver'.freeze
-          TAG_COMPONENT = 'action_mailer'.freeze
-          TAG_ACTION = 'action_mailer.action'.freeze
-          TAG_MAILER = 'action_mailer.mailer'.freeze
-          TAG_MSG_ID = 'action_mailer.message_id'.freeze
-          TAG_OPERATION_DELIVER = 'deliver'.freeze
-          TAG_OPERATION_PROCESS = 'process'.freeze
+          ENV_ENABLED = 'DD_TRACE_ACTION_MAILER_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTION_MAILER_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTION_MAILER_ANALYTICS_SAMPLE_RATE'
+          SPAN_PROCESS = 'action_mailer.process'
+          SPAN_DELIVER = 'action_mailer.deliver'
+          TAG_COMPONENT = 'action_mailer'
+          TAG_ACTION = 'action_mailer.action'
+          TAG_MAILER = 'action_mailer.mailer'
+          TAG_MSG_ID = 'action_mailer.message_id'
+          TAG_OPERATION_DELIVER = 'deliver'
+          TAG_OPERATION_PROCESS = 'process'
 
-          TAG_SUBJECT = 'action_mailer.subject'.freeze
-          TAG_TO = 'action_mailer.to'.freeze
-          TAG_FROM = 'action_mailer.from'.freeze
-          TAG_BCC = 'action_mailer.bcc'.freeze
-          TAG_CC = 'action_mailer.cc'.freeze
-          TAG_DATE = 'action_mailer.date'.freeze
-          TAG_PERFORM_DELIVERIES = 'action_mailer.perform_deliveries'.freeze
+          TAG_SUBJECT = 'action_mailer.subject'
+          TAG_TO = 'action_mailer.to'
+          TAG_FROM = 'action_mailer.from'
+          TAG_BCC = 'action_mailer.bcc'
+          TAG_CC = 'action_mailer.cc'
+          TAG_DATE = 'action_mailer.date'
+          TAG_PERFORM_DELIVERIES = 'action_mailer.perform_deliveries'
         end
       end
     end

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

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative 'configuration/settings'
 require_relative 'patcher'
 require_relative '../integration'

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 require_relative '../patcher'
 require_relative 'ext'

data/lib/datadog/tracing/contrib/action_pack/action_controller/instrumentation.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../../../tracing'
 require_relative '../../../metadata/ext'
 
@@ -37,7 +35,7 @@ module Datadog
               tracing_context[:dd_request_span] = span
 
               # We want the route to show up as the trace's resource
-              trace.resource = span.resource
+              trace.resource = span.resource unless payload[:headers][:request_exception]
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CONTROLLER)
@@ -56,7 +54,7 @@ module Datadog
 
               begin
                 # We repeat this in both start and at finish because the resource may have changed during the request
-                trace.resource = span.resource
+                trace.resource = span.resource unless payload[:headers][:request_exception]
 
                 # Set analytics sample rate
                 Utils.set_analytics_sample_rate(span)
@@ -83,26 +81,6 @@ module Datadog
               Datadog.logger.error(e.message)
             end
 
-            def exception_controller?(payload)
-              exception_controller_class = Datadog.configuration.tracing[:action_pack][:exception_controller]
-              controller = payload.fetch(:controller)
-              headers = payload.fetch(:headers)
-
-              # If no exception controller class has been set,
-              # guess whether this is an exception controller from the headers.
-              if exception_controller_class.nil?
-                !headers[:request_exception].nil?
-              # If an exception controller class has been specified,
-              # check if the controller is a kind of the exception controller class.
-              elsif exception_controller_class.is_a?(Class) || exception_controller_class.is_a?(Module)
-                controller <= exception_controller_class
-              # Otherwise if the exception controller class is some other value (like false)
-              # assume that this controller doesn't handle exceptions.
-              else
-                false
-              end
-            end
-
             # Instrumentation for ActionController::Metal
             module Metal
               def process_action(*args)
@@ -122,8 +100,6 @@ module Datadog
                 }
 
                 begin
-                  payload[:exception_controller?] = Instrumentation.exception_controller?(payload)
-
                   # process and catch request exceptions
                   Instrumentation.start_processing(payload)
                   result = super(*args)

data/lib/datadog/tracing/contrib/action_pack/action_controller/patcher.rb

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 require_relative '../../patcher'
 require_relative 'instrumentation'

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

@@ -1,8 +1,8 @@
-# typed: false
-
 require_relative '../../configuration/settings'
 require_relative '../ext'
 
+require_relative '../../../../core'
+
 module Datadog
   module Tracing
     module Contrib
@@ -12,21 +12,34 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
-              o.lazy
+              o.type :bool, nilable: true
+              o.env Ext::ENV_ANALYTICS_ENABLED
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+            end
+
+            # DEV-2.0: Breaking changes for removal.
+            option :exception_controller do |o|
+              o.after_set do |value|
+                if value
+                  Datadog::Core.log_deprecation do
+                    'The error controller is now automatically detected. '\
+                    "Option `#{o.instance_variable_get(:@name)}` is no longer required and will be removed."
+                  end
+                end
+              end
             end
 
-            option :exception_controller
             option :service_name
           end
         end

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -7,14 +7,14 @@ module Datadog
         # ActionPack integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_ACTION_PACK_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTION_PACK_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTION_PACK_ANALYTICS_SAMPLE_RATE'.freeze
-          SPAN_ACTION_CONTROLLER = 'rails.action_controller'.freeze
-          TAG_COMPONENT = 'action_pack'.freeze
-          TAG_OPERATION_CONTROLLER = 'controller'.freeze
-          TAG_ROUTE_ACTION = 'rails.route.action'.freeze
-          TAG_ROUTE_CONTROLLER = 'rails.route.controller'.freeze
+          ENV_ENABLED = 'DD_TRACE_ACTION_PACK_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTION_PACK_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTION_PACK_ANALYTICS_SAMPLE_RATE'
+          SPAN_ACTION_CONTROLLER = 'rails.action_controller'
+          TAG_COMPONENT = 'action_pack'
+          TAG_OPERATION_CONTROLLER = 'controller'
+          TAG_ROUTE_ACTION = 'rails.route.action'
+          TAG_ROUTE_CONTROLLER = 'rails.route.controller'
         end
       end
     end

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

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative 'configuration/settings'
 require_relative 'patcher'
 require_relative '../integration'

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 require_relative '../patcher'
 require_relative 'action_controller/patcher'

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

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../analytics'
 
 module Datadog

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

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../configuration/settings'
 require_relative '../ext'
 
@@ -12,18 +10,21 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :service_name

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 require_relative '../active_support/notifications/event'
 

data/lib/datadog/tracing/contrib/action_view/events/render_partial.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../../../tracing'
 require_relative '../../../metadata/ext'
 require_relative '../../analytics'

data/lib/datadog/tracing/contrib/action_view/events/render_template.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../../../tracing'
 require_relative '../../../metadata/ext'
 require_relative '../../analytics'

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative 'events/render_partial'
 require_relative 'events/render_template'

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -7,16 +7,16 @@ module Datadog
         # ActionView integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_ACTION_VIEW_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTION_VIEW_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTION_VIEW_ANALYTICS_SAMPLE_RATE'.freeze
-          SPAN_RENDER_PARTIAL = 'rails.render_partial'.freeze
-          SPAN_RENDER_TEMPLATE = 'rails.render_template'.freeze
-          TAG_COMPONENT = 'action_view'.freeze
-          TAG_LAYOUT = 'rails.layout'.freeze
-          TAG_OPERATION_RENDER_PARTIAL = 'render_partial'.freeze
-          TAG_OPERATION_RENDER_TEMPLATE = 'render_template'.freeze
-          TAG_TEMPLATE_NAME = 'rails.template_name'.freeze
+          ENV_ENABLED = 'DD_TRACE_ACTION_VIEW_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTION_VIEW_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTION_VIEW_ANALYTICS_SAMPLE_RATE'
+          SPAN_RENDER_PARTIAL = 'rails.render_partial'
+          SPAN_RENDER_TEMPLATE = 'rails.render_template'
+          TAG_COMPONENT = 'action_view'
+          TAG_LAYOUT = 'rails.layout'
+          TAG_OPERATION_RENDER_PARTIAL = 'render_partial'
+          TAG_OPERATION_RENDER_TEMPLATE = 'render_template'
+          TAG_TEMPLATE_NAME = 'rails.template_name'
         end
       end
     end

data/lib/datadog/tracing/contrib/action_view/instrumentation/partial_renderer.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../../metadata/ext'
 require_relative '../ext'
 

data/lib/datadog/tracing/contrib/action_view/instrumentation/template_renderer.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../../metadata/ext'
 require_relative '../ext'
 

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

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative 'configuration/settings'
 require_relative 'patcher'
 require_relative '../integration'

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../../core'
 require_relative '../patcher'
 require_relative 'events'

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../analytics'
 
 module Datadog

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative '../../../span_operation'
 require_relative '../ext'
@@ -13,22 +13,28 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :service_name
-            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :error_handler do |o|
+              o.type :proc
+              o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+            end
           end
         end
       end

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 require_relative '../../metadata/ext'
 require_relative '../active_support/notifications/event'

data/lib/datadog/tracing/contrib/active_job/events/discard.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../../metadata/ext'
 require_relative '../../analytics'
 require_relative '../ext'

data/lib/datadog/tracing/contrib/active_job/events/enqueue.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../../metadata/ext'
 require_relative '../../analytics'
 require_relative '../ext'

data/lib/datadog/tracing/contrib/active_job/events/enqueue_at.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../../metadata/ext'
 require_relative '../../analytics'
 require_relative '../ext'

data/lib/datadog/tracing/contrib/active_job/events/enqueue_retry.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../../metadata/ext'
 require_relative '../../analytics'
 require_relative '../ext'

data/lib/datadog/tracing/contrib/active_job/events/perform.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../../metadata/ext'
 require_relative '../../analytics'
 require_relative '../ext'

data/lib/datadog/tracing/contrib/active_job/events/retry_stopped.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../../metadata/ext'
 require_relative '../../analytics'
 require_relative '../ext'

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative 'events/discard'
 require_relative 'events/enqueue'

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -6,32 +6,32 @@ module Datadog
       module ActiveJob
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_ACTIVE_JOB_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTIVE_JOB_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTIVE_JOB_ANALYTICS_SAMPLE_RATE'.freeze
+          ENV_ENABLED = 'DD_TRACE_ACTIVE_JOB_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTIVE_JOB_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTIVE_JOB_ANALYTICS_SAMPLE_RATE'
 
-          SPAN_DISCARD = 'active_job.discard'.freeze
-          SPAN_ENQUEUE = 'active_job.enqueue'.freeze
-          SPAN_ENQUEUE_RETRY = 'active_job.enqueue_retry'.freeze
-          SPAN_PERFORM = 'active_job.perform'.freeze
-          SPAN_RETRY_STOPPED = 'active_job.retry_stopped'.freeze
+          SPAN_DISCARD = 'active_job.discard'
+          SPAN_ENQUEUE = 'active_job.enqueue'
+          SPAN_ENQUEUE_RETRY = 'active_job.enqueue_retry'
+          SPAN_PERFORM = 'active_job.perform'
+          SPAN_RETRY_STOPPED = 'active_job.retry_stopped'
 
-          TAG_COMPONENT = 'active_job'.freeze
-          TAG_OPERATION_DISCARD = 'discard'.freeze
-          TAG_OPERATION_ENQUEUE = 'enqueue'.freeze
-          TAG_OPERATION_ENQUEUE_AT = 'enqueue_at'.freeze
-          TAG_OPERATION_ENQUEUE_RETRY = 'enqueue_retry'.freeze
-          TAG_OPERATION_PERFORM = 'perform'.freeze
-          TAG_OPERATION_RETRY_STOPPED = 'retry_stopped'.freeze
+          TAG_COMPONENT = 'active_job'
+          TAG_OPERATION_DISCARD = 'discard'
+          TAG_OPERATION_ENQUEUE = 'enqueue'
+          TAG_OPERATION_ENQUEUE_AT = 'enqueue_at'
+          TAG_OPERATION_ENQUEUE_RETRY = 'enqueue_retry'
+          TAG_OPERATION_PERFORM = 'perform'
+          TAG_OPERATION_RETRY_STOPPED = 'retry_stopped'
 
-          TAG_ADAPTER = 'active_job.adapter'.freeze
-          TAG_JOB_ERROR = 'active_job.job.error'.freeze
-          TAG_JOB_EXECUTIONS = 'active_job.job.executions'.freeze
-          TAG_JOB_ID = 'active_job.job.id'.freeze
-          TAG_JOB_PRIORITY = 'active_job.job.priority'.freeze
-          TAG_JOB_QUEUE = 'active_job.job.queue'.freeze
-          TAG_JOB_RETRY_WAIT = 'active_job.job.retry_wait'.freeze
-          TAG_JOB_SCHEDULED_AT = 'active_job.job.scheduled_at'.freeze
+          TAG_ADAPTER = 'active_job.adapter'
+          TAG_JOB_ERROR = 'active_job.job.error'
+          TAG_JOB_EXECUTIONS = 'active_job.job.executions'
+          TAG_JOB_ID = 'active_job.job.id'
+          TAG_JOB_PRIORITY = 'active_job.job.priority'
+          TAG_JOB_QUEUE = 'active_job.job.queue'
+          TAG_JOB_RETRY_WAIT = 'active_job.job.retry_wait'
+          TAG_JOB_SCHEDULED_AT = 'active_job.job.scheduled_at'
         end
       end
     end

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

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative 'configuration/settings'
 require_relative 'patcher'
 require_relative '../integration'

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -9,7 +9,7 @@ module Datadog
           def self.included(base)
             base.class_eval do
               around_perform do |_, block|
-                if logger.respond_to?(:tagged)
+                if Datadog.configuration.tracing.log_injection && logger.respond_to?(:tagged)
                   logger.tagged(Tracing.log_correlation, &block)
                 else
                   block.call

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative '../patcher'
 require_relative 'ext'
@@ -21,7 +21,7 @@ module Datadog
 
           def patch
             Events.subscribe!
-            inject_log_correlation if Datadog.configuration.tracing.log_injection
+            inject_log_correlation
           end
 
           def inject_log_correlation