datadog 2.4.0 → 2.44.0

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

@@ -7,25 +7,25 @@ module Datadog
         # ActionCable integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_ACTION_CABLE_ENABLED'
+          ENV_ENABLED = "DD_TRACE_ACTION_CABLE_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTION_CABLE_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTION_CABLE_ANALYTICS_SAMPLE_RATE'
-          SPAN_ACTION = 'action_cable.action'
-          SPAN_BROADCAST = 'action_cable.broadcast'
-          SPAN_ON_OPEN = 'action_cable.on_open'
-          SPAN_TRANSMIT = 'action_cable.transmit'
-          TAG_ACTION = 'action_cable.action'
-          TAG_BROADCAST_CODER = 'action_cable.broadcast.coder'
-          TAG_CHANNEL = 'action_cable.channel'
-          TAG_CHANNEL_CLASS = 'action_cable.channel_class'
-          TAG_COMPONENT = 'action_cable'
-          TAG_CONNECTION = 'action_cable.connection'
-          TAG_OPERATION_ACTION = 'action'
-          TAG_OPERATION_BROADCAST = 'broadcast'
-          TAG_OPERATION_ON_OPEN = 'on_open'
-          TAG_OPERATION_TRANSMIT = 'transmit'
-          TAG_TRANSMIT_VIA = 'action_cable.transmit.via'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_ACTION_CABLE_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_ACTION_CABLE_ANALYTICS_SAMPLE_RATE"
+          SPAN_ACTION = "action_cable.action"
+          SPAN_BROADCAST = "action_cable.broadcast"
+          SPAN_ON_OPEN = "action_cable.on_open"
+          SPAN_TRANSMIT = "action_cable.transmit"
+          TAG_ACTION = "action_cable.action"
+          TAG_BROADCAST_CODER = "action_cable.broadcast.coder"
+          TAG_CHANNEL = "action_cable.channel"
+          TAG_CHANNEL_CLASS = "action_cable.channel_class"
+          TAG_COMPONENT = "action_cable"
+          TAG_CONNECTION = "action_cable.connection"
+          TAG_OPERATION_ACTION = "action"
+          TAG_OPERATION_BROADCAST = "broadcast"
+          TAG_OPERATION_ON_OPEN = "on_open"
+          TAG_OPERATION_TRANSMIT = "transmit"
+          TAG_TRANSMIT_VIA = "action_cable.transmit.via"
         end
       end
     end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative 'ext'
-require_relative '../analytics'
+require_relative "../../metadata/ext"
+require_relative "ext"
+require_relative "../analytics"
 
 module Datadog
   module Tracing
@@ -17,7 +17,7 @@ module Datadog
                 span.resource = "#{self.class}#on_open"
                 span.type = Tracing::Metadata::Ext::AppTypes::TYPE_WEB
 
-                span.set_tag(Ext::TAG_ACTION, 'on_open')
+                span.set_tag(Ext::TAG_ACTION, "on_open")
                 span.set_tag(Ext::TAG_CONNECTION, self.class.to_s)
 
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
@@ -57,7 +57,10 @@ module Datadog
                 configuration = Datadog.configuration.tracing[:action_cable]
 
                 Tracing.trace("action_cable.#{hook}") do |span|
-                  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 = "#{channel.class}##{hook}"
                   span.type = Tracing::Metadata::Ext::AppTypes::TYPE_WEB
 

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
-require_relative '../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,16 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('5.0.0')
+          MINIMUM_VERSION = Gem::Version.new("5.0.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :action_cable, auto_patch: false
+          def self.gem_name
+            "actioncable"
+          end
 
           def self.version
-            Gem.loaded_specs['actioncable'] && Gem.loaded_specs['actioncable'].version
+            Gem.loaded_specs["actioncable"]&.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/action_cable/patcher.rb

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

data/lib/datadog/tracing/contrib/action_mailer/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/action_mailer/event.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../analytics'
-require_relative '../active_support/notifications/event'
-require_relative 'ext'
+require_relative "../analytics"
+require_relative "../active_support/notifications/event"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -31,7 +31,10 @@ module Datadog
               super
 
               span.type = span_type
-              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.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
 
               # Set analytics sample rate

data/lib/datadog/tracing/contrib/action_mailer/events/deliver.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,7 +13,7 @@ module Datadog
           module Deliver
             include ActionMailer::Event
 
-            EVENT_NAME = 'deliver.action_mailer'
+            EVENT_NAME = "deliver.action_mailer"
 
             module_function
 
@@ -49,10 +49,10 @@ module Datadog
               # https://github.com/rails/rails/blob/18707ab17fa492eb25ad2e8f9818a320dc20b823/actionmailer/lib/action_mailer/base.rb#L742-L754
               if configuration[:email_data] == true
                 span.set_tag(Ext::TAG_SUBJECT, payload[:subject].to_s) if payload[:subject]
-                span.set_tag(Ext::TAG_TO, payload[:to].join(',')) if payload[:to]
-                span.set_tag(Ext::TAG_FROM, payload[:from].join(',')) if payload[:from]
-                span.set_tag(Ext::TAG_BCC, payload[:bcc].join(',')) if payload[:bcc]
-                span.set_tag(Ext::TAG_CC, payload[:cc].join(',')) if payload[:cc]
+                span.set_tag(Ext::TAG_TO, payload[:to].join(",")) if payload[:to]
+                span.set_tag(Ext::TAG_FROM, payload[:from].join(",")) if payload[:from]
+                span.set_tag(Ext::TAG_BCC, payload[:bcc].join(",")) if payload[:bcc]
+                span.set_tag(Ext::TAG_CC, payload[:cc].join(",")) if payload[:cc]
                 span.set_tag(Ext::TAG_DATE, payload[:date].to_s) if payload[:date]
                 span.set_tag(Ext::TAG_PERFORM_DELIVERIES, payload[:perform_deliveries]) if payload[:perform_deliveries]
               end

data/lib/datadog/tracing/contrib/action_mailer/events/process.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,7 +13,7 @@ module Datadog
           module Process
             include ActionMailer::Event
 
-            EVENT_NAME = 'process.action_mailer'
+            EVENT_NAME = "process.action_mailer"
 
             module_function
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'events/process'
-require_relative 'events/deliver'
+require_relative "events/process"
+require_relative "events/deliver"
 
 module Datadog
   module Tracing
@@ -11,7 +11,7 @@ module Datadog
         module Events
           ALL = [
             Events::Process,
-            Events::Deliver
+            Events::Deliver,
           ].freeze
 
           module_function

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

@@ -7,26 +7,26 @@ 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'
+          ENV_ENABLED = "DD_TRACE_ACTION_MAILER_ENABLED"
           # @!visibility private
-          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'
+          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'
-          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'
+          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,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,17 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('5.0.0')
+          MINIMUM_VERSION = Gem::Version.new("5.0.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :action_mailer, auto_patch: false
 
+          def self.gem_name
+            "actionmailer"
+          end
+
           def self.version
-            Gem.loaded_specs['actionmailer'] && Gem.loaded_specs['actionmailer'].version
+            Gem.loaded_specs["actionmailer"]&.version
           end
 
           def self.loaded?
@@ -33,7 +37,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/action_mailer/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/action_pack/action_controller/instrumentation.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../../../../tracing'
-require_relative '../../../metadata/ext'
+require_relative "../../../../tracing"
+require_relative "../../../metadata/ext"
 
-require_relative '../ext'
-require_relative '../utils'
-require_relative '../../rack/middlewares'
-require_relative '../../analytics'
-require_relative '../../../../core/telemetry/logger'
+require_relative "../ext"
+require_relative "../utils"
+require_relative "../../rack/middlewares"
+require_relative "../../analytics"
+require_relative "../../../../core/telemetry/logger"
 
 module Datadog
   module Tracing
@@ -42,8 +42,9 @@ module Datadog
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CONTROLLER)
-            rescue StandardError => e
-              Datadog.logger.error(e.message)
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+            rescue => e
+              Datadog.logger.error("#{e.class}: #{e.message}")
               Datadog::Core::Telemetry::Logger.report(e)
             end
 
@@ -68,21 +69,27 @@ module Datadog
 
                 span.set_tag(Ext::TAG_ROUTE_ACTION, payload.fetch(:action))
                 span.set_tag(Ext::TAG_ROUTE_CONTROLLER, payload.fetch(:controller))
+                if (runtime = payload[:view_runtime])
+                  span.set_tag(Ext::TAG_VIEW_RUNTIME, runtime)
+                end
+                if (runtime = payload[:db_runtime])
+                  span.set_tag(Ext::TAG_DB_RUNTIME, runtime)
+                end
 
                 exception = payload[:exception_object]
                 if exception.nil?
-                  # [christian] in some cases :status is not defined,
-                  # rather than firing an error, simply acknowledge we don't know it.
-                  status = payload.fetch(:status, '?').to_s
-                  span.status = 1 if status.start_with?('5')
+                  status = payload[:status]
+                  if status && Datadog.configuration.tracing.http_error_statuses.server.include?(status)
+                    span.status = Tracing::Metadata::Ext::Errors::STATUS
+                  end
                 elsif Utils.exception_is_error?(exception)
                   span.set_error(exception)
                 end
               ensure
                 span.finish
               end
-            rescue StandardError => e
-              Datadog.logger.error(e.message)
+            rescue => e
+              Datadog.logger.error("#{e.class}: #{e.message}")
               Datadog::Core::Telemetry::Logger.report(e)
             end
 
@@ -101,23 +108,34 @@ module Datadog
                   headers: {
                     # The exception this controller was given in the request,
                     # which is typical if the controller is configured to handle exceptions.
-                    request_exception: request.headers['action_dispatch.exception']
+                    request_exception: request.headers["action_dispatch.exception"],
                   },
-                  tracing_context: {}
+                  tracing_context: {},
                 }
 
                 begin
                   # process and catch request exceptions
                   Instrumentation.start_processing(payload)
-                  result = super(*args)
+                  result = super
                   status = datadog_response_status
                   payload[:status] = status unless status.nil?
                   result
                 # rubocop:disable Lint/RescueException
                 rescue Exception => e
-                  payload[:exception] = [e.class.name, e.message]
+                  # Rails ActiveSupport::Notifications convention — payload[:exception] is
+                  # an array of [class_name_string, message_string] consumed by subscribers.
+                  payload[:exception] = [e.class.name, e.message] # rubocop:disable CustomCops/ExceptionMessageCop
                   payload[:exception_object] = e
                   raise e
+                ensure
+                  # Database and view runtime are available for controllers
+                  # deriving from ActionController::Base.
+                  # They are not defined on controllers deriving from
+                  # ActionController::Metal, unless
+                  # ActionController::Instrumentation is explicitly included
+                  # into the controller class.
+                  payload[:db_runtime] = db_runtime if respond_to?(:db_runtime)
+                  payload[:view_runtime] = view_runtime if respond_to?(:view_runtime)
                 end
               # rubocop:enable Lint/RescueException
               ensure
@@ -131,7 +149,7 @@ module Datadog
                 when Array
                   # Likely a Rack response array: first element is the status.
                   status = response.first
-                  status.class <= Integer ? status : nil
+                  (status.class <= Integer) ? status : nil
                 end
               end
             end

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

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

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../metadata/ext'
+require_relative "../../../metadata/ext"
 
 module Datadog
   module Tracing
@@ -9,9 +9,14 @@ module Datadog
         module ActionDispatch
           # Instrumentation for ActionDispatch components
           module Instrumentation
+            SCRIPT_NAME_KEY = "SCRIPT_NAME"
+            FORMAT_SUFFIX = "(.:format)"
+            # NOTE: Rails 8.1.1+ natively provides the same object via 'action_dispatch.route'.
+            DATADOG_RAILS_ROUTE_ENV_KEY = "datadog.action_dispatch.route"
+
             module_function
 
-            def set_http_route_tags(route_spec, script_name)
+            def set_http_route_tags(route_spec, route_path)
               return unless Tracing.enabled?
 
               return unless route_spec
@@ -19,10 +24,10 @@ module Datadog
               request_trace = Tracing.active_trace
               return unless request_trace
 
-              request_trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE, route_spec.to_s.gsub(/\(.:format\)\z/, ''))
+              request_trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE, route_spec)
 
-              if script_name && !script_name.empty?
-                request_trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH, script_name)
+              if route_path && !route_path.empty?
+                request_trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH, route_path)
               end
             end
 
@@ -40,16 +45,19 @@ module Datadog
               # Instrumentation for ActionDispatch::Journey::Router for Rails versions older than 7.1
               module Router
                 def find_routes(req)
+                  # result is an array of [match, parameters, route] tuples
                   result = super
+                  result.each do |_, _, route|
+                    next unless Instrumentation.dispatcher_route?(route)
 
-                  # result is an array of [match, parameters, route] tuples
-                  routes = result.map(&:last)
+                    req.env[DATADOG_RAILS_ROUTE_ENV_KEY] = route
 
-                  routes.each do |route|
-                    if Instrumentation.dispatcher_route?(route)
-                      Instrumentation.set_http_route_tags(route.path.spec, req.env['SCRIPT_NAME'])
-                      break
-                    end
+                    http_route = route.path.spec.to_s
+                    http_route.delete_suffix!(FORMAT_SUFFIX)
+
+                    Instrumentation.set_http_route_tags(http_route, req.env[SCRIPT_NAME_KEY])
+
+                    break
                   end
 
                   result
@@ -62,13 +70,40 @@ module Datadog
                 def find_routes(req)
                   super do |match, parameters, route|
                     if Instrumentation.dispatcher_route?(route)
-                      Instrumentation.set_http_route_tags(route.path.spec, req.env['SCRIPT_NAME'])
+                      req.env[DATADOG_RAILS_ROUTE_ENV_KEY] = route
+
+                      http_route = route.path.spec.to_s
+                      http_route.delete_suffix!(FORMAT_SUFFIX)
+
+                      Instrumentation.set_http_route_tags(http_route, req.env[SCRIPT_NAME_KEY])
                     end
 
                     yield [match, parameters, route]
                   end
                 end
               end
+
+              # Since Rails 8.1, `Router#find_routes` was removed by inlining its body into `recognize`.
+              # https://github.com/rails/rails/commit/e533a32ddf06668dfa3dfbe9b665607e235b06ac
+              module RecognizeRouter
+                def recognize(req)
+                  # recognize modifies SCRIPT_NAME before yielding; capture it before super.
+                  original_script_name = req.env[SCRIPT_NAME_KEY]
+
+                  super do |route, parameters|
+                    if Instrumentation.dispatcher_route?(route)
+                      req.env[DATADOG_RAILS_ROUTE_ENV_KEY] = route
+
+                      http_route = route.path.spec.to_s
+                      http_route = http_route.delete_suffix(FORMAT_SUFFIX)
+
+                      Instrumentation.set_http_route_tags(http_route, original_script_name)
+                    end
+
+                    yield route, parameters
+                  end
+                end
+              end
             end
           end
         end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../patcher'
-require_relative 'instrumentation'
+require_relative "../../patcher"
+require_relative "instrumentation"
 
 module Datadog
   module Tracing
@@ -19,7 +19,9 @@ module Datadog
             end
 
             def patch
-              if ::ActionPack.gem_version >= Gem::Version.new('7.1')
+              if ::ActionPack.gem_version >= Gem::Version.new("8.1")
+                ::ActionDispatch::Journey::Router.prepend(ActionDispatch::Instrumentation::Journey::RecognizeRouter)
+              elsif ::ActionPack.gem_version >= Gem::Version.new("7.1")
                 ::ActionDispatch::Journey::Router.prepend(ActionDispatch::Instrumentation::Journey::LazyRouter)
               else
                 ::ActionDispatch::Journey::Router.prepend(ActionDispatch::Instrumentation::Journey::Router)

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

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

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

@@ -7,15 +7,17 @@ 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'
+          ENV_ENABLED = "DD_TRACE_ACTION_PACK_ENABLED"
           # @!visibility private
-          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'
+          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"
+          TAG_DB_RUNTIME = "rails.db.runtime"
+          TAG_VIEW_RUNTIME = "rails.view.runtime"
         end
       end
     end