datadog 2.30.0 → 2.31.0

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

@@ -40,7 +40,7 @@ module Datadog
               set_common_tags(span, payload)
               span.set_tag(Ext::TAG_JOB_ERROR, payload[:error])
             rescue => e
-              Datadog.logger.debug(e.message)
+              Datadog.logger.debug { "#{e.class}: #{e}" }
             end
           end
         end

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

@@ -35,7 +35,7 @@ module Datadog
 
               set_common_tags(span, payload)
             rescue => e
-              Datadog.logger.debug(e.message)
+              Datadog.logger.debug { "#{e.class}: #{e}" }
             end
           end
         end

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

@@ -37,7 +37,7 @@ module Datadog
 
               set_common_tags(span, payload)
             rescue => e
-              Datadog.logger.debug(e.message)
+              Datadog.logger.debug { "#{e.class}: #{e}" }
             end
           end
         end

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

@@ -49,7 +49,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 => e
-              Datadog.logger.error(e.message)
+              Datadog.logger.error("#{e.class}: #{e}")
               Datadog::Core::Telemetry::Logger.report(e)
             end
           end

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

@@ -69,7 +69,7 @@ module Datadog
               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 => e
-              Datadog.logger.error(e.message)
+              Datadog.logger.error("#{e.class}: #{e}")
               Datadog::Core::Telemetry::Logger.report(e)
             end
           end

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

@@ -77,7 +77,7 @@ module Datadog
               # in case.
               Datadog.logger.debug(
                 "connection_id #{connection_id} does not represent a valid object. " \
-                        "Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+                        "Cause: #{e.class}: #{e} Source: #{Array(e.backtrace).first}"
               )
             end
           else

data/lib/datadog/tracing/contrib/active_support/cache/events/cache.rb

@@ -94,7 +94,7 @@ module Datadog
                   set_cache_key(span, key, mapping[:multi_key])
                 end
               rescue => e
-                Datadog.logger.error(e.message)
+                Datadog.logger.error("#{e.class}: #{e}")
                 Datadog::Core::Telemetry::Logger.report(e)
               end
 

data/lib/datadog/tracing/contrib/active_support/notifications/subscription.rb

@@ -125,7 +125,7 @@ module Datadog
                 @block&.call(span, name, id, payload)
               rescue => e
                 Datadog.logger.debug(
-                  "ActiveSupport::Notifications handler for '#{name}' failed: #{e.class.name} #{e.message}"
+                  "ActiveSupport::Notifications handler for '#{name}' failed: #{e.class}: #{e}"
                 )
               end
             end
@@ -147,7 +147,7 @@ module Datadog
                   callback.call(event, key, *args)
                 rescue => e
                   Datadog.logger.debug(
-                    "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.class.name} #{e.message}"
+                    "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.class}: #{e}"
                   )
                 end
               end

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

@@ -90,7 +90,7 @@ module Datadog
 
             Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
           rescue => e
-            Datadog.logger.error(e.message)
+            Datadog.logger.error("#{e.class}: #{e}")
             Datadog::Core::Telemetry::Logger.report(e)
           end
           # rubocop:enable Metrics/MethodLength

data/lib/datadog/tracing/contrib/configurable.rb

@@ -45,8 +45,11 @@ module Datadog
             config = if matcher == :default
               default_configuration
             else
-              # Get or add the configuration
-              resolver.get(matcher) || resolver.add(matcher, new_configuration)
+              resolver.get(matcher) || begin
+                new_config = new_configuration
+                set_integration_settings_path!(new_config)
+                resolver.add(matcher, new_config)
+              end
             end
 
             # Apply the settings
@@ -67,11 +70,23 @@ module Datadog
           #
           # @return [Datadog::Tracing::Contrib::Configuration::Settings] the memoized integration-specific settings object
           def default_configuration
-            @default_configuration ||= new_configuration
+            @default_configuration ||= begin
+              configuration = new_configuration
+              set_integration_settings_path!(configuration)
+              configuration
+            end
           end
 
           protected
 
+          def set_integration_settings_path!(configuration)
+            # name is called from Registerable::InstanceMethods#name
+            # which is set by register_as
+            return unless respond_to?(:name)
+
+            configuration.class.settings_path = "tracing.#{name}" if configuration.class.respond_to?(:settings_path=)
+          end
+
           # Returns a new configuration object for this integration.
           #
           # This method normally needs to be overridden for each integration

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

@@ -98,7 +98,7 @@ module Datadog
                 Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
               rescue => e
                 # TODO: Refactor the code to streamline the execution without ensure
-                Datadog.logger.error(e.message)
+                Datadog.logger.error("#{e.class}: #{e}")
                 Datadog::Core::Telemetry::Logger.report(e)
               ensure
                 # the call is still executed

data/lib/datadog/tracing/contrib/excon/middleware.rb

@@ -40,7 +40,7 @@ module Datadog
                 span
               end
             rescue => e
-              Datadog.logger.debug(e.message)
+              Datadog.logger.debug { "#{e.class}: #{e}" }
             end
 
             @stack.request_call(datum)
@@ -180,7 +180,7 @@ module Datadog
               end
             end
           rescue => e
-            Datadog.logger.debug(e.message)
+            Datadog.logger.debug { "#{e.class}: #{e}" }
           end
 
           def propagate!(trace, span, datum)

data/lib/datadog/tracing/contrib/faraday/middleware.rb

@@ -83,7 +83,7 @@ module Datadog
 
             Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
           rescue => e
-            Datadog.logger.error(e.message)
+            Datadog.logger.error("#{e.class}: #{e}")
             Datadog::Core::Telemetry::Logger.report(e)
           end
           # rubocop:enable Metrics/AbcSize
@@ -98,7 +98,7 @@ module Datadog
               Datadog.configuration.tracing.header_tags.response_tags(env[:response_headers])
             )
           rescue => e
-            Datadog.logger.error(e.message)
+            Datadog.logger.error("#{e.class}: #{e}")
             Datadog::Core::Telemetry::Logger.report(e)
           end
           # rubocop:enable Metrics/AbcSize

data/lib/datadog/tracing/contrib/grape/endpoint.rb

@@ -77,7 +77,7 @@ module Datadog
 
               Thread.current[KEY_RUN] = true
             rescue => e
-              Datadog.logger.error(e.message)
+              Datadog.logger.error("#{e.class}: #{e}")
               Datadog::Core::Telemetry::Logger.report(e)
             end
 
@@ -121,7 +121,7 @@ module Datadog
                 span.finish(finish)
               end
             rescue => e
-              Datadog.logger.error(e.message)
+              Datadog.logger.error("#{e.class}: #{e}")
               Datadog::Core::Telemetry::Logger.report(e)
             end
 
@@ -165,7 +165,7 @@ module Datadog
 
               Thread.current[KEY_RENDER] = true
             rescue => e
-              Datadog.logger.error(e.message)
+              Datadog.logger.error("#{e.class}: #{e}")
               Datadog::Core::Telemetry::Logger.report(e)
             end
 
@@ -190,7 +190,7 @@ module Datadog
                 span.finish(finish)
               end
             rescue => e
-              Datadog.logger.error(e.message)
+              Datadog.logger.error("#{e.class}: #{e}")
               Datadog::Core::Telemetry::Logger.report(e)
             end
 
@@ -229,7 +229,7 @@ module Datadog
                 span.finish(finish)
               end
             rescue => e
-              Datadog.logger.error(e.message)
+              Datadog.logger.error("#{e.class}: #{e}")
               Datadog::Core::Telemetry::Logger.report(e)
             end
 

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

@@ -37,7 +37,7 @@ module Datadog
 
                 if Tracing::Distributed::PropagationPolicy.enabled?(
                   pin_config: client_config,
-                  global_config: Datadog.configuration.tracing[:http],
+                  global_config: request_options,
                   trace: trace
                 )
                   Contrib::HTTP.inject(trace, req)

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

@@ -35,7 +35,7 @@ module Datadog
                     global_config: Datadog.configuration.tracing[:httprb],
                     trace: trace
                   )
-                    Contrib::HTTP.inject(trace, req)
+                    Contrib::HTTP.inject(trace, req.headers)
                   end
 
                   # Add additional request specific tags to the span.

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

@@ -84,7 +84,7 @@ module Datadog
                 span.resource = "#{method} #{quantized_url}"
                 Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
               rescue => e
-                Datadog.logger.error(e.message)
+                Datadog.logger.error("#{e.class}: #{e}")
                 Datadog::Core::Telemetry::Logger.report(e)
                 # TODO: Refactor the code to streamline the execution without ensure
               ensure

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

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

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

@@ -6,7 +6,6 @@ require_relative 'framework'
 require_relative 'log_injection'
 require_relative 'middlewares'
 require_relative 'runner'
-require_relative '../../../core/contrib/rails/utils'
 require_relative '../semantic_logger/patcher'
 
 module Datadog

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

@@ -86,7 +86,7 @@ module Datadog
                 # Reads one more byte than the limit to allow us to check if the source exceeds the limit.
                 source = File.read(file, MAX_TAG_VALUE_SIZE + 1)
               rescue => e
-                Datadog.logger.debug("Failed to read file '#{file}' for Rails runner: #{e.message}")
+                Datadog.logger.debug { "Failed to read file '#{file}' for Rails runner: #{e.class}: #{e}" }
               end
 
               Tracing.trace(

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

@@ -66,7 +66,7 @@ module Datadog
               span.set_tag(Ext::TAG_TASK_ARG_NAMES, arg_names)
               span.set_tag(Ext::TAG_INVOKE_ARGS, quantize_args(args)) unless args.nil?
             rescue => e
-              Datadog.logger.debug("Error while tracing Rake invoke: #{e.class.name} #{e.message}")
+              Datadog.logger.debug { "Error while tracing Rake invoke: #{e.class}: #{e}" }
             end
 
             def annotate_execute!(span, args)
@@ -75,7 +75,7 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_EXECUTE)
               span.set_tag(Ext::TAG_EXECUTE_ARGS, quantize_args(args.to_hash)) unless args.nil?
             rescue => e
-              Datadog.logger.debug("Error while tracing Rake execute: #{e.class.name} #{e.message}")
+              Datadog.logger.debug { "Error while tracing Rake execute: #{e.class}: #{e}" }
             end
 
             def quantize_args(args)

data/lib/datadog/tracing/contrib/redis/tags.rb

@@ -47,7 +47,7 @@ module Datadog
 
               Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
             rescue => e
-              Datadog.logger.error(e.message)
+              Datadog.logger.error("#{e.class}: #{e}")
               Datadog::Core::Telemetry::Logger.report(e)
             end
 

data/lib/datadog/tracing/contrib/status_range_matcher.rb

@@ -27,6 +27,10 @@ module Datadog
             end
           end
         end
+
+        def to_s
+          @ranges.map { |range| range.is_a?(Range) ? "#{range.begin}-#{range.end}" : range.to_s }.join(',')
+        end
       end
     end
   end

data/lib/datadog/tracing/contrib/stripe/request.rb

@@ -55,7 +55,7 @@ module Datadog
             span.set_tag(Ext::TAG_REQUEST_PATH, event.path)
             span.set_tag(Ext::TAG_REQUEST_NUM_RETRIES, event.num_retries.to_s)
           rescue => e
-            Datadog.logger.debug(e.message)
+            Datadog.logger.debug { "#{e.class}: #{e}" }
           end
 
           def configuration

data/lib/datadog/tracing/distributed/datadog.rb

@@ -140,8 +140,9 @@ module Datadog
         rescue => e
           set_tags_propagation_error(reason: 'encoding_error')
           ::Datadog.logger.warn(
-            "Failed to inject x-datadog-tags: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+            "Failed to inject x-datadog-tags: #{e.class}: #{e} at #{Array(e.backtrace).first}"
           )
+          nil
         end
 
         # Import `x-datadog-tags` tags as trace distributed tags.
@@ -166,8 +167,9 @@ module Datadog
         rescue => e
           set_tags_propagation_error(reason: 'decoding_error')
           ::Datadog.logger.warn(
-            "Failed to extract x-datadog-tags: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+            "Failed to extract x-datadog-tags: #{e.class}: #{e} at #{Array(e.backtrace).first}"
           )
+          nil
         end
 
         def set_tags_propagation_error(reason:)

data/lib/datadog/tracing/event.rb

@@ -62,7 +62,7 @@ module Datadog
           block.call(*args)
         rescue => e
           Datadog.logger.debug do
-            "Error while handling '#{name}' event with '#{block}': #{e.class.name} #{e.message} " \
+            "Error while handling '#{name}' event with '#{block}': #{e.class}: #{e} " \
             "at #{Array(e.backtrace).first}"
           end
         end

data/lib/datadog/tracing/remote.rb

@@ -43,7 +43,7 @@ module Datadog
 
           Datadog.send(:components).telemetry.client_configuration_change!(env_vars)
         rescue => e
-          content.errored("#{e.class.name} #{e.message}: #{Array(e.backtrace).join("\n")}")
+          content.errored("#{e.class}: #{e}: #{Array(e.backtrace).join("\n")}")
         end
 
         def receivers(_telemetry)

data/lib/datadog/tracing/sampling/ext.rb

@@ -47,6 +47,8 @@ module Datadog
           MANUAL = '-4'
           # Formerly AppSec.
           ASM = '-5'
+          # AI Guard.
+          AI_GUARD = '-13'
           # Dynamically configured rule, explicitly created by the user.
           REMOTE_USER_RULE = '-11'
           # Dynamically configured  rule, automatically generated by Datadog.

data/lib/datadog/tracing/sampling/priority_sampler.rb

@@ -77,6 +77,19 @@ module Datadog
           end
         end
 
+        def reconsider_sample_resource!(trace)
+          return unless @priority_sampler.respond_to?(:reconsider_sample_resource!)
+
+          preserving_sampling(trace) do
+            @priority_sampler.reconsider_sample_resource!(trace)
+          end
+        end
+
+        def resource_sampling?
+          @priority_sampler.respond_to?(:resource_sampling?) &&
+            @priority_sampler.resource_sampling?
+        end
+
         # (see Datadog::Tracing::Sampling::RateByServiceSampler#update)
         def update(rate_by_service, decision: nil)
           @priority_sampler.update(rate_by_service, decision: decision)

data/lib/datadog/tracing/sampling/rule.rb

@@ -34,7 +34,7 @@ module Datadog
           @matcher.match?(trace)
         rescue => e
           Datadog.logger.error(
-            "Matcher failed. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+            "Matcher failed. Cause: #{e.class}: #{e} Source: #{Array(e.backtrace).first}"
           )
           Datadog::Core::Telemetry::Logger.report(e, description: 'Matcher failed')
           nil

data/lib/datadog/tracing/sampling/rule_sampler.rb

@@ -50,6 +50,7 @@ module Datadog
             # TODO: Simplify .tags access, as `Tracer#tags` can't be arbitrarily changed anymore
             RateByServiceSampler.new(1.0, env: -> { Tracing.send(:tracer).tags['env'] })
           end
+          @reconsider_sample_resource_enabled = @rules.any? { |rule| resource_rule?(rule) }
         end
 
         def self.parse(rules, rate_limit, default_sample_rate)
@@ -84,7 +85,7 @@ module Datadog
           new(parsed_rules, rate_limit: rate_limit, default_sample_rate: default_sample_rate)
         rescue => e
           Datadog.logger.warn do
-            "Could not parse trace sampling rules '#{rules}': #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+            "Could not parse trace sampling rules '#{rules}': #{e.class}: #{e} at #{Array(e.backtrace).first}"
           end
 
           nil
@@ -103,6 +104,18 @@ module Datadog
           trace.sampled = sampled
         end
 
+        def reconsider_sample_resource!(trace)
+          rule = @rules.find { |r| resource_rule?(r) && r.match?(trace) }
+          return if rule.nil?
+
+          reconsider_matching_rule!(trace, rule)
+        end
+
+        # Do any rules match on the resource name?
+        def resource_sampling?
+          @reconsider_sample_resource_enabled
+        end
+
         # @!visibility private
         def update(*args, **kwargs)
           return false unless @default_sampler.respond_to?(:update)
@@ -117,32 +130,10 @@ module Datadog
 
           return yield(trace) if rule.nil?
 
-          sampled = rule.sample!(trace)
-          sample_rate = rule.sample_rate(trace)
-
-          set_priority(trace, sampled)
-          set_rule_metrics(trace, sample_rate)
-
-          return false unless sampled
-
-          rate_limiter.allow?.tap do |allowed|
-            set_priority(trace, allowed)
-            set_limiter_metrics(trace, rate_limiter.effective_rate)
-
-            provenance = case rule.provenance
-            when Rule::PROVENANCE_REMOTE_USER
-              Ext::Decision::REMOTE_USER_RULE
-            when Rule::PROVENANCE_REMOTE_DYNAMIC
-              Ext::Decision::REMOTE_DYNAMIC_RULE
-            else
-              Ext::Decision::TRACE_SAMPLING_RULE
-            end
-
-            trace.set_tag(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER, provenance)
-          end
+          apply_rule!(trace, rule)
         rescue => e
           Datadog.logger.error(
-            "Rule sampling failed. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+            "Rule sampling failed. Cause: #{e.class}: #{e} Source: #{Array(e.backtrace).first}"
           )
           Datadog::Core::Telemetry::Logger.report(e, description: 'Rule sampling failed')
 
@@ -166,6 +157,44 @@ module Datadog
         def set_limiter_metrics(trace, limiter_rate)
           trace.rate_limiter_rate = limiter_rate
         end
+
+        def apply_rule!(trace, rule)
+          sampled = rule.sample!(trace)
+          sample_rate = rule.sample_rate(trace)
+
+          set_priority(trace, sampled)
+          set_rule_metrics(trace, sample_rate)
+
+          return false unless sampled
+
+          rate_limiter.allow?.tap do |allowed|
+            set_priority(trace, allowed)
+            set_limiter_metrics(trace, rate_limiter.effective_rate)
+            trace.set_tag(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER, provenance_for(rule))
+          end
+        end
+
+        def provenance_for(rule)
+          case rule.provenance
+          when Rule::PROVENANCE_REMOTE_USER
+            Ext::Decision::REMOTE_USER_RULE
+          when Rule::PROVENANCE_REMOTE_DYNAMIC
+            Ext::Decision::REMOTE_DYNAMIC_RULE
+          else
+            Ext::Decision::TRACE_SAMPLING_RULE
+          end
+        end
+
+        def resource_rule?(rule)
+          matcher = rule.matcher
+          matcher.respond_to?(:resource) && matcher.resource != Matcher::MATCH_ALL
+        end
+
+        def reconsider_matching_rule!(trace, rule)
+          trace.agent_sample_rate = nil
+          trace.clear_tag(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER)
+          apply_rule!(trace, rule)
+        end
       end
     end
   end

data/lib/datadog/tracing/sampling/span/rule_parser.rb

@@ -29,7 +29,7 @@ module Datadog
               rescue => e
                 Datadog.logger.warn(
                   "Error parsing Span Sampling Rules `#{rules.inspect}`: " \
-                  "#{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+                  "#{e.class}: #{e} at #{Array(e.backtrace).first}"
                 )
                 return nil
               end

data/lib/datadog/tracing/span_operation.rb

@@ -166,7 +166,7 @@ module Datadog
             #   end its execution (either due to a system error or graceful shutdown).
             # @type var e: Exception?
             # Steep: https://github.com/soutaro/steep/issues/919
-            return_value = yield(self) unless e && !e.is_a?(StandardError) # steep:ignore FallbackAny
+            return_value = yield(self) unless e && !e.is_a?(StandardError)
           end
         # rubocop:disable Lint/RescueException
         # Here we really want to catch *any* exception, not only StandardError,