datadog 2.15.0 → 2.16.0

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

@@ -55,7 +55,7 @@ module Datadog
           span_id = Helpers.parse_hex_id(fetcher[@span_id_key])
 
           # Return early if this propagation is not valid
-          return if span_id.nil? || span_id <= 0 || span_id >= Tracing::Utils::EXTERNAL_MAX_ID
+          return if span_id.nil? || span_id <= 0 || span_id > Tracing::Utils::EXTERNAL_MAX_ID
 
           # We don't need to try and convert sampled since B3 supports 0/1 (AUTO_REJECT/AUTO_KEEP)
           sampling_priority = Helpers.parse_decimal_id(fetcher[@sampled_key])

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

@@ -54,7 +54,7 @@ module Datadog
 
           span_id = Helpers.parse_hex_id(parts[1]) if parts.length > 1
           # Return early if this propagation is not valid
-          return if span_id.nil? || span_id <= 0 || span_id >= Tracing::Utils::EXTERNAL_MAX_ID
+          return if span_id.nil? || span_id <= 0 || span_id > Tracing::Utils::EXTERNAL_MAX_ID
 
           sampling_priority = Helpers.parse_decimal_id(parts[2]) if parts.length > 2
 

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

@@ -89,7 +89,7 @@ module Datadog
           trace_id = Helpers.parse_decimal_id(fetcher_object[@trace_id_key])
 
           return unless trace_id
-          return if trace_id <= 0 || trace_id >= Tracing::Utils::EXTERNAL_MAX_ID
+          return if trace_id <= 0 || trace_id > Tracing::Utils::EXTERNAL_MAX_ID
 
           trace_id
         end
@@ -98,7 +98,7 @@ module Datadog
           parent_id = Helpers.parse_decimal_id(fetcher_object[@parent_id_key])
 
           return unless parent_id
-          return if parent_id <= 0 || parent_id >= Tracing::Utils::EXTERNAL_MAX_ID
+          return if parent_id <= 0 || parent_id > Tracing::Utils::EXTERNAL_MAX_ID
 
           parent_id
         end

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

@@ -9,6 +9,7 @@ module Datadog
       # {Datadog::Tracing::Sampling::RateSampler} is based on a sample rate.
       class RateSampler < Sampler
         KNUTH_FACTOR = 1111111111111111111
+        UINT64_MODULO = (1 << 64)
 
         # Initialize a {Datadog::Tracing::Sampling::RateSampler}.
         # This sampler keeps a random subset of the traces. Its main purpose is to
@@ -39,7 +40,7 @@ module Datadog
         end
 
         def sample?(trace)
-          ((trace.id * KNUTH_FACTOR) % Tracing::Utils::EXTERNAL_MAX_ID) <= @sampling_id_threshold
+          ((trace.id * KNUTH_FACTOR) % UINT64_MODULO) <= @sampling_id_threshold
         end
 
         def sample!(trace)

data/lib/datadog/tracing/span_operation.rb

@@ -28,6 +28,7 @@ module Datadog
       # Span attributes
       # NOTE: In the future, we should drop the me
       attr_reader \
+        :logger,
         :end_time,
         :id,
         :name,
@@ -37,10 +38,12 @@ module Datadog
         :start_time,
         :trace_id,
         :type
+
       attr_accessor :links, :status, :span_events
 
       def initialize(
         name,
+        logger: Datadog.logger,
         events: nil,
         on_error: nil,
         parent_id: 0,
@@ -54,6 +57,8 @@ module Datadog
         span_events: nil,
         id: nil
       )
+        @logger = logger
+
         # Ensure dynamically created strings are UTF-8 encoded.
         #
         # All strings created in Ruby land are UTF-8. The only sources of non-UTF-8 string are:
@@ -90,11 +95,17 @@ module Datadog
         set_tags(tags) if tags
 
         # Some other SpanOperation-specific behavior
-        @events = events || Events.new
+        @events = events || Events.new(logger: logger)
         @span = nil
 
-        # Subscribe :on_error event
-        @events.on_error.wrap_default(&on_error) if on_error.is_a?(Proc)
+        if on_error.nil?
+          # Nothing, default error handler is already set up.
+        elsif on_error.is_a?(Proc)
+          # Subscribe :on_error event
+          @events.on_error.wrap_default(&on_error)
+        else
+          logger.warn("on_error argument to SpanOperation ignored because is not a Proc: #{on_error}")
+        end
 
         # Start the span with start time, if given.
         start(start_time) if start_time
@@ -130,6 +141,10 @@ module Datadog
         @resource = resource.nil? ? nil : Core::Utils.utf8_encode(resource) # Allow this to be explicitly set to nil
       end
 
+      def get_collector_or_initialize
+        @collector ||= yield
+      end
+
       def measure
         raise ArgumentError, 'Must provide block to measure!' unless block_given?
         # TODO: Should we just invoke the block and skip tracing instead?
@@ -143,7 +158,7 @@ module Datadog
           begin
             start
           rescue StandardError => e
-            Datadog.logger.debug { "Failed to start span: #{e}" }
+            logger.debug { "Failed to start span: #{e}" }
           ensure
             # We should yield to the provided block when possible, as this
             # block is application code that we don't want to hinder.
@@ -161,7 +176,7 @@ module Datadog
           # Stop the span first, so timing is a more accurate.
           # If the span failed to start, timing may be inaccurate,
           # but this is not really a serious concern.
-          stop
+          stop(exception: e)
 
           # Trigger the on_error event
           events.on_error.publish(self, e)
@@ -202,7 +217,7 @@ module Datadog
       #
       # steep:ignore:start
       # Steep issue fixed in https://github.com/soutaro/steep/pull/1467
-      def stop(stop_time = nil)
+      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
         # several times. Again, one should not do this, so this test is more a
@@ -220,7 +235,7 @@ module Datadog
         @duration_end = stop_time.nil? ? duration_marker : nil
 
         # Trigger after_stop event
-        events.after_stop.publish(self)
+        events.after_stop.publish(self, exception)
 
         self
       end
@@ -236,6 +251,10 @@ module Datadog
         !@end_time.nil?
       end
 
+      def root?
+        parent_id == 0
+      end
+
       # for backwards compatibility
       def start_time=(time)
         time.tap { start(time) }
@@ -349,11 +368,13 @@ module Datadog
         DEFAULT_ON_ERROR = proc { |span_op, error| span_op.set_error(error) unless span_op.nil? }
 
         attr_reader \
+          :logger,
           :after_finish,
           :after_stop,
           :before_start
 
-        def initialize(on_error: nil)
+        def initialize(logger: Datadog.logger, on_error: nil)
+          @logger = logger
           @after_finish = AfterFinish.new
           @after_stop = AfterStop.new
           @before_start = BeforeStart.new
@@ -362,7 +383,7 @@ module Datadog
         # This event is lazily initialized as error paths
         # are normally less common that non-error paths.
         def on_error
-          @on_error ||= OnError.new(DEFAULT_ON_ERROR)
+          @on_error ||= OnError.new(DEFAULT_ON_ERROR, logger: logger)
         end
 
         # Triggered when the span is finished, regardless of error.
@@ -388,10 +409,13 @@ module Datadog
 
         # Triggered when the span raises an error during measurement.
         class OnError
-          def initialize(default)
+          def initialize(default, logger: Datadog.logger)
             @handler = default
+            @logger = logger
           end
 
+          attr_reader :logger
+
           # Call custom error handler but fallback to default behavior on failure.
 
           # DEV: Revisit this before full 1.0 release.
@@ -405,9 +429,9 @@ module Datadog
               begin
                 yield(op, error)
               rescue StandardError => e
-                Datadog.logger.debug do
+                logger.debug do
                   "Custom on_error handler #{@handler} failed, using fallback behavior. \
-                  Cause: #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}"
+                  Cause: #{e.class}: #{e} Location: #{Array(e.backtrace).first}"
                 end
 
                 original.call(op, error) if original
@@ -419,8 +443,8 @@ module Datadog
             begin
               @handler.call(*args)
             rescue StandardError => e
-              Datadog.logger.debug do
-                "Error in on_error handler '#{@default}': #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
+              logger.debug do
+                "Error in on_error handler '#{@default}': #{e.class}: #{e} at #{Array(e.backtrace).first}"
               end
             end
 

data/lib/datadog/tracing/trace_operation.rb

@@ -40,6 +40,7 @@ module Datadog
         :baggage
 
       attr_reader \
+        :logger,
         :active_span_count,
         :active_span,
         :id,
@@ -55,6 +56,7 @@ module Datadog
         :service
 
       def initialize(
+        logger: Datadog.logger,
         agent_sample_rate: nil,
         events: nil,
         hostname: nil,
@@ -79,8 +81,9 @@ module Datadog
         remote_parent: false,
         tracer: nil,
         baggage: nil
-
       )
+        @logger = logger
+
         # Attributes
         @id = id || Tracing::Utils::TraceId.next_id
         @max_length = max_length || DEFAULT_MAX_LENGTH
@@ -204,6 +207,7 @@ module Datadog
 
       def measure(
         op_name,
+        logger: Datadog.logger,
         events: nil,
         on_error: nil,
         resource: nil,
@@ -217,7 +221,9 @@ module Datadog
         # Don't allow more span measurements if the
         # trace is already completed. Prevents multiple
         # root spans with parent_span_id = 0.
-        return yield(SpanOperation.new(op_name), TraceOperation.new) if finished? || full?
+        return yield( # rubocop:disable Style/MultilineIfModifier
+          SpanOperation.new(op_name, logger: logger),
+          TraceOperation.new(logger: logger)) if finished? || full?
 
         # Create new span
         span_op = build_span(
@@ -238,6 +244,7 @@ module Datadog
 
       def build_span(
         op_name,
+        logger: Datadog.logger,
         events: nil,
         on_error: nil,
         resource: nil,
@@ -259,7 +266,7 @@ module Datadog
           parent_id = parent ? parent.id : @parent_span_id || 0
 
           # Build events
-          events ||= SpanOperation::Events.new
+          events ||= SpanOperation::Events.new(logger: logger)
 
           # Before start: activate the span, publish events.
           events.before_start.subscribe do |span_op|
@@ -274,6 +281,7 @@ module Datadog
           # Build a new span operation
           SpanOperation.new(
             op_name,
+            logger: logger,
             events: events,
             on_error: on_error,
             parent_id: parent_id,
@@ -286,10 +294,10 @@ module Datadog
             id: id
           )
         rescue StandardError => e
-          Datadog.logger.debug { "Failed to build new span: #{e}" }
+          logger.debug { "Failed to build new span: #{e}" }
 
           # Return dummy span
-          SpanOperation.new(op_name)
+          SpanOperation.new(op_name, logger: logger)
         end
       end
 
@@ -465,7 +473,7 @@ module Datadog
           # Publish :span_before_start event
           events.span_before_start.publish(span_op, self)
         rescue StandardError => e
-          Datadog.logger.debug { "Error starting span on trace: #{e} Backtrace: #{e.backtrace.first(3)}" }
+          logger.debug { "Error starting span on trace: #{e} Backtrace: #{e.backtrace.first(3)}" }
         end
       end
 
@@ -489,7 +497,7 @@ module Datadog
           # Publish :trace_finished event
           events.trace_finished.publish(self) if finished?
         rescue StandardError => e
-          Datadog.logger.debug { "Error finishing span on trace: #{e} Backtrace: #{e.backtrace.first(3)}" }
+          logger.debug { "Error finishing span on trace: #{e} Backtrace: #{e.backtrace.first(3)}" }
         end
       end
 

data/lib/datadog/tracing/tracer.rb

@@ -342,6 +342,7 @@ module Datadog
                                 digest.trace_sampling_priority
                               end
           TraceOperation.new(
+            logger: logger,
             hostname: hostname,
             profiling_enabled: profiling_enabled,
             apm_tracing_enabled: apm_tracing_enabled,
@@ -359,6 +360,7 @@ module Datadog
           )
         else
           TraceOperation.new(
+            logger: logger,
             hostname: hostname,
             profiling_enabled: profiling_enabled,
             apm_tracing_enabled: apm_tracing_enabled,
@@ -410,12 +412,13 @@ module Datadog
       )
         trace = _trace || start_trace(continue_from: continue_from)
 
-        events = SpanOperation::Events.new
+        events = SpanOperation::Events.new(logger: logger)
 
         if block
           # Ignore start time if a block has been given
           trace.measure(
             name,
+            logger: logger,
             events: events,
             on_error: on_error,
             resource: resource,
@@ -429,6 +432,7 @@ module Datadog
           # Return the new span
           span = trace.build_span(
             name,
+            logger: logger,
             events: events,
             on_error: on_error,
             resource: resource,
@@ -541,10 +545,10 @@ module Datadog
 
       # TODO: Make these dummy objects singletons to preserve memory.
       def skip_trace(name)
-        span = SpanOperation.new(name)
+        span = SpanOperation.new(name, logger: logger)
 
         if block_given?
-          trace = TraceOperation.new
+          trace = TraceOperation.new(logger: logger)
           yield(span, trace)
         else
           span

data/lib/datadog/tracing/utils.rb

@@ -24,7 +24,7 @@ module Datadog
 
       # While we only generate 63-bit integers due to limitations in other languages, we support
       # parsing 64-bit integers for distributed tracing since an upstream system may generate one
-      EXTERNAL_MAX_ID = 1 << 64
+      EXTERNAL_MAX_ID = (1 << 64) - 1
 
       # We use a custom random number generator because we want no interference
       # with the default one. Using the default prng, we could break code that

data/lib/datadog/version.rb

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

data/lib/datadog.rb

@@ -7,7 +7,6 @@ require_relative 'datadog/tracing/contrib'
 # Load other products (must follow tracing)
 require_relative 'datadog/profiling'
 require_relative 'datadog/appsec'
-# Line probes will not work on Ruby < 2.6 because of lack of :script_compiled
-# trace point. Only load DI on supported Ruby versions.
-require_relative 'datadog/di' if RUBY_VERSION >= '2.6' && RUBY_ENGINE != 'jruby'
+require_relative 'datadog/di'
+require_relative 'datadog/error_tracking'
 require_relative 'datadog/kit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.16.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-22 00:00:00.000000000 Z
+date: 2025-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
@@ -146,10 +152,16 @@ files:
 - ext/datadog_profiling_native_extension/unsafe_api_calls_check.c
 - ext/datadog_profiling_native_extension/unsafe_api_calls_check.h
 - ext/libdatadog_api/crashtracker.c
+- ext/libdatadog_api/crashtracker.h
 - ext/libdatadog_api/datadog_ruby_common.c
 - ext/libdatadog_api/datadog_ruby_common.h
 - ext/libdatadog_api/extconf.rb
+- ext/libdatadog_api/init.c
+- ext/libdatadog_api/library_config.c
+- ext/libdatadog_api/library_config.h
 - ext/libdatadog_api/macos_development.md
+- ext/libdatadog_api/process_discovery.c
+- ext/libdatadog_api/process_discovery.h
 - ext/libdatadog_extconf_helpers.rb
 - lib/datadog.rb
 - lib/datadog/appsec.rb
@@ -247,6 +259,7 @@ files:
 - lib/datadog/appsec/security_engine.rb
 - lib/datadog/appsec/security_engine/result.rb
 - lib/datadog/appsec/security_engine/runner.rb
+- lib/datadog/appsec/security_event.rb
 - lib/datadog/appsec/utils.rb
 - lib/datadog/appsec/utils/http.rb
 - lib/datadog/appsec/utils/http/media_range.rb
@@ -260,6 +273,7 @@ files:
 - lib/datadog/core/chunker.rb
 - lib/datadog/core/configuration.rb
 - lib/datadog/core/configuration/agent_settings_resolver.rb
+- lib/datadog/core/configuration/agentless_settings_resolver.rb
 - lib/datadog/core/configuration/base.rb
 - lib/datadog/core/configuration/components.rb
 - lib/datadog/core/configuration/ext.rb
@@ -267,6 +281,7 @@ files:
 - lib/datadog/core/configuration/option_definition.rb
 - lib/datadog/core/configuration/options.rb
 - lib/datadog/core/configuration/settings.rb
+- lib/datadog/core/configuration/stable_config.rb
 - lib/datadog/core/contrib/rails/utils.rb
 - lib/datadog/core/crashtracking/component.rb
 - lib/datadog/core/crashtracking/tag_builder.rb
@@ -302,6 +317,7 @@ files:
 - lib/datadog/core/metrics/metric.rb
 - lib/datadog/core/metrics/options.rb
 - lib/datadog/core/pin.rb
+- lib/datadog/core/process_discovery.rb
 - lib/datadog/core/rate_limiter.rb
 - lib/datadog/core/remote.rb
 - lib/datadog/core/remote/client.rb
@@ -334,16 +350,17 @@ files:
 - lib/datadog/core/telemetry/event.rb
 - lib/datadog/core/telemetry/ext.rb
 - lib/datadog/core/telemetry/http/adapters/net.rb
-- lib/datadog/core/telemetry/http/env.rb
-- lib/datadog/core/telemetry/http/ext.rb
-- lib/datadog/core/telemetry/http/response.rb
-- lib/datadog/core/telemetry/http/transport.rb
 - lib/datadog/core/telemetry/logger.rb
 - lib/datadog/core/telemetry/logging.rb
 - lib/datadog/core/telemetry/metric.rb
 - lib/datadog/core/telemetry/metrics_collection.rb
 - lib/datadog/core/telemetry/metrics_manager.rb
 - lib/datadog/core/telemetry/request.rb
+- lib/datadog/core/telemetry/transport/http.rb
+- lib/datadog/core/telemetry/transport/http/api.rb
+- lib/datadog/core/telemetry/transport/http/client.rb
+- lib/datadog/core/telemetry/transport/http/telemetry.rb
+- lib/datadog/core/telemetry/transport/telemetry.rb
 - lib/datadog/core/telemetry/worker.rb
 - lib/datadog/core/transport/ext.rb
 - lib/datadog/core/transport/http.rb
@@ -391,6 +408,7 @@ files:
 - lib/datadog/core/workers/runtime_metrics.rb
 - lib/datadog/di.rb
 - lib/datadog/di/base.rb
+- lib/datadog/di/boot.rb
 - lib/datadog/di/code_tracker.rb
 - lib/datadog/di/component.rb
 - lib/datadog/di/configuration.rb
@@ -419,6 +437,14 @@ files:
 - lib/datadog/di/transport/http/input.rb
 - lib/datadog/di/transport/input.rb
 - lib/datadog/di/utils.rb
+- lib/datadog/error_tracking.rb
+- lib/datadog/error_tracking/collector.rb
+- lib/datadog/error_tracking/component.rb
+- lib/datadog/error_tracking/configuration.rb
+- lib/datadog/error_tracking/configuration/settings.rb
+- lib/datadog/error_tracking/ext.rb
+- lib/datadog/error_tracking/extensions.rb
+- lib/datadog/error_tracking/filters.rb
 - lib/datadog/kit.rb
 - lib/datadog/kit/appsec/events.rb
 - lib/datadog/kit/enable_core_dumps.rb
@@ -948,8 +974,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.15.0/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.15.0
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.16.0/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.16.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/datadog/core/telemetry/http/env.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module Core
-    module Telemetry
-      module Http
-        # Data structure for an HTTP request
-        class Env
-          attr_accessor :path, :body
-
-          attr_writer :headers
-
-          def headers
-            @headers ||= {}
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/core/telemetry/http/ext.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module Core
-    module Telemetry
-      module Http
-        module Ext
-          HEADER_DD_API_KEY = 'DD-API-KEY'
-          HEADER_CONTENT_TYPE = 'Content-Type'
-          HEADER_CONTENT_LENGTH = 'Content-Length'
-          HEADER_DD_TELEMETRY_API_VERSION = 'DD-Telemetry-API-Version'
-          HEADER_DD_TELEMETRY_REQUEST_TYPE = 'DD-Telemetry-Request-Type'
-          HEADER_TELEMETRY_DEBUG_ENABLED = 'DD-Telemetry-Debug-Enabled'
-          HEADER_CLIENT_LIBRARY_LANGUAGE = 'DD-Client-Library-Language'
-          HEADER_CLIENT_LIBRARY_VERSION = 'DD-Client-Library-Version'
-
-          CONTENT_TYPE_APPLICATION_JSON = 'application/json'
-          API_VERSION = 'v2'
-
-          AGENTLESS_HOST_PREFIX = 'instrumentation-telemetry-intake'
-
-          AGENT_ENDPOINT = '/telemetry/proxy/api/v2/apmtelemetry'
-          AGENTLESS_ENDPOINT = '/api/v2/apmtelemetry'
-        end
-      end
-    end
-  end
-end

data/lib/datadog/core/telemetry/http/response.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module Core
-    module Telemetry
-      module Http
-        # Module for base HTTP response
-        module Response
-          def payload
-            nil
-          end
-
-          def ok?
-            nil
-          end
-
-          def unsupported?
-            nil
-          end
-
-          def not_found?
-            nil
-          end
-
-          def client_error?
-            nil
-          end
-
-          def server_error?
-            nil
-          end
-
-          def internal_error?
-            nil
-          end
-
-          def code
-            nil
-          end
-
-          def inspect
-            "#{self.class} ok?:#{ok?} unsupported?:#{unsupported?}, " \
-            "not_found?:#{not_found?}, client_error?:#{client_error?}, " \
-            "server_error?:#{server_error?}, internal_error?:#{internal_error?}, " \
-            "payload:#{payload}"
-          end
-        end
-
-        # A generic error response for internal errors
-        class InternalErrorResponse
-          include Response
-
-          attr_reader :error
-
-          def initialize(error)
-            @error = error
-          end
-
-          def internal_error?
-            true
-          end
-
-          def inspect
-            "#{super}, error_type:#{error.class} error:#{error}"
-          end
-        end
-      end
-    end
-  end
-end