datadog 2.12.0 → 2.22.0

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

@@ -42,7 +42,7 @@ module Datadog
               #
               # The tracer will try to find distributed headers in the order they are present in the list provided to this option.
               # The first format to have valid data present will be used.
-              #
+              # Baggage style is a special case, as it will always be extracted in addition if present.
               # @default `DD_TRACE_PROPAGATION_STYLE_EXTRACT` environment variable (comma-separated list),
               #   otherwise `['datadog','b3multi','b3']`.
               # @return [Array<String>]
@@ -53,6 +53,7 @@ module Datadog
                   [
                     Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG,
                     Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT,
+                    Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_BAGGAGE,
                   ]
                 )
                 o.after_set do |styles|
@@ -74,6 +75,7 @@ module Datadog
                 o.default [
                   Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG,
                   Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT,
+                  Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_BAGGAGE,
                 ]
                 o.after_set do |styles|
                   # Make values case-insensitive
@@ -91,9 +93,10 @@ module Datadog
               # @return [Array<String>]
               option :propagation_style do |o|
                 o.type :array
-                o.env [Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE, Configuration::Ext::Distributed::ENV_OTEL_PROPAGATION_STYLE]
+                # Note: Alias (DD_TRACE_PROPAGATION_STYLE) defined in supported-configurations.json
+                o.env Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE
                 o.default []
-                o.after_set do |styles|
+                o.after_set do |styles, _, precedence|
                   next if styles.empty?
 
                   # Make values case-insensitive
@@ -107,8 +110,8 @@ module Datadog
                       false
                     end
                   end
-                  set_option(:propagation_style_extract, styles)
-                  set_option(:propagation_style_inject, styles)
+                  set_option(:propagation_style_extract, styles, precedence: precedence)
+                  set_option(:propagation_style_inject, styles, precedence: precedence)
                 end
               end
 
@@ -131,13 +134,16 @@ module Datadog
               # @default `DD_TRACE_ENABLED` environment variable, otherwise `true`
               # @return [Boolean]
               option :enabled do |o|
-                o.env [Tracing::Configuration::Ext::ENV_ENABLED, Tracing::Configuration::Ext::ENV_OTEL_TRACES_EXPORTER]
+                # Note: Alias (OTEL_TRACES_EXPORTER) defined in supported-configurations.json
+                o.env Tracing::Configuration::Ext::ENV_ENABLED
                 o.default true
                 o.type :bool
                 o.env_parser do |value|
                   value = value&.downcase
                   # Tracing is disabled when OTEL_TRACES_EXPORTER is none or
                   # DD_TRACE_ENABLED is 0 or false.
+                  # DEV: The current implementation accepts all of the mentioned values
+                  # for both environment variables, which is incorrect.
                   if ['none', 'false', '0'].include?(value)
                     false
                   # Tracing is enabled when DD_TRACE_ENABLED is true or 1
@@ -168,6 +174,23 @@ module Datadog
                 o.setter { |header_tags, _| Configuration::HTTP::HeaderTags.new(header_tags) }
               end
 
+              # Comma-separated list of baggage keys that should be converted to span tags.
+              #
+              # Baggage keys matching the exact, case-sensitive names in this list will be converted
+              # to span tags with the prefix "baggage.".
+              #
+              # Special values:
+              # * Empty string ("") disables baggage tag conversion
+              # * Wildcard ("*") converts all baggage keys to span tags
+              #
+              # @default `DD_TRACE_BAGGAGE_TAG_KEYS` environment variable, otherwise `"user.id,session.id,account.id"`
+              # @return [Array<String>, Symbol, nil] processed baggage tag keys configuration
+              option :baggage_tag_keys do |o|
+                o.env Configuration::Ext::ENV_BAGGAGE_TAG_KEYS
+                o.type :array
+                o.default ['user.id', 'session.id', 'account.id']
+              end
+
               # Enable 128 bit trace id generation.
               #
               # @default `DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED` environment variable, otherwise `true`
@@ -186,7 +209,7 @@ module Datadog
               # It is not supported by our backend yet. Do not enable it.
               option :trace_id_128_bit_logging_enabled do |o|
                 o.env Tracing::Configuration::Ext::Correlation::ENV_TRACE_ID_128_BIT_LOGGING_ENABLED
-                o.default false
+                o.default true
                 o.type :bool
               end
 
@@ -249,6 +272,20 @@ module Datadog
                 o.type :bool
               end
 
+              # Forces the tracer to always send span events with the native span events format
+              # regardless of the agent support. This is useful in agent-less setups.
+              #
+              # When set to `nil`, the default, the agent will be queried for
+              # native span events support.
+              #
+              # @default `DD_TRACE_NATIVE_SPAN_EVENTS` environment variable, otherwise `false`
+              # @return [Boolean,nil]
+              option :native_span_events do |o|
+                o.env Tracing::Configuration::Ext::ENV_NATIVE_SPAN_EVENTS
+                o.default nil
+                o.type :bool, nilable: true
+              end
+
               # A custom sampler instance.
               # The object must respect the {Datadog::Tracing::Sampling::Sampler} interface.
               # @default `nil`
@@ -269,7 +306,8 @@ module Datadog
                 # @return [Float, nil]
                 option :default_rate do |o|
                   o.type :float, nilable: true
-                  o.env [Tracing::Configuration::Ext::Sampling::ENV_SAMPLE_RATE, Tracing::Configuration::Ext::Sampling::ENV_OTEL_TRACES_SAMPLER]
+                  # Note: Alias (OTEL_TRACES_SAMPLER) defined in supported-configurations.json
+                  o.env Tracing::Configuration::Ext::Sampling::ENV_SAMPLE_RATE
                   o.env_parser do |value|
                     # Parse the value as a float
                     next if value.nil?
@@ -288,7 +326,7 @@ module Datadog
                     when 'parentbased_always_off'
                       0.0
                     when 'parentbased_traceidratio'
-                      ENV.fetch(Tracing::Configuration::Ext::Sampling::OTEL_TRACES_SAMPLER_ARG, 1.0).to_f
+                      DATADOG_ENV.fetch(Configuration::Ext::Sampling::OTEL_TRACES_SAMPLER_ARG, 1.0).to_f
                     else
                       value.to_f
                     end
@@ -322,7 +360,7 @@ module Datadog
                 # @public_api
                 option :rules do |o|
                   o.type :string, nilable: true
-                  o.default { ENV.fetch(Configuration::Ext::Sampling::ENV_RULES, nil) }
+                  o.default { DATADOG_ENV.fetch(Configuration::Ext::Sampling::ENV_RULES, nil) }
                 end
 
                 # Single span sampling rules.
@@ -339,8 +377,8 @@ module Datadog
                 option :span_rules do |o|
                   o.type :string, nilable: true
                   o.default do
-                    rules = ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES]
-                    rules_file = ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE]
+                    rules = DATADOG_ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES]
+                    rules_file = DATADOG_ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE]
 
                     if rules
                       if rules_file

data/lib/datadog/tracing/context.rb

@@ -53,7 +53,7 @@ module Datadog
 
       # Creates a copy of the context, when forked.
       def fork_clone
-        forked_trace = @active_trace && @active_trace.fork_clone
+        forked_trace = @active_trace&.fork_clone
         self.class.new(trace: forked_trace)
       end
 
@@ -61,7 +61,7 @@ module Datadog
 
       def set_active_trace!(trace)
         # Don't retain finished traces
-        @active_trace = trace && !trace.finished? ? trace : nil
+        @active_trace = (trace && !trace.finished?) ? trace : nil
       end
     end
   end

data/lib/datadog/tracing/context_provider.rb

@@ -49,7 +49,7 @@ module Datadog
       # To support multiple tracers simultaneously, each {Datadog::Tracing::FiberLocalContext}
       # instance has its own fiber-local variable.
       def initialize
-        @key = "datadog_context_#{FiberLocalContext.next_instance_id}".to_sym
+        @key = :"datadog_context_#{FiberLocalContext.next_instance_id}"
 
         self.local = Context.new
       end

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

@@ -20,7 +20,7 @@ module Datadog
           module ClassMethods
             def span_options
               if configuration[:service_name]
-                { service: configuration[:service_name] }
+                {service: configuration[:service_name]}
               else
                 {}
               end

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

@@ -22,7 +22,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['actioncable'] && Gem.loaded_specs['actioncable'].version
+            Gem.loaded_specs['actioncable']&.version
           end
 
           def self.loaded?

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

@@ -23,7 +23,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['actionmailer'] && Gem.loaded_specs['actionmailer'].version
+            Gem.loaded_specs['actionmailer']&.version
           end
 
           def self.loaded?

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

@@ -42,7 +42,7 @@ 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
+            rescue => e
               Datadog.logger.error(e.message)
               Datadog::Core::Telemetry::Logger.report(e)
             end
@@ -68,6 +68,12 @@ 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?
@@ -81,7 +87,7 @@ module Datadog
               ensure
                 span.finish
               end
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.error(e.message)
               Datadog::Core::Telemetry::Logger.report(e)
             end
@@ -109,7 +115,7 @@ module Datadog
                 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
@@ -118,6 +124,15 @@ module Datadog
                   payload[:exception] = [e.class.name, e.message]
                   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 +146,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_dispatch/instrumentation.rb

@@ -9,9 +9,12 @@ module Datadog
         module ActionDispatch
           # Instrumentation for ActionDispatch components
           module Instrumentation
+            SCRIPT_NAME_KEY = 'SCRIPT_NAME'
+            FORMAT_SUFFIX = '(.:format)'
+
             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 +22,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 +43,17 @@ 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)
+                    http_route = route.path.spec.to_s
+                    http_route.delete_suffix!(FORMAT_SUFFIX)
 
-                  routes.each do |route|
-                    if Instrumentation.dispatcher_route?(route)
-                      Instrumentation.set_http_route_tags(route.path.spec, req.env['SCRIPT_NAME'])
-                      break
-                    end
+                    Instrumentation.set_http_route_tags(http_route, req.env[SCRIPT_NAME_KEY])
+
+                    break
                   end
 
                   result
@@ -62,7 +66,10 @@ 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'])
+                      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]

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

@@ -16,6 +16,8 @@ module Datadog
           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

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

@@ -23,7 +23,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['actionpack'] && Gem.loaded_specs['actionpack'].version
+            Gem.loaded_specs['actionpack']&.version
           end
 
           def self.loaded?

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

@@ -46,7 +46,7 @@ module Datadog
               Contrib::Analytics.set_measured(span)
 
               record_exception(span, payload)
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

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

@@ -29,10 +29,10 @@ module Datadog
 
             def set_common_tags(span, payload)
               adapter_name = if payload[:adapter].is_a?(Class)
-                               payload[:adapter].name
-                             else
-                               payload[:adapter].class.name
-                             end
+                payload[:adapter].name
+              else
+                payload[:adapter].class.name
+              end
               span.set_tag(Ext::TAG_ADAPTER, adapter_name)
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
@@ -44,10 +44,10 @@ module Datadog
               span.set_tag(Ext::TAG_JOB_EXECUTIONS, job.executions) if job.respond_to?(:executions)
 
               job_scheduled_at = if job.respond_to?(:scheduled_at)
-                                   job.scheduled_at
-                                 elsif job.respond_to?(:enqueued_at)
-                                   job.enqueued_at
-                                 end
+                job.scheduled_at
+              elsif job.respond_to?(:enqueued_at)
+                job.enqueued_at
+              end
               span.set_tag(Ext::TAG_JOB_SCHEDULED_AT, Time.at(job_scheduled_at)) if job_scheduled_at
             end
           end

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

@@ -39,7 +39,7 @@ module Datadog
 
               set_common_tags(span, payload)
               span.set_tag(Ext::TAG_JOB_ERROR, payload[:error])
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

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

@@ -38,7 +38,7 @@ module Datadog
               end
 
               set_common_tags(span, payload)
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

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

@@ -38,7 +38,7 @@ module Datadog
               end
 
               set_common_tags(span, payload)
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

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

@@ -40,7 +40,7 @@ module Datadog
               set_common_tags(span, payload)
               span.set_tag(Ext::TAG_JOB_ERROR, payload[:error])
               span.set_tag(Ext::TAG_JOB_RETRY_WAIT, payload[:wait])
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

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

@@ -38,7 +38,7 @@ module Datadog
               end
 
               set_common_tags(span, payload)
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

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

@@ -39,7 +39,7 @@ module Datadog
 
               set_common_tags(span, payload)
               span.set_tag(Ext::TAG_JOB_ERROR, payload[:error])
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

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

@@ -22,7 +22,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['activejob'] && Gem.loaded_specs['activejob'].version
+            Gem.loaded_specs['activejob']&.version
           end
 
           def self.loaded?

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

@@ -34,7 +34,7 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_RENDER)
 
               set_common_tags(span, payload)
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

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

@@ -18,9 +18,9 @@ module Datadog
 
             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'].version < Gem::Version.new('0.10')
                 )
             end
 
@@ -36,7 +36,7 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SERIALIZE)
 
               set_common_tags(span, payload)
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

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

@@ -18,8 +18,7 @@ module Datadog
           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_record/configuration/resolver.rb

@@ -75,7 +75,7 @@ module Datadog
               # hence provide a succinct summary for the error logging.
               #
               Datadog.logger.error(
-                'Failed to resolve ActiveRecord database configuration. '\
+                'Failed to resolve ActiveRecord database configuration. ' \
                 "Cause: #{e.class.name} Source: #{Array(e.backtrace).first}"
               )
               Core::Telemetry::Logger.report(e, description: 'Failed to resolve ActiveRecord database configuration')

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

@@ -48,7 +48,7 @@ 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
+            rescue => e
               Datadog.logger.error(e.message)
               Datadog::Core::Telemetry::Logger.report(e)
             end

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

@@ -35,10 +35,10 @@ module Datadog
               settings = Datadog.configuration.tracing[:active_record, config]
               adapter_name = Contrib::Utils::Database.normalize_vendor(config[:adapter])
               service_name = if settings.service_name != Contrib::Utils::Database::VENDOR_DEFAULT
-                               settings.service_name
-                             else
-                               adapter_name
-                             end
+                settings.service_name
+              else
+                adapter_name
+              end
 
               span.name = "#{adapter_name}.query"
               span.service = service_name
@@ -68,7 +68,7 @@ module Datadog
               span.set_tag(Ext::TAG_DB_CACHED, cached) if cached
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, config[:host]) if config[:host]
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, config[:port]) if config[:port]
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.error(e.message)
               Datadog::Core::Telemetry::Logger.report(e)
             end

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

@@ -27,7 +27,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['activerecord'] && Gem.loaded_specs['activerecord'].version
+            Gem.loaded_specs['activerecord']&.version
           end
 
           def self.loaded?
@@ -57,7 +57,7 @@ module Datadog
           end
 
           def reset_resolver_cache
-            @resolver&.reset_cache
+            @resolver&.reset_cache if defined?(@resolver)
           end
 
           Contrib::Component.register('activerecord') do |_config|

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

@@ -39,17 +39,17 @@ module Datadog
             return default_connection_config if connection.nil? && connection_id.nil?
 
             conn = if !connection.nil?
-                     # Since Rails 6.0, the connection object
-                     # is directly available.
-                     connection
-                   else
-                     # For Rails < 6.0, only the `connection_id`
-                     # is available. We have to find the connection
-                     # object from it.
-                     connection_from_id(connection_id)
-                   end
+              # Since Rails 6.0, the connection object
+              # is directly available.
+              connection
+            else
+              # For Rails < 6.0, only the `connection_id`
+              # is available. We have to find the connection
+              # object from it.
+              connection_from_id(connection_id)
+            end
 
-            if conn && conn.instance_variable_defined?(:@config)
+            if conn&.instance_variable_defined?(:@config)
               conn.instance_variable_get(:@config)
             else
               EMPTY_CONFIG
@@ -102,14 +102,14 @@ module Datadog
             return @default_connection_config if instance_variable_defined?(:@default_connection_config)
 
             current_connection_name = if ::ActiveRecord::Base.respond_to?(:connection_specification_name)
-                                        ::ActiveRecord::Base.connection_specification_name
-                                      else
-                                        ::ActiveRecord::Base
-                                      end
+              ::ActiveRecord::Base.connection_specification_name
+            else
+              ::ActiveRecord::Base
+            end
 
             connection_pool = ::ActiveRecord::Base.connection_handler.retrieve_connection_pool(current_connection_name)
             connection_pool.nil? ? EMPTY_CONFIG : (@default_connection_config = db_config(connection_pool))
-          rescue StandardError
+          rescue
             EMPTY_CONFIG
           end