datadog 2.36.0 → 2.38.0

data/lib/datadog/tracing/contrib/active_job/data_streams.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require_relative '../../../data_streams'
+require_relative 'ext'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module ActiveJob
+        # Propagates Data Streams Monitoring pathway context through the serialized
+        # job payload, allowing produce (enqueue) and consume (perform) checkpoints
+        # to be connected across the process boundary.
+        #
+        # The DSM calls are rescued in isolation so a checkpoint failure can never
+        # break a job, while a genuine error raised by the underlying serialization
+        # still propagates.
+        #
+        # Only prepended on ActiveJob 5.0+, where `serialize`/`deserialize` are instance
+        # methods the framework routes through. ActiveJob 4.2 deserializes via a class
+        # method, so the pathway cannot be propagated there.
+        module DataStreams
+          def serialize
+            job_data = super
+            return job_data unless Datadog::DataStreams.enabled?
+
+            begin
+              Datadog::DataStreams.set_produce_checkpoint(
+                type: Ext::TAG_COMPONENT,
+                destination: queue_name,
+                auto_instrumentation: true
+              ) do |key, value|
+                job_data[key] = value
+              end
+            rescue => e
+              Datadog.logger.debug { "Error setting DSM produce checkpoint: #{e.class}: #{e.message}" }
+            end
+
+            job_data
+          end
+
+          def deserialize(job_data)
+            super
+
+            return unless Datadog::DataStreams.enabled?
+
+            begin
+              Datadog::DataStreams.set_consume_checkpoint(
+                type: Ext::TAG_COMPONENT,
+                source: queue_name,
+                auto_instrumentation: true
+              ) do |key|
+                job_data[key]
+              end
+            rescue => e
+              Datadog.logger.debug { "Error setting DSM consume checkpoint: #{e.class}: #{e.message}" }
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../patcher'
+require_relative 'data_streams'
 require_relative 'ext'
 require_relative 'events'
 require_relative 'log_injection'
@@ -22,6 +23,7 @@ module Datadog
           def patch
             Events.subscribe!
             inject_log_correlation
+            inject_data_streams
           end
 
           def inject_log_correlation
@@ -33,6 +35,16 @@ module Datadog
               end
             end
           end
+
+          def inject_data_streams
+            # ActiveJob 4.2 deserializes jobs through a class method rather than the
+            # instance method, so the DSM pathway can only be propagated on 5.0+.
+            return if ::ActiveJob.gem_version < Gem::Version.new('5.0.0')
+
+            ::ActiveSupport.on_load(:active_job) do
+              prepend DataStreams
+            end
+          end
         end
       end
     end

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

@@ -18,10 +18,9 @@ module Datadog
 
             def supported?
               Gem.loaded_specs['active_model_serializers'] \
-                && (
-                  Gem.loaded_specs['active_model_serializers'].version >= Gem::Version.new('0.9') \
+                &&
+                Gem.loaded_specs['active_model_serializers'].version >= Gem::Version.new('0.9') \
                   && Gem.loaded_specs['active_model_serializers'].version < Gem::Version.new('0.10')
-                )
             end
 
             def event_name

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

@@ -28,19 +28,19 @@ module Datadog
               end
             end
 
-            def exec_params(sql, params, *args, &block)
+            def exec_params(sql, *args, &block)
               return super unless enabled?
 
               trace(Ext::SPAN_EXEC_PARAMS, sql: sql, block: block) do |sql_statement, wrapped_block|
-                super(sql_statement, params, *args, &wrapped_block)
+                super(sql_statement, *args, &wrapped_block)
               end
             end
 
-            def exec_prepared(statement_name, params, *args, &block)
+            def exec_prepared(statement_name, *args, &block)
               return super unless enabled?
 
               trace(Ext::SPAN_EXEC_PREPARED, statement_name: statement_name, block: block) do |_, wrapped_block|
-                super(statement_name, params, *args, &wrapped_block)
+                super(statement_name, *args, &wrapped_block)
               end
             end
 
@@ -54,20 +54,20 @@ module Datadog
             end
 
             # async_exec_params is an alias to exec_params
-            def async_exec_params(sql, params, *args, &block)
+            def async_exec_params(sql, *args, &block)
               return super unless enabled?
 
               trace(Ext::SPAN_ASYNC_EXEC_PARAMS, sql: sql, block: block) do |sql_statement, wrapped_block|
-                super(sql_statement, params, *args, &wrapped_block)
+                super(sql_statement, *args, &wrapped_block)
               end
             end
 
             # async_exec_prepared is an alias to exec_prepared
-            def async_exec_prepared(statement_name, params, *args, &block)
+            def async_exec_prepared(statement_name, *args, &block)
               return super unless enabled?
 
               trace(Ext::SPAN_ASYNC_EXEC_PREPARED, statement_name: statement_name, block: block) do |_, wrapped_block|
-                super(statement_name, params, *args, &wrapped_block)
+                super(statement_name, *args, &wrapped_block)
               end
             end
 
@@ -79,19 +79,19 @@ module Datadog
               end
             end
 
-            def sync_exec_params(sql, params, *args, &block)
+            def sync_exec_params(sql, *args, &block)
               return super unless enabled?
 
               trace(Ext::SPAN_SYNC_EXEC_PARAMS, sql: sql, block: block) do |sql_statement, wrapped_block|
-                super(sql_statement, params, *args, &wrapped_block)
+                super(sql_statement, *args, &wrapped_block)
               end
             end
 
-            def sync_exec_prepared(statement_name, params, *args, &block)
+            def sync_exec_prepared(statement_name, *args, &block)
               return super unless enabled?
 
               trace(Ext::SPAN_SYNC_EXEC_PREPARED, statement_name: statement_name, block: block) do |_, wrapped_block|
-                super(statement_name, params, *args, &wrapped_block)
+                super(statement_name, *args, &wrapped_block)
               end
             end
 

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

@@ -56,7 +56,7 @@ module Datadog
               end
             end
 
-            following = (middleware.instance_variable_get('@app') if middleware.instance_variable_defined?('@app'))
+            following = (middleware.instance_variable_get(:@app) if middleware.instance_variable_defined?(:@app))
 
             retain_middleware_name(following)
           end

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

@@ -34,8 +34,8 @@ module Datadog
 
             def parse_opts(sql, opts, db_opts, dataset = nil)
               # Prepared statements don't provide their sql query in the +sql+ parameter.
-              if !sql.is_a?(String) && (dataset&.respond_to?(:prepared_sql) &&
-                (resolved_sql = dataset.prepared_sql))
+              if !sql.is_a?(String) && dataset&.respond_to?(:prepared_sql) &&
+                  (resolved_sql = dataset.prepared_sql)
                 # The dataset contains the resolved SQL query and prepared statement name.
                 prepared_name = dataset.prepared_statement_name
                 sql = resolved_sql

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

@@ -69,7 +69,7 @@ module Datadog
 
               args = job['args']
               if args && !args.empty?
-                span.set_tag(Ext::TAG_JOB_ARGS, Contrib::Utils::Quantization::HashFormatter.format(args, (@quantize[:args] || {})))
+                span.set_tag(Ext::TAG_JOB_ARGS, Contrib::Utils::Quantization::HashFormatter.format(args, @quantize[:args] || {}))
               end
 
               yield

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

@@ -81,7 +81,7 @@ module Datadog
           # The block gets passed prepared arguments for the caller to decide
           # how to insert.
           def self.insert_middleware(builder, middleware, args, block)
-            use = builder.instance_variable_get('@use')
+            use = builder.instance_variable_get(:@use)
             wrapped = wrap_middleware(middleware, *args, &block)
 
             # Makes the insert idempotent

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative '../ext'
 require_relative '../metadata/ext'
 require_relative '../trace_digest'
 require_relative 'datadog_tags_codec'
@@ -243,7 +244,7 @@ module Datadog
         # Record telemetry metrics for baggage operations
         def record_telemetry_metric(metric_name, value, tags)
           telemetry = ::Datadog.send(:components).telemetry
-          telemetry.inc('instrumentation_telemetry_data.tracers', metric_name, value, tags: tags)
+          telemetry.inc(Tracing::Ext::TELEMETRY_METRICS_NAMESPACE, metric_name, value, tags: tags)
         end
       end
     end

data/lib/datadog/tracing/ext.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Tracing
+    module Ext
+      TELEMETRY_METRICS_NAMESPACE = 'tracers'
+    end
+  end
+end

data/lib/datadog/tracing/remote.rb

@@ -15,6 +15,9 @@ module Datadog
           1 << 13, # APM_TRACING_LOGS_INJECTION: Dynamic trace logs injection configuration
           1 << 14, # APM_TRACING_HTTP_HEADER_TAGS: Dynamic trace HTTP header tags configuration
           1 << 29, # APM_TRACING_SAMPLE_RULES: Dynamic trace sampling rules configuration
+          # APM_TRACING_ENABLE_DYNAMIC_INSTRUMENTATION (bit 38) is declared in
+          # DI::Remote.capabilities, not here, so it is registered only when DI
+          # is not explicitly disabled and the runtime supports DI.
         ].freeze
 
         def products
@@ -25,7 +28,7 @@ module Datadog
           CAPABILITIES
         end
 
-        def process_config(config, content)
+        def process_config(config, content, repository = nil)
           lib_config = config['lib_config']
 
           env_vars = Datadog::Tracing::Configuration::Dynamic::OPTIONS.map do |name, env_var, option|
@@ -39,9 +42,37 @@ module Datadog
             [env_var, value]
           end
 
+          if (di_enabled = lib_config['dynamic_instrumentation_enabled']) != nil # rubocop:disable Style/NonNilCheck
+            # repository is forwarded so that an enable signal can reconcile DI
+            # against probes delivered in an earlier poll while DI was stopped
+            # (see Datadog::DI::Remote.handle_rc_enablement).
+            Datadog::DI::Remote.handle_rc_enablement(di_enabled, repository)
+
+            if di_enabled
+              # DI was just (implicitly) enabled. A Symbol Database upload signal
+              # received in an earlier poll while DI was inactive was deferred by
+              # the component's DI-active gate; re-attempt it now. Mirrors the DI
+              # probe replay in handle_rc_enablement above. allow_initialization:
+              # false because this runs on the remote-config worker thread.
+              Datadog.send(:components, allow_initialization: false)&.symbol_database&.resume_pending_upload
+            else
+              # DI was disabled via remote configuration. In the nil-default
+              # (follows-DI) case, stop Symbol Database too so its TracePoint and
+              # scheduler don't keep uploading while DI is off. An explicit
+              # symbol_database.enabled = true is independent and keeps running.
+              Datadog.send(:components, allow_initialization: false)&.symbol_database&.stop_for_di_disable
+            end
+          end
+
           content.applied
 
-          Datadog.send(:components).telemetry.client_configuration_change!(env_vars)
+          # allow_initialization: false because process_config runs on the
+          # remote-config worker thread. If components haven't been built yet
+          # (e.g. during a teardown/reset window), the default `true` would
+          # synchronously build the entire component tree from this thread.
+          # The &. chain matches the pattern used by DI::Remote.handle_rc_enablement
+          # in the same dispatch path.
+          Datadog.send(:components, allow_initialization: false)&.telemetry&.client_configuration_change!(env_vars)
         rescue => e
           content.errored("#{e.class}: #{e.message}: #{Array(e.backtrace).join("\n")}")
         end
@@ -55,7 +86,7 @@ module Datadog
               case content.path.product
               when PRODUCT
                 config = parse_content(content)
-                process_config(config, content)
+                process_config(config, content, repository)
               end
             end
           end

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

@@ -117,7 +117,7 @@ module Datadog
 
           root_span.set_tag(
             Tracing::Metadata::Ext::Distributed::TAG_KNUTH_SAMPLING_RATE,
-            format('%.6f', (rate * 1e6).round / 1e6.to_f).sub(/\.?0+\z/, '')
+            format('%.6f', (rate * 1e6).round / 1e6).sub(/\.?0+\z/, '')
           )
         end
 

data/lib/datadog/version.rb

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

data/lib/datadog.rb

@@ -12,6 +12,7 @@ require_relative 'datadog/profiling'
 require_relative 'datadog/ai_guard'
 require_relative 'datadog/appsec'
 require_relative 'datadog/di'
+require_relative 'datadog/symbol_database/extensions'
 require_relative 'datadog/data_streams'
 require_relative 'datadog/open_feature'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.36.0
+  version: 2.38.0
 platform: ruby
 authors:
 - Datadog, Inc.
@@ -32,7 +32,7 @@ dependencies:
         version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 3.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
         version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 3.5.3
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
@@ -63,14 +63,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 35.0.0.1.0
+        version: 36.0.0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 35.0.0.1.0
+        version: 36.0.0.1.0
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -316,6 +316,10 @@ files:
 - lib/datadog/appsec/rate_limiter.rb
 - lib/datadog/appsec/remote.rb
 - lib/datadog/appsec/response.rb
+- lib/datadog/appsec/route_normalizer.rb
+- lib/datadog/appsec/route_normalizer/rails_route_pattern.rb
+- lib/datadog/appsec/route_normalizer/route_pattern.rb
+- lib/datadog/appsec/route_normalizer/route_text.rb
 - lib/datadog/appsec/sample_rate.rb
 - lib/datadog/appsec/security_engine.rb
 - lib/datadog/appsec/security_engine/engine.rb
@@ -328,6 +332,7 @@ files:
 - 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/body_reader.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
@@ -380,6 +385,7 @@ files:
 - lib/datadog/core/environment/vm_cache.rb
 - lib/datadog/core/environment/yjit.rb
 - lib/datadog/core/error.rb
+- lib/datadog/core/evp.rb
 - lib/datadog/core/extensions.rb
 - lib/datadog/core/feature_flags.rb
 - lib/datadog/core/git/ext.rb
@@ -514,6 +520,9 @@ files:
 - lib/datadog/di.rb
 - lib/datadog/di/base.rb
 - lib/datadog/di/boot.rb
+- lib/datadog/di/capture_expression.rb
+- lib/datadog/di/capture_expression_evaluator.rb
+- lib/datadog/di/capture_limits.rb
 - lib/datadog/di/code_tracker.rb
 - lib/datadog/di/component.rb
 - lib/datadog/di/configuration.rb
@@ -527,6 +536,7 @@ files:
 - lib/datadog/di/el/expression.rb
 - lib/datadog/di/error.rb
 - lib/datadog/di/extensions.rb
+- lib/datadog/di/fatal_exceptions.rb
 - lib/datadog/di/instrumenter.rb
 - lib/datadog/di/logger.rb
 - lib/datadog/di/preload.rb
@@ -572,7 +582,10 @@ files:
 - lib/datadog/open_feature/exposures/reporter.rb
 - lib/datadog/open_feature/exposures/worker.rb
 - lib/datadog/open_feature/ext.rb
-- lib/datadog/open_feature/hooks/flag_eval_hook.rb
+- lib/datadog/open_feature/flag_evaluation/aggregator.rb
+- lib/datadog/open_feature/flag_evaluation/writer.rb
+- lib/datadog/open_feature/hooks/flag_eval_evp_hook.rb
+- lib/datadog/open_feature/hooks/flag_eval_metrics_hook.rb
 - lib/datadog/open_feature/metrics/flag_eval_metrics.rb
 - lib/datadog/open_feature/native_evaluator.rb
 - lib/datadog/open_feature/noop_evaluator.rb
@@ -588,6 +601,7 @@ files:
 - lib/datadog/opentelemetry/ext.rb
 - lib/datadog/opentelemetry/logs.rb
 - lib/datadog/opentelemetry/metrics.rb
+- lib/datadog/opentelemetry/sdk.rb
 - lib/datadog/opentelemetry/sdk/configurator.rb
 - lib/datadog/opentelemetry/sdk/id_generator.rb
 - lib/datadog/opentelemetry/sdk/logs_exporter.rb
@@ -629,6 +643,7 @@ files:
 - lib/datadog/symbol_database.rb
 - lib/datadog/symbol_database/component.rb
 - lib/datadog/symbol_database/configuration.rb
+- lib/datadog/symbol_database/extensions.rb
 - lib/datadog/symbol_database/extractor.rb
 - lib/datadog/symbol_database/file_hash.rb
 - lib/datadog/symbol_database/logger.rb
@@ -691,6 +706,7 @@ files:
 - lib/datadog/tracing/contrib/action_view/patcher.rb
 - lib/datadog/tracing/contrib/action_view/utils.rb
 - lib/datadog/tracing/contrib/active_job/configuration/settings.rb
+- lib/datadog/tracing/contrib/active_job/data_streams.rb
 - lib/datadog/tracing/contrib/active_job/event.rb
 - lib/datadog/tracing/contrib/active_job/events.rb
 - lib/datadog/tracing/contrib/active_job/events/discard.rb
@@ -1081,6 +1097,7 @@ files:
 - lib/datadog/tracing/distributed/propagation_policy.rb
 - lib/datadog/tracing/distributed/trace_context.rb
 - lib/datadog/tracing/event.rb
+- lib/datadog/tracing/ext.rb
 - lib/datadog/tracing/flush.rb
 - lib/datadog/tracing/metadata.rb
 - lib/datadog/tracing/metadata/analytics.rb
@@ -1140,8 +1157,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.36.0/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.36.0
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.38.0/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.38.0
 post_install_message: 'JRuby support in the datadog gem is deprecated. Details: https://dtdg.co/jruby-deprecation'
 rdoc_options: []
 require_paths: