datadog 2.4.0 → 2.44.0

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../../metadata/ext'
-require_relative '../../analytics'
-require_relative '../ext'
-require_relative '../event'
+require_relative "../../../metadata/ext"
+require_relative "../../analytics"
+require_relative "../ext"
+require_relative "../event"
 
 module Datadog
   module Tracing
@@ -14,7 +14,7 @@ module Datadog
           module RetryStopped
             include ActiveJob::Event
 
-            EVENT_NAME = 'retry_stopped.active_job'
+            EVENT_NAME = "retry_stopped.active_job"
 
             module_function
 
@@ -28,7 +28,10 @@ module Datadog
 
             def on_start(span, event, _id, payload)
               span.name = span_name
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.resource = payload[:job].class.name
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_RETRY_STOPPED)
 
@@ -39,8 +42,8 @@ module Datadog
 
               set_common_tags(span, payload)
               span.set_tag(Ext::TAG_JOB_ERROR, payload[:error])
-            rescue StandardError => e
-              Datadog.logger.debug(e.message)
+            rescue => e
+              Datadog.logger.debug { "#{e.class}: #{e.message}" }
             end
           end
         end

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'events/discard'
-require_relative 'events/enqueue'
-require_relative 'events/enqueue_at'
-require_relative 'events/enqueue_retry'
-require_relative 'events/perform'
-require_relative 'events/retry_stopped'
+require_relative "events/discard"
+require_relative "events/enqueue"
+require_relative "events/enqueue_at"
+require_relative "events/enqueue_retry"
+require_relative "events/perform"
+require_relative "events/retry_stopped"
 
 module Datadog
   module Tracing

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

@@ -6,33 +6,33 @@ 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'
+          ENV_ENABLED = "DD_TRACE_ACTIVE_JOB_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTIVE_JOB_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTIVE_JOB_ANALYTICS_SAMPLE_RATE'
+          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'
-          SPAN_ENQUEUE = 'active_job.enqueue'
-          SPAN_ENQUEUE_RETRY = 'active_job.enqueue_retry'
-          SPAN_PERFORM = 'active_job.perform'
-          SPAN_RETRY_STOPPED = 'active_job.retry_stopped'
+          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'
-          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_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'
-          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'
+          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,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'configuration/settings'
-require_relative 'patcher'
-require_relative '../integration'
-require_relative '../rails/utils'
+require_relative "configuration/settings"
+require_relative "patcher"
+require_relative "../integration"
+require_relative "../../../core/contrib/rails/utils"
 
 module Datadog
   module Tracing
@@ -13,13 +13,16 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('4.2')
+          MINIMUM_VERSION = Gem::Version.new("4.2")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :active_job, auto_patch: false
+          def self.gem_name
+            "activejob"
+          end
 
           def self.version
-            Gem.loaded_specs['activejob'] && Gem.loaded_specs['activejob'].version
+            Gem.loaded_specs["activejob"]&.version
           end
 
           def self.loaded?
@@ -33,7 +36,7 @@ module Datadog
           # enabled by rails integration so should only auto instrument
           # if detected that it is being used without rails
           def auto_instrument?
-            !Contrib::Rails::Utils.railtie_supported?
+            !Core::Contrib::Rails::Utils.railtie_supported?
           end
 
           def new_configuration

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

@@ -6,17 +6,31 @@ module Datadog
       module ActiveJob
         # Active Job log injection wrapped around job execution
         module LogInjection
-          def self.included(base)
-            base.class_eval do
-              around_perform do |_, block|
-                if Datadog.configuration.tracing.log_injection && logger.respond_to?(:tagged)
-                  logger.tagged(Tracing.log_correlation, &block)
-                else
-                  block.call
+          # Active Job 4 / 5 don't execute `perform_now` at the right point, so we do best effort log correlation tagging
+          module AroundPerformPatch
+            def self.included(base)
+              base.class_eval do
+                around_perform do |_, block|
+                  if Datadog.configuration.tracing.log_injection && logger.respond_to?(:tagged)
+                    logger.tagged(Tracing.log_correlation, &block)
+                  else
+                    block.call
+                  end
                 end
               end
             end
           end
+
+          # Active Job 6+ executes `perform_now` at the right point, so we can provide better log correlation tagging
+          module PerformNowPatch
+            def perform_now
+              if Datadog.configuration.tracing.log_injection && logger.respond_to?(:tagged)
+                logger.tagged(Tracing.log_correlation) { super }
+              else
+                super
+              end
+            end
+          end
         end
       end
     end

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

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'ext'
-require_relative 'events'
-require_relative 'log_injection'
+require_relative "../patcher"
+require_relative "data_streams"
+require_relative "ext"
+require_relative "events"
+require_relative "log_injection"
 
 module Datadog
   module Tracing
@@ -22,11 +23,26 @@ module Datadog
           def patch
             Events.subscribe!
             inject_log_correlation
+            inject_data_streams
           end
 
           def inject_log_correlation
             ::ActiveSupport.on_load(:active_job) do
-              include LogInjection
+              if ::ActiveJob.gem_version < Gem::Version.new("6.0.0")
+                include LogInjection::AroundPerformPatch
+              else
+                include LogInjection::PerformNowPatch
+              end
+            end
+          end
+
+          def inject_data_streams
+            # ActiveJob 4.2 deserializes jobs through a class method rather than the
+            # instance method, so the DSM pathway can only be propagated on 5.0+.
+            return if ::ActiveJob.gem_version < Gem::Version.new("5.0.0")
+
+            ::ActiveSupport.on_load(:active_job) do
+              prepend DataStreams
             end
           end
         end

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

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative '../active_support/notifications/event'
-require_relative 'ext'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "../active_support/notifications/event"
+require_relative "ext"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_model_serializers/events/render.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../../metadata/ext'
-require_relative '../ext'
-require_relative '../event'
+require_relative "../../../metadata/ext"
+require_relative "../ext"
+require_relative "../event"
 
 module Datadog
   module Tracing
@@ -13,13 +13,13 @@ module Datadog
           module Render
             include ActiveModelSerializers::Event
 
-            EVENT_NAME = 'render.active_model_serializers'
+            EVENT_NAME = "render.active_model_serializers"
 
             module_function
 
             def supported?
-              Gem.loaded_specs['active_model_serializers'] \
-                && Gem.loaded_specs['active_model_serializers'].version >= Gem::Version.new('0.10')
+              Gem.loaded_specs["active_model_serializers"] \
+                && Gem.loaded_specs["active_model_serializers"].version >= Gem::Version.new("0.10")
             end
 
             def event_name
@@ -34,8 +34,8 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_RENDER)
 
               set_common_tags(span, payload)
-            rescue StandardError => e
-              Datadog.logger.debug(e.message)
+            rescue => e
+              Datadog.logger.debug { "#{e.class}: #{e.message}" }
             end
           end
         end

data/lib/datadog/tracing/contrib/active_model_serializers/events/serialize.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,16 +12,15 @@ module Datadog
           module Serialize
             include ActiveModelSerializers::Event
 
-            EVENT_NAME = '!serialize.active_model_serializers'
+            EVENT_NAME = "!serialize.active_model_serializers"
 
             module_function
 
             def supported?
-              Gem.loaded_specs['active_model_serializers'] \
-                && ( \
-                  Gem.loaded_specs['active_model_serializers'].version >= Gem::Version.new('0.9') \
-                  && Gem.loaded_specs['active_model_serializers'].version < Gem::Version.new('0.10') \
-                )
+              Gem.loaded_specs["active_model_serializers"] \
+                &&
+                Gem.loaded_specs["active_model_serializers"].version >= Gem::Version.new("0.9") \
+                  && Gem.loaded_specs["active_model_serializers"].version < Gem::Version.new("0.10")
             end
 
             def event_name
@@ -36,8 +35,8 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SERIALIZE)
 
               set_common_tags(span, payload)
-            rescue StandardError => e
-              Datadog.logger.debug(e.message)
+            rescue => e
+              Datadog.logger.debug { "#{e.class}: #{e.message}" }
             end
           end
         end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'events/render'
-require_relative 'events/serialize'
+require_relative "events/render"
+require_relative "events/serialize"
 
 module Datadog
   module Tracing
@@ -11,7 +11,7 @@ module Datadog
         module Events
           ALL = [
             Events::Render,
-            Events::Serialize
+            Events::Serialize,
           ].freeze
 
           module_function

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

@@ -7,17 +7,17 @@ module Datadog
         # ActiveModelSerializers integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_ACTIVE_MODEL_SERIALIZERS_ENABLED'
+          ENV_ENABLED = "DD_TRACE_ACTIVE_MODEL_SERIALIZERS_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_SAMPLE_RATE'
-          SPAN_RENDER = 'active_model_serializers.render'
-          SPAN_SERIALIZE = 'active_model_serializers.serialize'
-          TAG_ADAPTER = 'active_model_serializers.adapter'
-          TAG_COMPONENT = 'active_model_serializers'
-          TAG_OPERATION_RENDER = 'render'
-          TAG_OPERATION_SERIALIZE = 'serialize'
-          TAG_SERIALIZER = 'active_model_serializers.serializer'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_SAMPLE_RATE"
+          SPAN_RENDER = "active_model_serializers.render"
+          SPAN_SERIALIZE = "active_model_serializers.serialize"
+          TAG_ADAPTER = "active_model_serializers.adapter"
+          TAG_COMPONENT = "active_model_serializers"
+          TAG_OPERATION_RENDER = "render"
+          TAG_OPERATION_SERIALIZE = "serialize"
+          TAG_SERIALIZER = "active_model_serializers.serializer"
         end
       end
     end

data/lib/datadog/tracing/contrib/active_model_serializers/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,14 +12,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('0.9.0')
+          MINIMUM_VERSION = Gem::Version.new("0.9.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :active_model_serializers
 
           def self.version
-            Gem.loaded_specs['active_model_serializers'] \
-              && Gem.loaded_specs['active_model_serializers'].version
+            Gem.loaded_specs["active_model_serializers"]&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/active_model_serializers/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/active_record/configuration/makara_resolver.rb

@@ -23,7 +23,7 @@ module Datadog
               hash = super
 
               if active_record_config[:name].is_a?(String)
-                hash[:makara_role] = active_record_config[:name].split('/')[0].to_s
+                hash[:makara_role] = active_record_config[:name].split("/")[0].to_s
               end
 
               hash

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/resolver'
-require_relative 'makara_resolver'
-require_relative '../../../../core/telemetry/logger'
+require_relative "../../configuration/resolver"
+require_relative "makara_resolver"
+require_relative "../../../../core/telemetry/logger"
 
 module Datadog
   module Tracing
@@ -75,10 +75,10 @@ module Datadog
               # hence provide a succinct summary for the error logging.
               #
               Datadog.logger.error(
-                'Failed to resolve ActiveRecord database configuration. '\
-                "Cause: #{e.class.name} Source: #{Array(e.backtrace).first}"
+                "Failed to resolve ActiveRecord database configuration. " \
+                "Cause: #{e.class} Source: #{Array(e.backtrace).first}"
               )
-              Core::Telemetry::Logger.report(e, description: 'Failed to resolve ActiveRecord database configuration')
+              Core::Telemetry::Logger.report(e, description: "Failed to resolve ActiveRecord database configuration")
 
               nil
             end
@@ -96,9 +96,9 @@ module Datadog
             rescue => e
               Datadog.logger.error(
                 "Failed to resolve key #{matcher.inspect}. " \
-                "Cause: #{e.class.name} Source: #{Array(e.backtrace).first}"
+                "Cause: #{e.class} Source: #{Array(e.backtrace).first}"
               )
-              Core::Telemetry::Logger.report(e, description: 'Failed to resolve key')
+              Core::Telemetry::Logger.report(e, description: "Failed to resolve key")
 
               nil
             end
@@ -138,7 +138,7 @@ module Datadog
                 host: active_record_config[:host],
                 port: active_record_config[:port],
                 database: active_record_config[:database],
-                username: active_record_config[:username]
+                username: active_record_config[:username],
               }
             end
 

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

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

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../active_support/notifications/event'
+require_relative "../active_support/notifications/event"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_record/events/instantiation.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative '../../../metadata/ext'
-require_relative '../../analytics'
-require_relative '../ext'
-require_relative '../event'
-require_relative '../../../../core/telemetry/logger'
+require_relative "../../../metadata/ext"
+require_relative "../../analytics"
+require_relative "../ext"
+require_relative "../event"
+require_relative "../../../../core/telemetry/logger"
 
 module Datadog
   module Tracing
@@ -15,13 +15,13 @@ module Datadog
           module Instantiation
             include ActiveRecord::Event
 
-            EVENT_NAME = 'instantiation.active_record'
+            EVENT_NAME = "instantiation.active_record"
 
             module_function
 
             def supported?
-              Gem.loaded_specs['activerecord'] \
-                && Gem.loaded_specs['activerecord'].version >= Gem::Version.new('4.2')
+              Gem.loaded_specs["activerecord"] \
+                && Gem.loaded_specs["activerecord"].version >= Gem::Version.new("4.2")
             end
 
             def event_name
@@ -48,8 +48,8 @@ module Datadog
 
               span.set_tag(Ext::TAG_INSTANTIATION_CLASS_NAME, payload.fetch(:class_name))
               span.set_tag(Ext::TAG_INSTANTIATION_RECORD_COUNT, payload.fetch(:record_count))
-            rescue StandardError => e
-              Datadog.logger.error(e.message)
+            rescue => e
+              Datadog.logger.error("#{e.class}: #{e.message}")
               Datadog::Core::Telemetry::Logger.report(e)
             end
           end