datadog 2.24.0 → 2.26.0

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

@@ -5,8 +5,8 @@ module Datadog
     module Utils
       # Helper methods for safer dup
       module SafeDup
-        # String#+@ was introduced in Ruby 2.3
-        def self.frozen_or_dup(v)
+        # Steep: https://github.com/soutaro/steep/issues/2001
+        def self.frozen_or_dup(v) # steep:ignore MethodBodyTypeMismatch
           # For the case of a String we use the methods +@ and -@.
           # Those methods are only for String objects
           # they are faster and chepaer on the memory side.

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

@@ -12,6 +12,8 @@ module Datadog
         end
 
         def next
+          # Steep: https://github.com/soutaro/steep/issues/477
+          # @type ivar @next_item: ^(::Integer) -> Integer
           next_item = @next_item ? @next_item.call(@current) : @current
           @current += 1
           next_item

data/lib/datadog/di/boot.rb

@@ -17,7 +17,8 @@ require_relative 'serializer'
 require_relative 'transport/http'
 require_relative 'utils'
 
-if %w[1 true yes].include?(Datadog::DATADOG_ENV['DD_DYNAMIC_INSTRUMENTATION_ENABLED']) # steep:ignore
+# Steep: https://github.com/ruby/rbs/pull/2715
+if %w[1 true yes].include?(Datadog::DATADOG_ENV['DD_DYNAMIC_INSTRUMENTATION_ENABLED']) # steep:ignore ArgumentTypeMismatch
 
   # For initial release of Dynamic Instrumentation, activate code tracking
   # only if DI is explicitly requested in the environment.
@@ -35,7 +36,8 @@ require_relative 'contrib'
 
 Datadog::DI::Contrib.load_now_or_later
 
-if %w[1 true yes].include?(Datadog::DATADOG_ENV['DD_DYNAMIC_INSTRUMENTATION_ENABLED']) # steep:ignore
+# Steep: https://github.com/ruby/rbs/pull/2715
+if %w[1 true yes].include?(Datadog::DATADOG_ENV['DD_DYNAMIC_INSTRUMENTATION_ENABLED']) # steep:ignore ArgumentTypeMismatch
   if Datadog::DATADOG_ENV['DD_DYNAMIC_INSTRUMENTATION_PROBE_FILE']
     require_relative 'probe_file_loader'
     Datadog::DI::ProbeFileLoader.load_now_or_later

data/lib/datadog/di/contrib/active_record.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-# steep thinks all of the arguments are nil here and does not know what ActiveRecord is.
-# steep:ignore:start
-
 Datadog::DI::Serializer.register(
   # This serializer uses a dynamic condition to determine its applicability
   # to a particular value. A simpler case could have been a serializer for
@@ -28,11 +25,13 @@ Datadog::DI::Serializer.register(
   # It should always be an integer.
   # Reduce it by 1 when invoking +serialize_value+ on the contents of +value+.
   # This serializer could also potentially do its own depth limiting.
+  #
+  # Steep: steep thinks all of the arguments are nil here
+  # Looks like it cannot handle kwargs in lambdas
+  # @type var depth: Integer
   value_to_serialize = {
     attributes: value.attributes,
     new_record: value.new_record?,
   }
   serializer.serialize_value(value_to_serialize, depth: depth - 1, type: value.class)
 end
-
-# steep:ignore:end

data/lib/datadog/di/instrumenter.rb

@@ -114,7 +114,9 @@ module Datadog
         settings = self.settings
 
         mod = Module.new do
-          define_method(method_name) do |*args, **kwargs, &target_block| # steep:ignore
+          define_method(method_name) do |*args, **kwargs, &target_block| # steep:ignore NoMethod
+            # Steep: Unsure why it cannot detect kwargs in this block. Workaround:
+            # @type var kwargs: ::Hash[::Symbol, untyped]
             continue = true
             if condition = probe.condition
               begin
@@ -209,7 +211,8 @@ module Datadog
                 # that location here.
                 []
               end
-              caller_locs = method_frame + caller_locations # steep:ignore
+              # Steep: https://github.com/ruby/rbs/pull/2745
+              caller_locs = method_frame + caller_locations # steep:ignore ArgumentTypeMismatch
               # TODO capture arguments at exit
 
               context = Context.new(locals: nil, target_self: self,
@@ -305,7 +308,10 @@ module Datadog
 
         iseq = nil
         if code_tracker
-          ret = code_tracker.iseqs_for_path_suffix(probe.file) # steep:ignore
+          # Steep: Complex type narrowing (before calling hook_line,
+          # we check that probe.line? is true which itself checks that probe.file is not nil)
+          # Annotation do not work here as `file` is a method on probe, not a local variable.
+          ret = code_tracker.iseqs_for_path_suffix(probe.file) # steep:ignore ArgumentTypeMismatch
           unless ret
             if permit_untargeted_trace_points
               # Continue withoout targeting the trace point.

data/lib/datadog/di/logger.rb

@@ -8,7 +8,7 @@ module Datadog
     #
     # @api private
     class Logger
-      extend Forwardable # steep:ignore
+      extend Forwardable
 
       def initialize(settings, target)
         @settings = settings
@@ -18,7 +18,7 @@ module Datadog
       attr_reader :settings
       attr_reader :target
 
-      def_delegators :target, :debug # steep:ignore
+      def_delegators :target, :debug
 
       def trace(&block)
         if settings.dynamic_instrumentation.internal.trace_logging

data/lib/datadog/di/probe_file_loader/railtie.rb

@@ -6,7 +6,7 @@ module Datadog
       # Railtie class initializes dynamic instrumentation contrib code
       # in Rails environments.
       class Railtie < Rails::Railtie
-        initializer 'datadog.dynamic_instrumentation.load_probe_file' do |app| # steep:ignore
+        initializer 'datadog.dynamic_instrumentation.load_probe_file' do |app|
           ProbeFileLoader.load_now
         end
       end

data/lib/datadog/di/probe_notifier_worker.rb

@@ -249,12 +249,12 @@ module Datadog
           @lock.synchronize do
             batch = instance_variable_get("@#{event_type}_queue")
             instance_variable_set("@#{event_type}_queue", [])
-            @io_in_progress = batch.any? # steep:ignore
+            @io_in_progress = batch.any?
           end
-          logger.trace { "di: #{self.class.name}: checking #{event_type} queue - #{batch.length} entries" } # steep:ignore
-          if batch.any? # steep:ignore
+          logger.trace { "di: #{self.class.name}: checking #{event_type} queue - #{batch.length} entries" }
+          if batch.any?
             begin
-              logger.trace { "di: sending #{batch.length} #{event_type} event(s) to agent" } # steep:ignore
+              logger.trace { "di: sending #{batch.length} #{event_type} event(s) to agent" }
               send("do_send_#{event_type}", batch)
               time = Core::Utils::Time.get_time
               @lock.synchronize do
@@ -268,7 +268,7 @@ module Datadog
               # telemetry message would also fail.
             end
           end
-          batch.any? # steep:ignore
+          batch.any?
         rescue ThreadError => exc
           # Normally the queue should only be consumed in this method,
           # however if anyone consumes it elsewhere we don't want to block

data/lib/datadog/error_tracking/filters.rb

@@ -18,10 +18,10 @@ module Datadog
         regex_match = regex.match(file_path)
         return unless regex_match
 
-        gem_name = regex_match[1]
+        gem_name = regex_match[1] #: String
 
         begin
-          Gem::Specification.find_by_name(gem_name) # steep:ignore
+          Gem::Specification.find_by_name(gem_name)
         rescue Gem::MissingSpecError
           nil
         end

data/lib/datadog/kit/appsec/events/v2.rb

@@ -66,8 +66,7 @@ module Datadog
               record_event_telemetry_metric(LOGIN_SUCCESS_EVENT)
               ::Datadog::AppSec::Instrumentation.gateway.push('appsec.events.user_lifecycle', LOGIN_SUCCESS_EVENT)
 
-              # NOTE: Guard-clause will not work with Steep typechecking
-              return Kit::Identity.set_user(trace, span, **user_attributes) if user_attributes.key?(:id) # steep:ignore
+              return Kit::Identity.set_user(trace, span, **user_attributes) if user_attributes.key?(:id)
 
               # NOTE: This is a fallback for the case when we don't have an ID,
               #       but need to trigger WAF.
@@ -156,7 +155,7 @@ module Datadog
                 raise ArgumentError, 'missing required user key `:id`' unless user_or_id.key?(:id)
                 raise TypeError, 'user key `:id` must be a String' unless user_or_id[:id].is_a?(String)
 
-                user_or_id.merge(login: login)
+                user_or_id.merge(login: login) #: {login: ::String, ?id: ::String?}
               else
                 raise TypeError, '`user_or_id` argument must be either String or Hash'
               end

data/lib/datadog/profiling/collectors/code_provenance.rb

@@ -161,7 +161,7 @@ module Datadog
           end
 
           def to_json(arg = nil)
-            # Steep: https://github.com/ruby/rbs/pull/2691
+            # Steep: https://github.com/ruby/rbs/pull/2691 (remove after RBS 4.0 release)
             {kind: @kind, name: @name, version: @version, paths: @paths}.to_json(arg) # steep:ignore ArgumentTypeMismatch
           end
 

data/lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb

@@ -77,12 +77,13 @@ module Datadog
               Datadog.logger.debug("CpuAndWallTimeWorker thread stopping cleanly")
             rescue Exception => e # rubocop:disable Lint/RescueException
               @failure_exception = e
+              operation_name = self.class._native_failure_exception_during_operation(self).inspect
               Datadog.logger.warn(
                 "CpuAndWallTimeWorker thread error. " \
-                "Cause: #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}"
+                "Operation: #{operation_name} Cause: #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}"
               )
               on_failure_proc&.call
-              Datadog::Core::Telemetry::Logger.report(e, description: "CpuAndWallTimeWorker thread error")
+              Datadog::Core::Telemetry::Logger.report(e, description: "CpuAndWallTimeWorker thread error: #{operation_name}")
             end
             @worker_thread.name = self.class.name # Repeated from above to make sure thread gets named asap
             @worker_thread.thread_variable_set(:fork_safe, true)

data/lib/datadog/profiling/collectors/info.rb

@@ -16,6 +16,7 @@ module Datadog
       class Info
         def initialize(settings)
           @profiler_info = nil
+
           # Steep: https://github.com/soutaro/steep/issues/363
           @info = { # steep:ignore IncompatibleAssignment
             platform: collect_platform_info,
@@ -97,7 +98,7 @@ module Datadog
         end
 
         def collect_profiler_info(settings)
-          unless @profiler_info
+          @profiler_info ||= begin
             lib_datadog_gem = ::Gem.loaded_specs["libdatadog"]
 
             libdatadog_version =
@@ -109,13 +110,12 @@ module Datadog
                 "#{Libdatadog::VERSION}-(unknown)"
               end
 
-            @profiler_info = {
+            {
               version: Datadog::Core::Environment::Identity.gem_datadog_version,
               libdatadog: libdatadog_version,
               settings: collect_settings_recursively(settings.profiling),
             }.freeze
           end
-          @profiler_info
         end
 
         # The settings/option model isn't directly serializable because

data/lib/datadog/profiling/ext/dir_monkey_patches.rb

@@ -30,6 +30,10 @@ module Datadog
       if RUBY_VERSION.start_with?("2.")
         # Monkey patches for Dir.singleton_class (Ruby 2 version). See DirMonkeyPatches above for more details.
         module DirClassMonkeyPatches
+          # Steep: Workaround that defines args and block only for Ruby 2.x.
+          # @type var args: ::Array[any]
+          # @type var block: ^(?) -> any | nil
+
           def [](*args, &block)
             Datadog::Profiling::Collectors::CpuAndWallTimeWorker._native_hold_signals
             super
@@ -148,6 +152,11 @@ module Datadog
       else
         # Monkey patches for Dir.singleton_class (Ruby 3 version). See DirMonkeyPatches above for more details.
         module DirClassMonkeyPatches
+          # Steep: Workaround that defines args, kwargs and block only for Ruby 3.x.
+          # @type var args: ::Array[any]
+          # @type var kwargs: ::Hash[::Symbol, any]
+          # @type var block: ^(?) -> any | nil
+
           def [](*args, **kwargs, &block)
             Datadog::Profiling::Collectors::CpuAndWallTimeWorker._native_hold_signals
             super
@@ -263,6 +272,10 @@ module Datadog
       if RUBY_VERSION.start_with?("2.")
         # Monkey patches for Dir (Ruby 2 version). See DirMonkeyPatches above for more details.
         module DirInstanceMonkeyPatches
+          # Steep: Workaround that defines args and block only for Ruby 2.x.
+          # @type var args: ::Array[any]
+          # @type var block: ^(?) -> any | nil
+
           # See note on methods that yield above.
           def each(*args, &block)
             if block
@@ -336,6 +349,11 @@ module Datadog
       else
         # Monkey patches for Dir (Ruby 3 version). See DirMonkeyPatches above for more details.
         module DirInstanceMonkeyPatches
+          # Steep: Workaround that defines args, kwargs and block only for Ruby 3.x.
+          # @type var args: ::Array[any]
+          # @type var kwargs: ::Hash[::Symbol, any]
+          # @type var block: ^(?) -> any | nil
+
           # See note on methods that yield above.
           def each(*args, **kwargs, &block)
             if block

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

@@ -12,12 +12,16 @@ module Datadog
         def self.inject(digest, data)
           raise 'Please invoke Datadog.configure at least once before calling this method' unless @propagation
 
+          # Steep: https://github.com/soutaro/steep/issues/477
+          # @type ivar @propagation: WaterDrop::Distributed::Propagation
           @propagation.inject!(digest, data)
         end
 
         def self.extract(data)
           raise 'Please invoke Datadog.configure at least once before calling this method' unless @propagation
 
+          # Steep: https://github.com/soutaro/steep/issues/477
+          # @type ivar @propagation: WaterDrop::Distributed::Propagation
           @propagation.extract(data)
         end
 

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

@@ -175,8 +175,9 @@ module Datadog
 
           tags = {}
 
-          baggage_tag_keys.each do |key, _| # rubocop:disable Style/HashEachMethods
-            value = baggage[key]
+          baggage_tag_keys.each do |key, _|
+            # Steep: https://github.com/soutaro/steep/issues/2031
+            value = baggage[key] # steep:ignore ArgumentTypeMismatch
             next if value.nil? || value.empty?
 
             tags["baggage.#{key}"] = value

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

@@ -60,7 +60,9 @@ module Datadog
         ensure
           if trace.sampling_priority && trace.sampling_priority > 0
             # Don't modify decision if priority was set upstream.
-            if !distributed_sampling_priority && !trace.has_tag?(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER)
+            # Steep: https://github.com/soutaro/steep/issues/1971
+            if !distributed_sampling_priority && # steep:ignore FallbackAny
+                !trace.has_tag?(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER)
               # If no sampling priority being assigned at this point, a custom
               # sampler implementation is configured: this means the user has
               # full control over the sampling decision.

data/lib/datadog/tracing/span.rb

@@ -80,7 +80,7 @@ module Datadog
 
         @meta = meta || {}
         @metrics = metrics || {}
-        @metastruct = metastruct || {}
+        @metastruct = metastruct || Metastruct.new
         @status = status || 0
 
         # start_time and end_time track wall clock. In Ruby, wall clock

data/lib/datadog/tracing/span_operation.rb

@@ -164,7 +164,9 @@ module Datadog
             # block is application code that we don't want to hinder.
             # * We don't yield during a fatal error, as the application is likely trying to
             #   end its execution (either due to a system error or graceful shutdown).
-            return_value = yield(self) unless e && !e.is_a?(StandardError)
+            # @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
           end
         # rubocop:disable Lint/RescueException
         # Here we really want to catch *any* exception, not only StandardError,
@@ -214,9 +216,6 @@ module Datadog
       end
 
       # Mark the span stopped at the current time
-      #
-      # steep:ignore:start
-      # Steep issue fixed in https://github.com/soutaro/steep/pull/1467
       def stop(stop_time = nil, exception: nil)
         # A span should not be stopped twice. Note that this is not thread-safe,
         # stop is called from multiple threads, a given span might be stopped
@@ -239,7 +238,6 @@ module Datadog
 
         self
       end
-      # steep:ignore:end
 
       # Return whether the duration is started or not
       def started?
@@ -287,10 +285,15 @@ module Datadog
       end
 
       def duration
+        # Steep: https://github.com/soutaro/steep/issues/477
+        # @type ivar @duration_end: Time
+        # @type ivar @duration_start: Time
         return @duration_end - @duration_start if @duration_start && @duration_end
 
         # Steep: https://github.com/soutaro/steep/issues/477
-        @end_time - @start_time if @start_time && @end_time # steep:ignore NoMethod
+        # @type ivar @end_time: Time
+        # @type ivar @start_time: Time
+        @end_time - @start_time if @start_time && @end_time
       end
 
       def set_error(e)
@@ -317,7 +320,9 @@ module Datadog
           'exception.stacktrace' => exc.backtrace,
         }
 
-        @span_events << SpanEvent.new('exception', attributes: event_attributes.merge!(attributes)) # steep:ignore
+        # Steep: Caused by wrong declaration, should be the same parameters as `merge`
+        # https://github.com/ruby/rbs/blob/3d0fb3a7fdde60af7120e875fe3bd7237b5b6a88/core/hash.rbs#L1468
+        @span_events << SpanEvent.new('exception', attributes: event_attributes.merge!(attributes)) # steep:ignore ArgumentTypeMismatch
       end
 
       # Return a string representation of the span.
@@ -466,7 +471,7 @@ module Datadog
               @handler.call(*args)
             rescue => e
               logger.debug do
-                "Error in on_error handler '#{@default}': #{e.class}: #{e} at #{Array(e.backtrace).first}"
+                "Error in on_error handler '#{@handler}': #{e.class}: #{e} at #{Array(e.backtrace).first}"
               end
             end
 
@@ -553,7 +558,8 @@ module Datadog
         return 0 if @start_time.nil?
 
         # Steep: https://github.com/soutaro/steep/issues/477
-        @start_time.to_i * 1000000000 + @start_time.nsec # steep:ignore NoMethod
+        # @type ivar @start_time: Time
+        @start_time.to_i * 1000000000 + @start_time.nsec
       end
 
       # Used for serialization

data/lib/datadog/version.rb

@@ -3,7 +3,7 @@
 module Datadog
   module VERSION
     MAJOR = 2
-    MINOR = 24
+    MINOR = 26
     PATCH = 0
     PRE = nil
     BUILD = nil

data/lib/datadog.rb

@@ -6,6 +6,7 @@ require_relative 'datadog/tracing/contrib'
 
 # Load other products (must follow tracing)
 require_relative 'datadog/profiling'
+require_relative 'datadog/ai_guard'
 require_relative 'datadog/appsec'
 require_relative 'datadog/di'
 require_relative 'datadog/data_streams'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.24.0
+  version: 2.26.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-08 00:00:00.000000000 Z
+date: 2026-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 24.0.1.1.0
+        version: 25.0.0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 24.0.1.1.0
+        version: 25.0.0.1.0
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +182,19 @@ files:
 - ext/libdatadog_api/process_discovery.h
 - ext/libdatadog_extconf_helpers.rb
 - lib/datadog.rb
+- lib/datadog/ai_guard.rb
+- lib/datadog/ai_guard/api_client.rb
+- lib/datadog/ai_guard/component.rb
+- lib/datadog/ai_guard/configuration.rb
+- lib/datadog/ai_guard/configuration/ext.rb
+- lib/datadog/ai_guard/configuration/settings.rb
+- lib/datadog/ai_guard/evaluation.rb
+- lib/datadog/ai_guard/evaluation/message.rb
+- lib/datadog/ai_guard/evaluation/no_op_result.rb
+- lib/datadog/ai_guard/evaluation/request.rb
+- lib/datadog/ai_guard/evaluation/result.rb
+- lib/datadog/ai_guard/evaluation/tool_call.rb
+- lib/datadog/ai_guard/ext.rb
 - lib/datadog/appsec.rb
 - lib/datadog/appsec/actions_handler.rb
 - lib/datadog/appsec/actions_handler/serializable_backtrace.rb
@@ -1077,8 +1090,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.24.0/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.24.0
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.26.0/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.26.0
 post_install_message:
 rdoc_options: []
 require_paths: