datadog 2.40.0 → 2.41.0

data/lib/datadog/core/remote/client.rb

@@ -185,7 +185,7 @@ module Datadog
               is_agent: false,
               client_tracer: client_tracer,
               # base64 is needed otherwise the Go agent fails with an unmarshal error
-              capabilities: @capabilities.base64_capabilities
+              capabilities: @capabilities.base64_capabilities,
             },
             cached_target_files: state.cached_target_files,
           }

data/lib/datadog/core/remote/configuration/repository.rb

@@ -111,9 +111,9 @@ module Datadog
                   hashes: content.hashes.map do |algorithm, hexdigest|
                     {
                       algorithm: algorithm,
-                      hash: hexdigest
+                      hash: hexdigest,
                     }
-                  end
+                  end,
                 }
               end
             end

data/lib/datadog/core/telemetry/configuration_value.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Core
+    module Telemetry
+      module ConfigurationValue
+        module_function
+
+        def convert(value)
+          case value
+          when Integer, String, true, false, nil
+            value
+          when Float
+            value.finite? ? value : value.to_s
+          when Hash
+            value.map { |key, entry_value| "#{key}:#{entry_value}" }.join(",")
+          when Array
+            value.join(",")
+          when Module
+            value.name.to_s
+          else
+            implements_to_s = begin
+              value.method(:to_s).owner != Kernel
+            rescue NameError
+              false
+            end
+
+            if implements_to_s
+              value.to_s
+            else
+              value.class.to_s
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/core/telemetry/event/app_client_configuration_change.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "base"
+require_relative "../configuration_value"
 
 module Datadog
   module Core
@@ -27,10 +28,11 @@ module Datadog
           def configuration
             config = Datadog.configuration
 
+            # @type var res: Array[telemetry_configuration]
             res = @changes.map do |name, value|
               {
                 name: name,
-                value: value,
+                value: Telemetry::ConfigurationValue.convert(value),
                 origin: @origin,
                 seq_id: Configuration::Option::Precedence::REMOTE_CONFIGURATION.numeric.next,
               }

data/lib/datadog/core/telemetry/event/app_endpoints_loaded.rb

@@ -20,7 +20,7 @@ module Datadog
           def payload
             {
               is_first: @is_first,
-              endpoints: @endpoints
+              endpoints: @endpoints,
             }
           end
         end

data/lib/datadog/core/telemetry/event/app_started.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "base"
+require_relative "../configuration_value"
 
 module Datadog
   module Core
@@ -65,7 +66,7 @@ module Datadog
                 # actually enabled by env var or by implicit enablement via
                 # remote config.
                 enabled: components.dynamic_instrumentation&.started? || false,
-              }
+              },
             }
 
             if (unsupported_reason = Datadog::Profiling.unsupported_reason)
@@ -214,23 +215,9 @@ module Datadog
           end
 
           def to_telemetry_value(value)
-            # TODO: Add float if telemetry starts accepting it
-            case value
-            when Integer, String, true, false, nil
-              value
-            when Hash
-              value.map { |key, entry_value| "#{key}:#{entry_value}" }.join(",")
-            when Array
-              value.join(",")
-            when Module
-              value.name.to_s
-            else
-              if implements_to_s?(value)
-                value.to_s
-              else
-                value.class.to_s
-              end
-            end
+            return value.to_s if value.is_a?(Float)
+
+            Telemetry::ConfigurationValue.convert(value)
           end
 
           def install_signature(settings)
@@ -280,12 +267,6 @@ module Datadog
             parent_setting = settings.dig(*split_option)
             parent_setting.send(:resolve_option, option_name.to_sym)
           end
-
-          def implements_to_s?(value)
-            value.method(:to_s).owner != Kernel
-          rescue NameError
-            false
-          end
         end
       end
     end

data/lib/datadog/core/telemetry/event/generate_metrics.rb

@@ -23,7 +23,7 @@ module Datadog
           def payload
             {
               namespace: @namespace,
-              series: @metric_series.map(&:to_h)
+              series: @metric_series.map(&:to_h),
             }
           end
 

data/lib/datadog/core/telemetry/event/log.rb

@@ -52,8 +52,8 @@ module Datadog
                   level: @level,
                   stack_trace: @stack_trace,
                   count: @count,
-                }.compact
-              ]
+                }.compact,
+              ],
             }
           end
 

data/lib/datadog/core/telemetry/metric.rb

@@ -37,7 +37,7 @@ module Datadog
               points: values,
               type: type,
               tags: tags,
-              common: common
+              common: common,
             }
           end
 
@@ -179,7 +179,7 @@ module Datadog
               metric: name,
               points: values,
               tags: tags,
-              common: common
+              common: common,
             }
           end
         end

data/lib/datadog/core/telemetry/request.rb

@@ -50,7 +50,7 @@ module Datadog
               runtime_version: Core::Environment::Ext::ENGINE_VERSION,
               service_name: config.service,
               service_version: config.version,
-              tracer_version: tracer_version
+              tracer_version: tracer_version,
             }
 
             tag_process_tags!(app, config)
@@ -64,7 +64,7 @@ module Datadog
               hostname: Core::Environment::Platform.hostname,
               kernel_name: Core::Environment::Platform.kernel_name,
               kernel_release: Core::Environment::Platform.kernel_release,
-              kernel_version: Core::Environment::Platform.kernel_version
+              kernel_version: Core::Environment::Platform.kernel_version,
             }
           end
 

data/lib/datadog/core/transport/http.rb

@@ -61,7 +61,7 @@ module Datadog
             Core::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER_VENDOR =>
               Core::Environment::Ext::LANG_ENGINE,
             Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION =>
-              Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION
+              Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION,
           }.tap do |headers|
             # Add application container info
             headers.merge!(Core::Environment::Container.to_headers)

data/lib/datadog/core/transport/transport.rb

@@ -69,7 +69,7 @@ module Datadog
 
           @current_api_id = api_id
           client_class = self.class.http_client_class || Core::Transport::HTTP::Client
-          @client = client_class.new(current_api, logger: logger) # steep:ignore
+          @client = client_class.new(current_api, logger: logger)
         end
 
         def downgrade?(response)

data/lib/datadog/core/utils/at_fork_monkey_patch.rb

@@ -6,14 +6,30 @@ module Datadog
       # Monkey patches `Kernel#fork` and similar functions, adding an `at_fork` callback mechanism which
       # is used to restart observability after the VM forks (e.g. in multiprocess Ruby apps).
       module AtForkMonkeyPatch
-        AT_FORK_BEFORE_BLOCKS = [] # rubocop:disable Style/MutableConstant -- Used to store blocks to run, mutable by design.
-        private_constant :AT_FORK_BEFORE_BLOCKS
+        class Callback
+          attr_reader :block, :group
 
-        AT_FORK_PARENT_BLOCKS = [] # rubocop:disable Style/MutableConstant -- Used to store blocks to run, mutable by design.
-        private_constant :AT_FORK_PARENT_BLOCKS
+          def initialize(block, group = nil)
+            @block = block
+            @group = group
+            freeze
+          end
+        end
+        private_constant :Callback
+
+        EMPTY_AT_FORK_BLOCKS = {
+          before: [].freeze,
+          parent: [].freeze,
+          child: [].freeze,
+        }.freeze
+        private_constant :EMPTY_AT_FORK_BLOCKS
+
+        @at_fork_blocks = EMPTY_AT_FORK_BLOCKS
 
-        AT_FORK_CHILD_BLOCKS = [] # rubocop:disable Style/MutableConstant -- Used to store blocks to run, mutable by design.
-        private_constant :AT_FORK_CHILD_BLOCKS
+        # Serializes copy-on-write registry updates. Fork dispatch only reads the
+        # latest immutable registry reference and never acquires this mutex.
+        AT_FORK_REGISTRY_MUTEX = Mutex.new
+        private_constant :AT_FORK_REGISTRY_MUTEX
 
         def self.supported?
           Process.respond_to?(:fork)
@@ -37,9 +53,38 @@ module Datadog
           true
         end
 
-        def self.run_at_fork_blocks(stage)
-          blocks_for(stage).each(&:call)
+        # Runs the callbacks copied for one fork lifecycle. Before callbacks
+        # stop at the first failure; parent and child callbacks all run before
+        # the first failure is re-raised.
+        def self.run_at_fork_blocks(stage, snapshot:, started: nil)
+          callbacks = blocks_for(snapshot, stage)
+          if stage == :before
+            return callbacks.each do |callback|
+              started[callback.group] = true if started && callback.group
+              callback.block.call
+            end
+          end
+
+          error = nil
+          callbacks.each do |callback|
+            next if started && callback.group && !started.key?(callback.group)
+
+            callback.block.call
+          rescue Exception => e # rubocop:disable Lint/RescueException -- finish cleanup, then re-raise the first failure
+            error ||= e
+          end
+          raise error if error
+        end
+
+        def self.run_parent_cleanup(snapshot, started, fork_error)
+          run_at_fork_blocks(:parent, snapshot: snapshot, started: started)
+        rescue Exception => cleanup_error # rubocop:disable Lint/RescueException -- preserve the original fork failure
+          Datadog.logger.warn do
+            "Parent at-fork cleanup failed while handling #{fork_error.class}: " \
+              "#{cleanup_error.class}: #{cleanup_error.message}"
+          end
         end
+        private_class_method :run_parent_cleanup
 
         # Registers a block to run at the given fork +stage+ (+:before+,
         # +:parent+, or +:child+).
@@ -49,26 +94,63 @@ module Datadog
         def self.at_fork(stage, &block)
           raise(ArgumentError, "Missing block argument") unless block
 
-          blocks_for(stage) << block
+          AT_FORK_REGISTRY_MUTEX.synchronize do
+            current = @at_fork_blocks
+            @at_fork_blocks = current.merge(
+              stage => (blocks_for(current, stage) + [Callback.new(block)]).freeze
+            ).freeze
+          end
 
           block
         end
 
+        # Registers one before/parent/child callback triplet atomically relative
+        # to the snapshots taken by fork dispatch.
+        def self.at_fork_blocks(before:, parent:, child:)
+          blocks = {before: before, parent: parent, child: child}
+          group = Object.new.freeze
+          AT_FORK_REGISTRY_MUTEX.synchronize do
+            current = @at_fork_blocks
+            @at_fork_blocks = {
+              before: (current.fetch(:before) + [Callback.new(before, group)]).freeze,
+              parent: (current.fetch(:parent) + [Callback.new(parent, group)]).freeze,
+              child: (current.fetch(:child) + [Callback.new(child, group)]).freeze,
+            }.freeze
+          end
+          blocks
+        end
+
         # Deregisters a block previously registered with {.at_fork} for the given
         # +stage+. It is a no-op (does not raise) when +block+ was never
         # registered (or was already removed). Raises +ArgumentError+ for an
         # unknown stage, matching the {.at_fork} contract.
         def self.remove_at_fork(stage, block)
-          blocks_for(stage).delete(block)
+          AT_FORK_REGISTRY_MUTEX.synchronize do
+            current = @at_fork_blocks
+            callbacks = blocks_for(current, stage)
+            @at_fork_blocks = current.merge(
+              stage => callbacks.reject { |callback| callback.block.equal?(block) }.freeze
+            ).freeze
+          end
 
           nil
         end
 
-        def self.blocks_for(stage)
+        # Returns the immutable callback registry for one fork lifecycle.
+        # Copy-on-write updates publish a new reference, so registrations made
+        # afterwards apply only to the next lifecycle without locking this read.
+        def self.snapshot_at_fork_blocks
+          @at_fork_blocks
+        end
+
+        def self.replace_at_fork_blocks(snapshot)
+          AT_FORK_REGISTRY_MUTEX.synchronize { @at_fork_blocks = snapshot }
+        end
+        private_class_method :replace_at_fork_blocks
+
+        def self.blocks_for(snapshot, stage)
           case stage
-          when :before then AT_FORK_BEFORE_BLOCKS
-          when :parent then AT_FORK_PARENT_BLOCKS
-          when :child then AT_FORK_CHILD_BLOCKS
+          when :before, :parent, :child then snapshot.fetch(stage)
           else raise(ArgumentError, "Unsupported stage #{stage}")
           end
         end
@@ -77,27 +159,29 @@ module Datadog
         # Adds `at_fork` behavior; see parent module for details.
         module KernelMonkeyPatch
           def fork
+            snapshot = AtForkMonkeyPatch.snapshot_at_fork_blocks
+            started = {}
+
             # If a block is provided, it must be wrapped to trigger callbacks.
             child_block = if block_given?
               proc do
-                AtForkMonkeyPatch.run_at_fork_blocks(:child)
+                AtForkMonkeyPatch.run_at_fork_blocks(:child, snapshot: snapshot)
 
                 # Invoke original block
                 yield
               end
             end
 
-            # Run pre-fork callbacks in the parent, just before forking.
-            AtForkMonkeyPatch.run_at_fork_blocks(:before)
-
-            # Start fork
-            # If a block is provided, use the wrapped version.
             begin
+              # Run pre-fork callbacks in the parent, just before forking.
+              AtForkMonkeyPatch.run_at_fork_blocks(:before, snapshot: snapshot, started: started)
+
+              # Start fork. If a block is provided, use the wrapped version.
               result = child_block.nil? ? super : super(&child_block)
-            rescue Exception # rubocop:disable Lint/RescueException -- re-raised unchanged; we only need to run parent cleanup first
-              # The fork failed and we are still in the parent; run `:parent` to
-              # restore any state the `:before` blocks set up, then re-raise.
-              AtForkMonkeyPatch.run_at_fork_blocks(:parent)
+            rescue Exception => e # rubocop:disable Lint/RescueException -- re-raised unchanged; we only need to run parent cleanup first
+              # The fork or a before-fork callback failed and we are still in
+              # the parent. Restore any state set up by earlier callbacks.
+              AtForkMonkeyPatch.send(:run_parent_cleanup, snapshot, started, e)
               raise
             end
 
@@ -106,9 +190,9 @@ module Datadog
             # If we're in the parent, result = pid: trigger parent callbacks.
             # (If it gets called with a block, it only returns on the parent)
             if result.nil?
-              AtForkMonkeyPatch.run_at_fork_blocks(:child)
+              AtForkMonkeyPatch.run_at_fork_blocks(:child, snapshot: snapshot)
             else
-              AtForkMonkeyPatch.run_at_fork_blocks(:parent)
+              AtForkMonkeyPatch.run_at_fork_blocks(:parent, snapshot: snapshot)
             end
 
             result
@@ -120,23 +204,22 @@ module Datadog
           # Hook provided by Ruby 3.1+ for observability libraries that want to know about fork, see
           # https://github.com/ruby/ruby/pull/5017 and https://bugs.ruby-lang.org/issues/17795
           def _fork
-            AtForkMonkeyPatch.run_at_fork_blocks(:before)
-
+            snapshot = AtForkMonkeyPatch.snapshot_at_fork_blocks
+            started = {}
             begin
+              AtForkMonkeyPatch.run_at_fork_blocks(:before, snapshot: snapshot, started: started)
               pid = super
-            rescue Exception # rubocop:disable Lint/RescueException -- re-raised unchanged; we only need to run parent cleanup first
-              # The fork failed, so no child was created and we are still in the
-              # parent. The `:before` blocks already ran (and may hold resources,
-              # e.g. a locked mutex); run the `:parent` blocks so that state is
-              # restored, then re-raise.
-              AtForkMonkeyPatch.run_at_fork_blocks(:parent)
+            rescue Exception => e # rubocop:disable Lint/RescueException -- re-raised unchanged; we only need to run parent cleanup first
+              # The fork or a before-fork callback failed, so no child was
+              # created. Restore state set up by any earlier callbacks.
+              AtForkMonkeyPatch.send(:run_parent_cleanup, snapshot, started, e)
               raise
             end
 
             if pid == 0
-              AtForkMonkeyPatch.run_at_fork_blocks(:child)
+              AtForkMonkeyPatch.run_at_fork_blocks(:child, snapshot: snapshot)
             else
-              AtForkMonkeyPatch.run_at_fork_blocks(:parent)
+              AtForkMonkeyPatch.run_at_fork_blocks(:parent, snapshot: snapshot)
             end
 
             pid
@@ -146,20 +229,21 @@ module Datadog
           # keeps executing code in the child process, killing off the parent, thus effectively replacing it.
           # This is not covered by `_fork` and thus we have some extra code for it.
           def daemon(*args)
-            AtForkMonkeyPatch.run_at_fork_blocks(:before)
-
+            snapshot = AtForkMonkeyPatch.snapshot_at_fork_blocks
+            started = {}
             begin
+              AtForkMonkeyPatch.run_at_fork_blocks(:before, snapshot: snapshot, started: started)
               result = super
-            rescue Exception # rubocop:disable Lint/RescueException -- re-raised unchanged; we only need to run parent cleanup first
-              # `daemon` failed, so the original process survives; run `:parent`
-              # to restore state the `:before` blocks set up, then re-raise.
-              AtForkMonkeyPatch.run_at_fork_blocks(:parent)
+            rescue Exception => e # rubocop:disable Lint/RescueException -- re-raised unchanged; we only need to run parent cleanup first
+              # `daemon` or a before-fork callback failed, so the original
+              # process survives. Restore state set up by earlier callbacks.
+              AtForkMonkeyPatch.send(:run_parent_cleanup, snapshot, started, e)
               raise
             end
 
             # `daemon` kills the parent, so there is no surviving parent to run
             # `:parent` callbacks in; only the child continues executing.
-            AtForkMonkeyPatch.run_at_fork_blocks(:child)
+            AtForkMonkeyPatch.run_at_fork_blocks(:child, snapshot: snapshot)
 
             result
           end

data/lib/datadog/data_streams/processor.rb

@@ -79,7 +79,7 @@ module Datadog
             topic: topic,
             partition: partition,
             offset: offset,
-            timestamp_ns: (now.to_f * 1e9).to_i
+            timestamp_ns: (now.to_f * 1e9).to_i,
           }
         )
         true
@@ -98,7 +98,7 @@ module Datadog
             topic: topic,
             partition: partition,
             offset: offset,
-            timestamp: now
+            timestamp: now,
           }
         )
         true
@@ -186,7 +186,7 @@ module Datadog
 
         bucket[:latest_produce_offsets][partition_key] = [
           event[:offset],
-          bucket[:latest_produce_offsets][partition_key] || 0
+          bucket[:latest_produce_offsets][partition_key] || 0,
         ].max
       end
 
@@ -196,7 +196,7 @@ module Datadog
           partition: event[:partition],
           offset: event[:offset],
           timestamp: event[:timestamp],
-          timestamp_sec: event[:timestamp].to_f
+          timestamp_sec: event[:timestamp].to_f,
         }
 
         timestamp_ns = (event[:timestamp].to_f * 1e9).to_i
@@ -216,7 +216,7 @@ module Datadog
             expected_offset: previous_offset + 1,
             actual_offset: event[:offset],
             gap_size: event[:offset] - previous_offset - 1,
-            timestamp_sec: event[:timestamp].to_f
+            timestamp_sec: event[:timestamp].to_f,
           }
         end
 
@@ -321,7 +321,7 @@ module Datadog
           "TracerVersion" => Datadog::VERSION::STRING,
           "Lang" => "ruby",
           "Stats" => stats_buckets,
-          "Hostname" => hostname
+          "Hostname" => hostname,
         } # : ::Hash[::String, (::String | ::Array[::String])]
 
         payload["ProcessTags"] = Core::Environment::Process.tags if @settings.experimental_propagate_process_tags_enabled
@@ -400,7 +400,7 @@ module Datadog
             full_pathway_latency_sec: full_pathway_latency_sec,
             payload_size: payload_size,
             tags: tags,
-            timestamp_sec: timestamp_sec
+            timestamp_sec: timestamp_sec,
           }
         )
         true
@@ -449,14 +449,14 @@ module Datadog
             topic, partition = key.split(":", 2)
             backlogs << {
               "Tags" => ["type:kafka_produce", "topic:#{topic}", "partition:#{partition}"],
-              "Value" => offset
+              "Value" => offset,
             }
           end
           bucket[:latest_commit_offsets].each do |key, offset|
             group, topic, partition = key.split(":", 3)
             backlogs << {
               "Tags" => ["type:kafka_commit", "consumer_group:#{group}", "topic:#{topic}", "partition:#{partition}"],
-              "Value" => offset
+              "Value" => offset,
             }
           end
 
@@ -464,7 +464,7 @@ module Datadog
             "Start" => bucket_time_ns,
             "Duration" => @bucket_size_ns,
             "Stats" => bucket_stats,
-            "Backlogs" => backlogs + serialize_consumer_backlogs
+            "Backlogs" => backlogs + serialize_consumer_backlogs,
           }
         end
 
@@ -479,9 +479,9 @@ module Datadog
             "Tags" => [
               "type:kafka_commit",
               "topic:#{stat[:topic]}",
-              "partition:#{stat[:partition]}"
+              "partition:#{stat[:partition]}",
             ],
-            "Value" => stat[:offset]
+            "Value" => stat[:offset],
           }
         end
       end
@@ -494,7 +494,7 @@ module Datadog
         {
           pathway_stats: {},
           latest_produce_offsets: {},
-          latest_commit_offsets: {}
+          latest_commit_offsets: {},
         }
       end
 
@@ -503,7 +503,7 @@ module Datadog
           edge_latency: Datadog::Core::DDSketch.new,
           full_pathway_latency: Datadog::Core::DDSketch.new,
           payload_size_sum: 0,
-          payload_size_count: 0
+          payload_size_count: 0,
         }
       end
     end

data/lib/datadog/di/el/compiler.rb

@@ -31,6 +31,29 @@ module Datadog
           [code, regexps]
         end
 
+        # Returns the identifier that +ast+ directly references at its top
+        # level, so the message path can redact direct references the same
+        # way snapshots redact by name.
+        #
+        # @param ast [untyped] top-level expression AST from a probe definition.
+        # @return [String, nil] the variable name for a `ref`/`iref`, the field
+        #   name for a `getmember`, or the string key for an `index`; nil when
+        #   the top-level expression is not a direct reference.
+        def redaction_identifier(ast)
+          return nil unless Hash === ast && ast.length == 1
+
+          entry = ast.first
+          return nil if entry.nil?
+
+          op, target = entry
+          case op
+          when "ref"
+            target if String === target
+          when "getmember", "index"
+            target[1] if Array === target && target.length == 2 && String === target[1]
+          end
+        end
+
         private
 
         # Steep: https://github.com/soutaro/steep/issues/363

data/lib/datadog/di/el/expression.rb

@@ -12,12 +12,17 @@ module Datadog
         # @param regexps [Array<Regexp>] precompiled `matches` regexps (see
         #   Compiler#precompile_regexp), the second element returned by
         #   Compiler#compile.
-        def initialize(dsl_expr, compiled_expr, regexps = [])
+        # @param redaction_identifier [String, nil] the identifier this
+        #   expression directly references at its top level (see
+        #   Compiler#redaction_identifier); nil when it is not a direct
+        #   reference.
+        def initialize(dsl_expr, compiled_expr, regexps: [], redaction_identifier: nil)
           unless String === compiled_expr
             raise ArgumentError, "compiled_expr must be a string"
           end
 
           @dsl_expr = dsl_expr
+          @redaction_identifier = redaction_identifier
 
           cls = Class.new(Evaluator)
           cls.class_exec do
@@ -28,14 +33,12 @@ module Datadog
               end
             RUBY
           end
-          # cls inherits Evaluator#initialize(regexps), but Steep types
-          # Class#new as () -> untyped and cannot see that initializer
-          # through this dynamically created subclass.
-          @evaluator = cls.new(regexps) # steep:ignore UnexpectedPositionalArgument
+          @evaluator = cls.new(regexps)
         end
 
         attr_reader :dsl_expr
         attr_reader :evaluator
+        attr_reader :redaction_identifier
 
         def evaluate(context)
           @evaluator.evaluate(context)