datadog 2.8.0 → 2.10.0

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

@@ -12,8 +12,11 @@ module Datadog
         attr_reader \
           :trace
 
-        def initialize(trace)
+        # @param trace [Datadog::Trace] the trace to serialize
+        # @param native_events_supported [Boolean] whether the agent supports span events as a top-level field
+        def initialize(trace, native_events_supported = false)
           @trace = trace
+          @native_events_supported = native_events_supported
         end
 
         # MessagePack serializer interface. Making this object
@@ -26,13 +29,13 @@ module Datadog
         # @param packer [MessagePack::Packer] serialization buffer, can be +nil+ with JRuby
         def to_msgpack(packer = nil)
           # As of 1.3.3, JRuby implementation doesn't pass an existing packer
-          trace.spans.map { |s| SerializableSpan.new(s) }.to_msgpack(packer)
+          trace.spans.map { |s| SerializableSpan.new(s, @native_events_supported) }.to_msgpack(packer)
         end
 
         # JSON serializer interface.
         # Used by older version of the transport.
         def to_json(*args)
-          trace.spans.map { |s| SerializableSpan.new(s).to_hash }.to_json(*args)
+          trace.spans.map { |s| SerializableSpan.new(s, @native_events_supported).to_hash }.to_json(*args)
         end
       end
 
@@ -41,9 +44,12 @@ module Datadog
         attr_reader \
           :span
 
-        def initialize(span)
+        # @param span [Datadog::Span] the span to serialize
+        # @param native_events_supported [Boolean] whether the agent supports span events as a top-level field
+        def initialize(span, native_events_supported)
           @span = span
           @trace_id = Tracing::Utils::TraceId.to_low_order(span.trace_id)
+          @native_events_supported = native_events_supported
         end
 
         # MessagePack serializer interface. Making this object
@@ -55,11 +61,14 @@ module Datadog
         #
         # @param packer [MessagePack::Packer] serialization buffer, can be +nil+ with JRuby
         # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/MethodLength
         def to_msgpack(packer = nil)
           packer ||= MessagePack::Packer.new
 
           number_of_elements_to_write = 11
 
+          number_of_elements_to_write += 1 if span.events.any? && @native_events_supported
+
           if span.stopped?
             packer.write_map_header(number_of_elements_to_write + 2) # Set header with how many elements in the map
 
@@ -72,8 +81,16 @@ module Datadog
             packer.write_map_header(number_of_elements_to_write) # Set header with how many elements in the map
           end
 
-          # serialize span events as meta tags
-          span.set_tag('events', span.events.map(&:to_hash).to_json) if span.events.any?
+          if span.events.any?
+            if @native_events_supported
+              # Use top-level field for native events
+              packer.write('span_events')
+              packer.write(span.events.map(&:to_native_format))
+            else
+              # Serialize span events as meta tags
+              span.set_tag('events', span.events.map(&:to_hash).to_json)
+            end
+          end
 
           # DEV: We use strings as keys here, instead of symbols, as
           # DEV: MessagePack will ultimately convert them to strings.
@@ -103,6 +120,7 @@ module Datadog
           packer
         end
         # rubocop:enable Metrics/AbcSize
+        # rubocop:enable Metrics/MethodLength
 
         # JSON serializer interface.
         # Used by older version of the transport.

data/lib/datadog/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Datadog, Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-10 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 14.3.1.1.0
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   datadog is Datadog's client library for Ruby. It includes a suite of tools
   which provide visibility into the performance and security of Ruby applications,
@@ -130,6 +144,8 @@ files:
 - ext/datadog_profiling_native_extension/stack_recorder.h
 - ext/datadog_profiling_native_extension/time_helpers.c
 - ext/datadog_profiling_native_extension/time_helpers.h
+- 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/datadog_ruby_common.c
 - ext/libdatadog_api/datadog_ruby_common.h
@@ -138,6 +154,7 @@ files:
 - ext/libdatadog_extconf_helpers.rb
 - lib/datadog.rb
 - lib/datadog/appsec.rb
+- lib/datadog/appsec/actions_handler.rb
 - lib/datadog/appsec/assets.rb
 - lib/datadog/appsec/assets/blocked.html
 - lib/datadog/appsec/assets/blocked.json
@@ -151,6 +168,7 @@ files:
 - lib/datadog/appsec/component.rb
 - lib/datadog/appsec/configuration.rb
 - lib/datadog/appsec/configuration/settings.rb
+- lib/datadog/appsec/context.rb
 - lib/datadog/appsec/contrib/active_record/instrumentation.rb
 - lib/datadog/appsec/contrib/active_record/integration.rb
 - lib/datadog/appsec/contrib/active_record/patcher.rb
@@ -192,7 +210,6 @@ files:
 - lib/datadog/appsec/contrib/rails/reactive/action.rb
 - lib/datadog/appsec/contrib/rails/request.rb
 - lib/datadog/appsec/contrib/rails/request_middleware.rb
-- lib/datadog/appsec/contrib/sinatra/ext.rb
 - lib/datadog/appsec/contrib/sinatra/framework.rb
 - lib/datadog/appsec/contrib/sinatra/gateway/request.rb
 - lib/datadog/appsec/contrib/sinatra/gateway/route_params.rb
@@ -207,22 +224,26 @@ files:
 - lib/datadog/appsec/instrumentation.rb
 - lib/datadog/appsec/instrumentation/gateway.rb
 - lib/datadog/appsec/instrumentation/gateway/argument.rb
+- lib/datadog/appsec/metrics.rb
+- lib/datadog/appsec/metrics/collector.rb
+- lib/datadog/appsec/metrics/exporter.rb
+- lib/datadog/appsec/metrics/telemetry.rb
 - lib/datadog/appsec/monitor.rb
 - lib/datadog/appsec/monitor/gateway/watcher.rb
 - lib/datadog/appsec/monitor/reactive/set_user.rb
 - lib/datadog/appsec/processor.rb
-- lib/datadog/appsec/processor/context.rb
 - lib/datadog/appsec/processor/rule_loader.rb
 - lib/datadog/appsec/processor/rule_merger.rb
 - lib/datadog/appsec/rate_limiter.rb
 - lib/datadog/appsec/reactive/address_hash.rb
 - lib/datadog/appsec/reactive/engine.rb
-- lib/datadog/appsec/reactive/operation.rb
 - lib/datadog/appsec/reactive/subscriber.rb
 - lib/datadog/appsec/remote.rb
 - lib/datadog/appsec/response.rb
 - lib/datadog/appsec/sample_rate.rb
-- lib/datadog/appsec/scope.rb
+- lib/datadog/appsec/security_engine.rb
+- lib/datadog/appsec/security_engine/result.rb
+- lib/datadog/appsec/security_engine/runner.rb
 - lib/datadog/appsec/utils.rb
 - lib/datadog/appsec/utils/http.rb
 - lib/datadog/appsec/utils/http/media_range.rb
@@ -244,7 +265,7 @@ files:
 - lib/datadog/core/configuration/option_definition.rb
 - lib/datadog/core/configuration/options.rb
 - lib/datadog/core/configuration/settings.rb
-- lib/datadog/core/crashtracking/agent_base_url.rb
+- lib/datadog/core/contrib/rails/utils.rb
 - lib/datadog/core/crashtracking/component.rb
 - lib/datadog/core/crashtracking/tag_builder.rb
 - lib/datadog/core/deprecations.rb
@@ -365,15 +386,18 @@ files:
 - lib/datadog/core/workers/queue.rb
 - lib/datadog/core/workers/runtime_metrics.rb
 - lib/datadog/di.rb
+- lib/datadog/di/base.rb
 - lib/datadog/di/code_tracker.rb
 - lib/datadog/di/component.rb
 - lib/datadog/di/configuration.rb
 - lib/datadog/di/configuration/settings.rb
+- lib/datadog/di/contrib.rb
 - lib/datadog/di/contrib/active_record.rb
+- lib/datadog/di/contrib/railtie.rb
 - lib/datadog/di/error.rb
 - lib/datadog/di/extensions.rb
-- lib/datadog/di/init.rb
 - lib/datadog/di/instrumenter.rb
+- lib/datadog/di/preload.rb
 - lib/datadog/di/probe.rb
 - lib/datadog/di/probe_builder.rb
 - lib/datadog/di/probe_manager.rb
@@ -726,7 +750,6 @@ files:
 - lib/datadog/tracing/contrib/rails/patcher.rb
 - lib/datadog/tracing/contrib/rails/railtie.rb
 - lib/datadog/tracing/contrib/rails/runner.rb
-- lib/datadog/tracing/contrib/rails/utils.rb
 - lib/datadog/tracing/contrib/rake/configuration/settings.rb
 - lib/datadog/tracing/contrib/rake/ext.rb
 - lib/datadog/tracing/contrib/rake/instrumentation.rb
@@ -902,9 +925,9 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.8.0/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.8.0
-post_install_message: 
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.10.0/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.10.0
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -922,8 +945,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications
 test_files: []

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

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module AppSec
-    module Contrib
-      module Sinatra
-        # Sinatra integration constants
-        module Ext
-          ROUTE_INTERRUPT = :datadog_appsec_contrib_sinatra_route_interrupt
-        end
-      end
-    end
-  end
-end

data/lib/datadog/appsec/processor/context.rb

@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module AppSec
-    class Processor
-      # Context manages a sequence of runs
-      class Context
-        LIBDDWAF_SUCCESSFUL_EXECUTION_CODES = [:ok, :match].freeze
-
-        attr_reader :time_ns, :time_ext_ns, :timeouts, :events
-
-        def initialize(handle, telemetry:)
-          @context = WAF::Context.new(handle)
-          @telemetry = telemetry
-
-          @time_ns = 0.0
-          @time_ext_ns = 0.0
-          @timeouts = 0
-          @events = []
-          @run_mutex = Mutex.new
-
-          @libddwaf_debug_tag = "libddwaf:#{WAF::VERSION::STRING} method:ddwaf_run"
-        end
-
-        def run(persistent_data, ephemeral_data, timeout = WAF::LibDDWAF::DDWAF_RUN_TIMEOUT)
-          @run_mutex.lock
-
-          start_ns = Core::Utils::Time.get_time(:nanosecond)
-
-          persistent_data.reject! do |_, v|
-            next false if v.is_a?(TrueClass) || v.is_a?(FalseClass)
-
-            v.nil? ? true : v.empty?
-          end
-
-          ephemeral_data.reject! do |_, v|
-            next false if v.is_a?(TrueClass) || v.is_a?(FalseClass)
-
-            v.nil? ? true : v.empty?
-          end
-
-          _code, result = try_run(persistent_data, ephemeral_data, timeout)
-
-          stop_ns = Core::Utils::Time.get_time(:nanosecond)
-
-          # these updates are not thread safe and should be protected
-          @time_ns += result.total_runtime
-          @time_ext_ns += (stop_ns - start_ns)
-          @timeouts += 1 if result.timeout
-
-          report_execution(result)
-          result
-        ensure
-          @run_mutex.unlock
-        end
-
-        def extract_schema
-          return unless extract_schema?
-
-          input = {
-            'waf.context.processor' => {
-              'extract-schema' => true
-            }
-          }
-
-          _code, result = try_run(input, {}, WAF::LibDDWAF::DDWAF_RUN_TIMEOUT)
-
-          report_execution(result)
-          result
-        end
-
-        def finalize
-          @context.finalize
-        end
-
-        private
-
-        def try_run(persistent_data, ephemeral_data, timeout)
-          @context.run(persistent_data, ephemeral_data, timeout)
-        rescue WAF::LibDDWAF::Error => e
-          Datadog.logger.debug { "#{@libddwaf_debug_tag} execution error: #{e} backtrace: #{e.backtrace&.first(3)}" }
-          @telemetry.report(e, description: 'libddwaf-rb internal low-level error')
-
-          [:err_internal, WAF::Result.new(:err_internal, [], 0.0, false, [], [])]
-        end
-
-        def report_execution(result)
-          Datadog.logger.debug { "#{@libddwaf_debug_tag} execution timed out: #{result.inspect}" } if result.timeout
-
-          if LIBDDWAF_SUCCESSFUL_EXECUTION_CODES.include?(result.status)
-            Datadog.logger.debug { "#{@libddwaf_debug_tag} execution result: #{result.inspect}" }
-          else
-            message = "#{@libddwaf_debug_tag} execution error: #{result.status.inspect}"
-
-            Datadog.logger.debug { message }
-            @telemetry.error(message)
-          end
-        end
-
-        def extract_schema?
-          Datadog.configuration.appsec.api_security.enabled &&
-            Datadog.configuration.appsec.api_security.sample_rate.sample?
-        end
-      end
-    end
-  end
-end

data/lib/datadog/appsec/reactive/operation.rb

@@ -1,68 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'engine'
-
-module Datadog
-  module AppSec
-    module Reactive
-      # Reactive Engine nested operation tracking
-      class Operation
-        attr_reader :reactive,
-          :parent,
-          :name
-
-        def initialize(name, parent = nil, reactive_engine = nil)
-          Datadog.logger.debug { "operation: #{name} initialize" }
-          @name = name
-          @parent = parent
-          @reactive = select_reactive_engine(reactive_engine, parent)
-
-          # TODO: concurrent store
-          # TODO: constant
-          Thread.current[:datadog_security_active_operation] = self
-
-          yield self if block_given?
-        ensure
-          finalize
-        end
-
-        # TODO: use structs instead of an arg splat
-        def subscribe(*addresses, &block)
-          reactive.subscribe(*addresses, &block)
-        end
-
-        def publish(address, data)
-          reactive.publish(address, data)
-        end
-
-        def finalize
-          Datadog.logger.debug { "operation: #{name} finalize" }
-          Thread.current[:datadog_security_active_operation] = parent
-        end
-
-        private
-
-        def select_reactive_engine(reactive, parent)
-          return reactive if reactive
-
-          return parent.reactive unless parent.nil?
-
-          Reactive::Engine.new
-        end
-
-        class << self
-          def active
-            Thread.current[:datadog_security_active_operation]
-          end
-
-          private
-
-          # For testing only.
-          def reset!
-            Thread.current[:datadog_security_active_operation] = nil
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/appsec/scope.rb

@@ -1,58 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module AppSec
-    # Capture context essential to consistently call processor and report via traces
-    class Scope
-      attr_reader :trace, :service_entry_span, :processor_context
-
-      def initialize(trace, service_entry_span, processor_context)
-        @trace = trace
-        @service_entry_span = service_entry_span
-        @processor_context = processor_context
-      end
-
-      def finalize
-        @processor_context.finalize
-      end
-
-      class << self
-        def activate_scope(trace, service_entry_span, processor)
-          raise ActiveScopeError, 'another scope is active, nested scopes are not supported' if active_scope
-
-          context = processor.new_context
-          self.active_scope = new(trace, service_entry_span, context)
-        end
-
-        def deactivate_scope
-          raise InactiveScopeError, 'no scope is active, nested scopes are not supported' unless active_scope
-
-          scope = active_scope
-
-          reset_active_scope
-
-          scope.finalize
-        end
-
-        def active_scope
-          Thread.current[:datadog_appsec_active_scope]
-        end
-
-        private
-
-        def active_scope=(scope)
-          raise ArgumentError, 'not a Datadog::AppSec::Scope' unless scope.instance_of?(Scope)
-
-          Thread.current[:datadog_appsec_active_scope] = scope
-        end
-
-        def reset_active_scope
-          Thread.current[:datadog_appsec_active_scope] = nil
-        end
-      end
-
-      class InactiveScopeError < StandardError; end
-      class ActiveScopeError < StandardError; end
-    end
-  end
-end

data/lib/datadog/core/crashtracking/agent_base_url.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../configuration/ext'
-
-module Datadog
-  module Core
-    module Crashtracking
-      # This module provides a method to resolve the base URL of the agent
-      module AgentBaseUrl
-        def self.resolve(agent_settings)
-          case agent_settings.adapter
-          when Datadog::Core::Configuration::Ext::Agent::HTTP::ADAPTER
-            "#{agent_settings.ssl ? 'https' : 'http'}://#{agent_settings.hostname}:#{agent_settings.port}/"
-          when Datadog::Core::Configuration::Ext::Agent::UnixSocket::ADAPTER
-            "unix://#{agent_settings.uds_path}"
-          end
-        end
-      end
-    end
-  end
-end