datadog 2.28.0 → 2.30.0

data/lib/datadog/tracing/contrib/rack/route_inference.rb

@@ -25,12 +25,15 @@ module Datadog
           end
 
           def infer(path)
-            segments = path.delete_prefix('/').split('/', MAX_NUMBER_OF_SEGMENTS + 1).first(MAX_NUMBER_OF_SEGMENTS)
+            count = 0
+            result = []
 
-            segments.map! do |segment| #: Array[String?]
+            split(path, '/') do |segment|
               next if segment.empty?
+              break if count >= MAX_NUMBER_OF_SEGMENTS
+              count += 1
 
-              case segment
+              result << case segment
               when INT_PARAM_REGEX then '{param:int}'
               when INT_ID_PARAM_REGEX then '{param:int_id}'
               when HEX_PARAM_REGEX then '{param:hex}'
@@ -40,12 +43,21 @@ module Datadog
               end
             end
 
-            segments.compact! #: Array[String]
-
-            "/#{segments.join("/")}"
+            result.empty? ? '/' : "/#{result.join('/')}"
           rescue
             nil
           end
+
+          if RUBY_VERSION >= '2.6.'
+            def split(path, pattern = nil, &block)
+              path.split(pattern, &block)
+            end
+          else
+            def split(path, pattern = nil, &block)
+              path.split(pattern).each(&block)
+              path
+            end
+          end
         end
       end
     end

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

@@ -51,8 +51,11 @@ module Datadog
               end
             end
 
-            option :distributed_tracing, default: true, type: :bool
-
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :request_queuing do |o|
               o.type :bool
               o.default false

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

@@ -9,6 +9,7 @@ module Datadog
         module Ext
           APP = 'rails'
           ENV_ENABLED = 'DD_TRACE_RAILS_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_RAILS_DISTRIBUTED_TRACING'
           # @!visibility private
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_RAILS_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RAILS_ANALYTICS_SAMPLE_RATE'

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

@@ -33,6 +33,17 @@ module Datadog
           def register_as(name, registry: Contrib::REGISTRY, auto_patch: false, **options)
             registry.add(name, new(name, **options), auto_patch)
           end
+
+          # Registers this `as` in the global tracer registry as an alias of `original_name`.
+          # Using `as` or `original_name` become interchangeable.
+          # The configuration object is shared between the two names.
+          # The patcher will only run once if both are activated.
+          def register_alias_for(original_name, as:, registry: Contrib::REGISTRY)
+            original = registry[original_name]
+            raise ArgumentError, "integration '#{original_name}' not registered" unless original
+
+            registry.add(as, original, false)
+          end
         end
 
         # Instance methods for registerable behavior

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

@@ -30,8 +30,11 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
-
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :service_name do |o|
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(

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

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_REST_CLIENT_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_REST_CLIENT_DISTRIBUTED_TRACING'
           ENV_SERVICE_NAME = 'DD_TRACE_REST_CLIENT_SERVICE_NAME'
           ENV_PEER_SERVICE = 'DD_TRACE_REST_CLIENT_PEER_SERVICE'
           # @!visibility private

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

@@ -38,7 +38,11 @@ module Datadog
             end
 
             option :quantize, default: {}, type: :hash
-            option :distributed_tracing, default: false, type: :bool
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default false
+            end
           end
         end
       end

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

@@ -12,6 +12,7 @@ module Datadog
           # @!visibility private
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_SIDEKIQ_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SIDEKIQ_ANALYTICS_SAMPLE_RATE'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_SIDEKIQ_DISTRIBUTED_TRACING'
           SERVICE_NAME = 'sidekiq'
           SIDEKIQ_8_SECONDS_PER_INTEGER = 0.001 # Sidekiq 8 uses integer epoch milliseconds, rather than epoch floats
           SPAN_PUSH = 'sidekiq.push'

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

@@ -33,7 +33,11 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :headers, default: DEFAULT_HEADERS, type: :hash
             option :resource_script_names, default: false, type: :bool
 

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

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_SINATRA_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_SINATRA_DISTRIBUTED_TRACING'
           # @!visibility private
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_SINATRA_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SINATRA_ANALYTICS_SAMPLE_RATE'

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

@@ -13,13 +13,24 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('2.12.0')
+          MINIMUM_SNEAKERS_VERSION = Gem::Version.new('2.12.0')
+          # All versions are supported. Kicks first version is 3.0.0.
+          MINIMUM_KICKS_VERSION = Gem::Version.new('3.0.0')
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :sneakers, auto_patch: true
-
+          register_alias_for :sneakers, as: :kicks
+
+          # Sneakers development continues in the Kicks gem.
+          # The **only** thing that has changed is the gem name,
+          # even the file naming and module namespacing are the same (require 'sneakers', `::Sneakers`).
+          #
+          # The last version of Sneakers is 2.12.0.
+          # The first version of Kicks is 3.0.0. We currently support all versions of Kicks.
+          #
+          # @see https://github.com/jondot/sneakers/commit/9780692624c666b6db8266d2d5710f709cb0f2e2
           def self.version
-            Gem.loaded_specs['sneakers']&.version
+            Gem.loaded_specs['sneakers']&.version || Gem.loaded_specs['kicks']&.version
           end
 
           def self.loaded?
@@ -27,7 +38,7 @@ module Datadog
           end
 
           def self.compatible?
-            super && version >= MINIMUM_VERSION
+            super && !!(version&.>= MINIMUM_SNEAKERS_VERSION)
           end
 
           def new_configuration

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

@@ -51,6 +51,12 @@ module Datadog
               o.default false
             end
 
+            option :inject_sql_basehash do |o|
+              o.type :bool
+              o.env Contrib::Propagation::SqlComment::Ext::ENV_DBM_INJECT_SQL_BASEHASH
+              o.default false
+            end
+
             option :peer_service do |o|
               o.type :string, nilable: true
               o.env Ext::ENV_PEER_SERVICE

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

@@ -57,7 +57,9 @@ module Datadog
                 Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
 
                 propagation_mode = Contrib::Propagation::SqlComment::Mode.new(
-                  comment_propagation, datadog_configuration[:append_comment]
+                  comment_propagation,
+                  datadog_configuration[:append_comment],
+                  datadog_configuration[:inject_sql_basehash]
                 )
 
                 Contrib::Propagation::SqlComment.annotate!(span, propagation_mode)

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

@@ -18,7 +18,11 @@ module Datadog
 
             option :service_name
 
-            option :distributed_tracing, default: false, type: :bool
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default false
+            end
           end
         end
       end

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

@@ -6,6 +6,7 @@ module Datadog
       module WaterDrop
         module Ext
           ENV_ENABLED = 'DD_TRACE_WATERDROP_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_WATERDROP_DISTRIBUTED_TRACING'
 
           SPAN_PRODUCER = 'karafka.produce'
 

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

@@ -66,6 +66,10 @@ module Datadog
           TAG_DD_PARENT_ID = '_dd.parent_id'
           DD_PARENT_ID_DEFAULT = '0000000000000000'
 
+          # Knuth Sampling Rate: the sampling rate applied by agent-based or rule-based sampling.
+          # This is a propagated tag (prefixed with `_dd.p.`) that is included in `x-datadog-tags`.
+          TAG_KNUTH_SAMPLING_RATE = '_dd.p.ksr'
+
           # Trace tags with this prefix will propagate from a trace through distributed tracing.
           # Distributed headers tags with this prefix will be injected into the active trace.
           TAGS_PREFIX = '_dd.p.'

data/lib/datadog/tracing/sync_writer.rb

@@ -9,7 +9,6 @@ require_relative 'transport/http'
 module Datadog
   module Tracing
     # SyncWriter flushes both services and traces synchronously
-    # DEV: To be replaced by Datadog::Tracing::Workers::TraceWriter.
     #
     # Note: If you're wondering if this class is used at all, since there are no other references to it on the codebase,
     # the separate `datadog-lambda` uses it as of February 2021:

data/lib/datadog/tracing/transport/io/client.rb

@@ -19,8 +19,11 @@ module Datadog
             @out = out
             @encoder = encoder
 
+            # Note: The :encode option was previously supported but is no longer used.
+            # Data is now expected to be pre-encoded in the Parcel before reaching this client,
+            # matching the behavior of other transports (e.g., HTTP transport).
+            # If provided, the :encode option will be silently ignored for backwards compatibility.
             @request_block = options.fetch(:request, method(:send_default_request))
-            @encode_block = options.fetch(:encode, method(:encode_data))
             @write_block = options.fetch(:write, method(:write_data))
             @response_block = options.fetch(:response, method(:build_response))
           end
@@ -38,7 +41,6 @@ module Datadog
             # Update statistics
             update_stats_from_response!(response)
 
-            # Return response
             response
           rescue => e
             message =
@@ -59,10 +61,6 @@ module Datadog
             InternalErrorResponse.new(e)
           end
 
-          def encode_data(encoder, request)
-            request.parcel.encode_with(encoder)
-          end
-
           def write_data(out, data)
             out.puts(data)
           end
@@ -74,8 +72,7 @@ module Datadog
           private
 
           def send_default_request(out, request)
-            # Encode data
-            data = @encode_block.call(encoder, request)
+            data = request.parcel.data
 
             # Write to IO
             result = @write_block.call(out, data)

data/lib/datadog/tracing/transport/io/traces.rb

@@ -21,29 +21,6 @@ module Datadog
             end
           end
 
-          # Extensions for HTTP client
-          module Client
-            def send_traces(traces)
-              # Build a request
-              req = Transport::Traces::Request.new(Parcel.new(traces))
-
-              [send_request(req) do |out, request|
-                # Encode trace data
-                data = encode_data(encoder, request)
-
-                # Write to IO
-                result = if block_given?
-                  yield(out, data)
-                else
-                  write_data(out, data)
-                end
-
-                # Generate response
-                Traces::Response.new(result)
-              end]
-            end
-          end
-
           # Encoder for IO-specific trace encoding
           # API compliant when used with {JSONEncoder}.
           module Encoder
@@ -54,13 +31,13 @@ module Datadog
             ].freeze
 
             # Encodes a list of traces
-            def encode_traces(encoder, traces)
+            def encode_traces(traces)
               trace_hashes = traces.map do |trace|
                 encode_trace(trace)
               end
 
-              # Wrap traces & encode them
-              encoder.encode(traces: trace_hashes)
+              # Wrap traces
+              {traces: trace_hashes}
             end
 
             private
@@ -78,17 +55,34 @@ module Datadog
             end
           end
 
-          # Transfer object for list of traces
-          class Parcel
-            include Datadog::Core::Transport::Parcel
+          # Extensions for HTTP client
+          module Client
             include Encoder
 
-            def count
-              data.length
-            end
+            def send_traces(traces)
+              # Build a request
+              encoded_traces = encode_traces(traces)
+              encoder = Core::Encoding::JSONEncoder
+              parcel = Core::Transport::Parcel.new(
+                encoder.encode(encoded_traces),
+                content_type: encoder.content_type,
+              )
+              req = Transport::Traces::Request.new(parcel)
+
+              [send_request(req) do |out, request|
+                # Get already-encoded data from parcel
+                data = request.parcel.data
+
+                # Write to IO
+                result = if block_given?
+                  yield(out, data)
+                else
+                  write_data(out, data)
+                end
 
-            def encode_with(encoder)
-              encode_traces(encoder, data)
+                # Generate response
+                Traces::Response.new(result)
+              end]
             end
           end
 

data/lib/datadog/tracing/transport/trace_formatter.rb

@@ -49,6 +49,7 @@ module Datadog
 
           tag_agent_sample_rate!
           tag_hostname!
+          tag_knuth_sampling_rate!
           tag_lang!
           tag_origin!
           tag_process_id!
@@ -110,6 +111,16 @@ module Datadog
           )
         end
 
+        def tag_knuth_sampling_rate!
+          rate = trace.rule_sample_rate || trace.agent_sample_rate
+          return unless rate
+
+          root_span.set_tag(
+            Tracing::Metadata::Ext::Distributed::TAG_KNUTH_SAMPLING_RATE,
+            format('%.6g', rate)
+          )
+        end
+
         def tag_lang!
           return if trace.lang.nil?
 

data/lib/datadog/tracing/transport/traces.rb

@@ -14,19 +14,13 @@ module Datadog
     module Transport
       module Traces
         # Data transfer object for encoded traces
-        class EncodedParcel
-          include Datadog::Core::Transport::Parcel
-
+        class Parcel < Core::Transport::Parcel
           attr_reader :trace_count
 
-          def initialize(data, trace_count)
-            super(data)
+          def initialize(data, trace_count:, **opts)
+            super(data, **opts)
             @trace_count = trace_count
           end
-
-          def count
-            data.length
-          end
         end
 
         # Traces request
@@ -135,7 +129,7 @@ module Datadog
             )
 
             responses = chunker.encode_in_chunks(traces.lazy).map do |encoded_traces, trace_count|
-              request = Request.new(EncodedParcel.new(encoded_traces, trace_count))
+              request = Request.new(Parcel.new(encoded_traces, trace_count: trace_count))
 
               client.send_request(:traces, request).tap do |response|
                 if downgrade?(response)

data/lib/datadog/tracing/writer.rb

@@ -9,7 +9,6 @@ require_relative 'transport/http'
 module Datadog
   module Tracing
     # Processor that sends traces and metadata to the agent
-    # DEV: Our goal is for {Datadog::Tracing::Workers::TraceWriter} to replace this class in the future
     # @public_api
     class Writer
       attr_reader \

data/lib/datadog/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.28.0
+  version: 2.30.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-04 00:00:00.000000000 Z
+date: 2026-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 25.0.0.1.0
+        version: 29.0.0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 25.0.0.1.0
+        version: 29.0.0.1.0
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +169,7 @@ files:
 - ext/datadog_profiling_native_extension/unsafe_api_calls_check.h
 - ext/libdatadog_api/crashtracker.c
 - ext/libdatadog_api/crashtracker.h
+- ext/libdatadog_api/crashtracker_report_exception.c
 - ext/libdatadog_api/datadog_ruby_common.c
 - ext/libdatadog_api/datadog_ruby_common.h
 - ext/libdatadog_api/ddsketch.c
@@ -260,7 +261,7 @@ files:
 - lib/datadog/appsec/contrib/rack/patcher.rb
 - lib/datadog/appsec/contrib/rack/request_body_middleware.rb
 - lib/datadog/appsec/contrib/rack/request_middleware.rb
-- lib/datadog/appsec/contrib/rails/ext.rb
+- lib/datadog/appsec/contrib/rack/response_body.rb
 - lib/datadog/appsec/contrib/rails/framework.rb
 - lib/datadog/appsec/contrib/rails/gateway/request.rb
 - lib/datadog/appsec/contrib/rails/gateway/watcher.rb
@@ -281,6 +282,7 @@ files:
 - lib/datadog/appsec/contrib/sinatra/patcher.rb
 - lib/datadog/appsec/contrib/sinatra/patches/json_patch.rb
 - lib/datadog/appsec/contrib/sinatra/request_middleware.rb
+- lib/datadog/appsec/counter_sampler.rb
 - lib/datadog/appsec/event.rb
 - lib/datadog/appsec/ext.rb
 - lib/datadog/appsec/extensions.rb
@@ -310,8 +312,10 @@ files:
 - lib/datadog/appsec/utils.rb
 - lib/datadog/appsec/utils/hash_coercion.rb
 - lib/datadog/appsec/utils/http.rb
+- lib/datadog/appsec/utils/http/body.rb
 - lib/datadog/appsec/utils/http/media_range.rb
 - lib/datadog/appsec/utils/http/media_type.rb
+- lib/datadog/appsec/utils/http/url_encoded.rb
 - lib/datadog/auto_instrument.rb
 - lib/datadog/auto_instrument_base.rb
 - lib/datadog/core.rb
@@ -454,6 +458,7 @@ files:
 - lib/datadog/core/utils/at_fork_monkey_patch.rb
 - lib/datadog/core/utils/base64.rb
 - lib/datadog/core/utils/duration.rb
+- lib/datadog/core/utils/fnv.rb
 - lib/datadog/core/utils/forking.rb
 - lib/datadog/core/utils/hash.rb
 - lib/datadog/core/utils/lru_cache.rb
@@ -516,6 +521,7 @@ files:
 - lib/datadog/di/probe_manager.rb
 - lib/datadog/di/probe_notification_builder.rb
 - lib/datadog/di/probe_notifier_worker.rb
+- lib/datadog/di/probe_repository.rb
 - lib/datadog/di/proc_responder.rb
 - lib/datadog/di/redactor.rb
 - lib/datadog/di/remote.rb
@@ -539,6 +545,7 @@ files:
 - lib/datadog/kit/appsec/events/v2.rb
 - lib/datadog/kit/enable_core_dumps.rb
 - lib/datadog/kit/identity.rb
+- lib/datadog/kit/tracing/method_tracer.rb
 - lib/datadog/open_feature.rb
 - lib/datadog/open_feature/component.rb
 - lib/datadog/open_feature/configuration.rb
@@ -1088,7 +1095,6 @@ files:
 - lib/datadog/tracing/transport/traces.rb
 - lib/datadog/tracing/utils.rb
 - lib/datadog/tracing/workers.rb
-- lib/datadog/tracing/workers/trace_writer.rb
 - lib/datadog/tracing/writer.rb
 - lib/datadog/version.rb
 homepage: https://github.com/DataDog/dd-trace-rb
@@ -1097,8 +1103,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.28.0/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.28.0
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.30.0/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.30.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/datadog/appsec/contrib/rails/ext.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module AppSec
-    module Contrib
-      module Rails
-        # Rails integration constants
-        module Ext
-        end
-      end
-    end
-  end
-end