datadog 2.11.0 → 2.12.1

data/lib/datadog/di/transport/http.rb

@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+require 'uri'
+
+require_relative '../../core/environment/container'
+require_relative '../../core/environment/ext'
+require_relative '../../core/transport/ext'
+require_relative 'diagnostics'
+require_relative 'input'
+require_relative 'http/api'
+require_relative '../../core/transport/http'
+require_relative '../../../datadog/version'
+
+module Datadog
+  module DI
+    module Transport
+      # Namespace for HTTP transport components
+      module HTTP
+        module_function
+
+        # Builds a new Transport::HTTP::Client
+        def new(klass, &block)
+          Core::Transport::HTTP.build(
+            api_instance_class: API::Instance, &block
+          ).to_transport(klass)
+        end
+
+        # Builds a new Transport::HTTP::Client with default settings
+        # Pass a block to override any settings.
+        def diagnostics(
+          agent_settings:,
+          **options
+        )
+          new(DI::Transport::Diagnostics::Transport) do |transport|
+            transport.adapter(agent_settings)
+            transport.headers default_headers
+
+            apis = API.defaults
+
+            transport.api API::DIAGNOSTICS, apis[API::DIAGNOSTICS]
+
+            # Apply any settings given by options
+            unless options.empty?
+              transport.default_api = options[:api_version] if options.key?(:api_version)
+              transport.headers options[:headers] if options.key?(:headers)
+            end
+
+            # Call block to apply any customization, if provided
+            yield(transport) if block_given?
+          end
+        end
+
+        # Builds a new Transport::HTTP::Client with default settings
+        # Pass a block to override any settings.
+        def input(
+          agent_settings:,
+          **options
+        )
+          new(DI::Transport::Input::Transport) do |transport|
+            transport.adapter(agent_settings)
+            transport.headers default_headers
+
+            apis = API.defaults
+
+            transport.api API::INPUT, apis[API::INPUT]
+
+            # Apply any settings given by options
+            unless options.empty?
+              transport.default_api = options[:api_version] if options.key?(:api_version)
+              transport.headers options[:headers] if options.key?(:headers)
+            end
+
+            # Call block to apply any customization, if provided
+            yield(transport) if block_given?
+          end
+        end
+
+        def default_headers
+          {
+            Datadog::Core::Transport::Ext::HTTP::HEADER_CLIENT_COMPUTED_TOP_LEVEL => '1',
+            Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG => Datadog::Core::Environment::Ext::LANG,
+            Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_VERSION => Datadog::Core::Environment::Ext::LANG_VERSION,
+            Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER =>
+              Datadog::Core::Environment::Ext::LANG_INTERPRETER,
+            Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER_VENDOR => Core::Environment::Ext::LANG_ENGINE,
+            Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION =>
+              Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION
+          }.tap do |headers|
+            # Add container ID, if present.
+            container_id = Datadog::Core::Environment::Container.container_id
+            headers[Datadog::Core::Transport::Ext::HTTP::HEADER_CONTAINER_ID] = container_id unless container_id.nil?
+            # Pretend that stats computation are already done by the client
+            if Datadog.configuration.appsec.standalone.enabled
+              headers[Datadog::Core::Transport::Ext::HTTP::HEADER_CLIENT_COMPUTED_STATS] = 'yes'
+            end
+          end
+        end
+
+        def default_adapter
+          Datadog::Core::Configuration::Ext::Agent::HTTP::ADAPTER
+        end
+      end
+    end
+  end
+end

data/lib/datadog/di/transport/input.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require_relative '../../core/transport/parcel'
+require_relative 'http/client'
+
+module Datadog
+  module DI
+    module Transport
+      module Input
+        class EncodedParcel
+          include Datadog::Core::Transport::Parcel
+        end
+
+        class Request < Datadog::Core::Transport::Request
+        end
+
+        class Transport
+          attr_reader :client, :apis, :default_api, :current_api_id
+
+          def initialize(apis, default_api)
+            @apis = apis
+
+            @client = HTTP::Client.new(current_api)
+          end
+
+          def current_api
+            @apis[HTTP::API::INPUT]
+          end
+
+          def send_input(payload)
+            json = JSON.dump(payload)
+            parcel = EncodedParcel.new(json)
+            request = Request.new(parcel)
+
+            response = @client.send_input_payload(request)
+            unless response.ok?
+              # TODO Datadog::Core::Transport::InternalErrorResponse
+              # does not have +code+ method, what is the actual API of
+              # these response objects?
+              raise Error::AgentCommunicationError, "send_input failed: #{begin
+                response.code
+              rescue
+                "???"
+              end}: #{response.payload}"
+            end
+          rescue Error::AgentCommunicationError
+            raise
+          # Datadog::Core::Transport does not perform any exception mapping,
+          # therefore we could have any exception here from failure to parse
+          # agent URI for example.
+          # If we ever implement retries for network errors, we should distinguish
+          # actual network errors from non-network errors that are raised by
+          # transport code.
+          rescue => exc
+            raise Error::AgentCommunicationError, "send_input failed: #{exc.class}: #{exc}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/di.rb

@@ -16,7 +16,8 @@ require_relative 'di/probe_notifier_worker'
 require_relative 'di/redactor'
 require_relative 'di/remote'
 require_relative 'di/serializer'
-require_relative 'di/transport'
+#require_relative 'di/transport'
+require_relative 'di/transport/http'
 require_relative 'di/utils'
 
 module Datadog

data/lib/datadog/tracing/component.rb

@@ -49,6 +49,7 @@ module Datadog
         Tracing::Tracer.new(
           default_service: settings.service,
           enabled: settings.tracing.enabled,
+          logger: logger,
           trace_flush: trace_flush,
           sampler: sampler_delegator,
           span_sampler: build_span_sampler(settings),

data/lib/datadog/tracing/sync_writer.rb

@@ -17,17 +17,22 @@ module Datadog
     # @public_api
     class SyncWriter
       attr_reader \
+        :logger,
         :events,
-        :transport
+        :transport,
+        :agent_settings
 
       # @param [Datadog::Tracing::Transport::Traces::Transport] transport a custom transport instance.
       #   If provided, overrides `transport_options` and `agent_settings`.
       # @param [Hash<Symbol,Object>] transport_options options for the default transport instance.
       # @param [Datadog::Tracing::Configuration::AgentSettingsResolver::AgentSettings] agent_settings agent options for
       #   the default transport instance.
-      def initialize(transport: nil, transport_options: {}, agent_settings: nil)
+      def initialize(transport: nil, transport_options: {}, agent_settings: nil, logger: Datadog.logger)
+        @logger = logger
+        @agent_settings = agent_settings
+
         @transport = transport || begin
-          transport_options[:agent_settings] = agent_settings if agent_settings
+          transport_options = transport_options.merge(agent_settings: agent_settings) if agent_settings
           Transport::HTTP.default(**transport_options)
         end
 
@@ -40,7 +45,7 @@ module Datadog
       def write(trace)
         flush_trace(trace)
       rescue => e
-        Datadog.logger.debug(e)
+        logger.debug(e)
       end
 
       # Does nothing.

data/lib/datadog/tracing/tracer.rb

@@ -28,7 +28,8 @@ module Datadog
         :provider,
         :sampler,
         :span_sampler,
-        :tags
+        :tags,
+        :logger
 
       attr_accessor \
         :default_service,
@@ -48,21 +49,28 @@ module Datadog
       # @param tags [Hash] default tags added to all spans
       # @param writer [Datadog::Tracing::Writer] consumes traces returned by the provided +trace_flush+
       def initialize(
+        # rubocop:disable Style/KeywordParametersOrder
+        # https://github.com/rubocop/rubocop/issues/13933
         trace_flush: Flush::Finished.new,
         context_provider: DefaultContextProvider.new,
         default_service: Core::Environment::Ext::FALLBACK_SERVICE_NAME,
         enabled: true,
+        logger: Datadog.logger,
         sampler: Sampling::PrioritySampler.new(
           base_sampler: Sampling::AllSampler.new,
           post_sampler: Sampling::RuleSampler.new
         ),
         span_sampler: Sampling::Span::Sampler.new,
         tags: {},
-        writer: Writer.new
+        # writer is not defaulted because creating it requires agent_settings,
+        # which we do not have here and otherwise do not need.
+        writer:
+        # rubocop:enable Style/KeywordParametersOrder
       )
         @trace_flush = trace_flush
         @default_service = default_service
         @enabled = enabled
+        @logger = logger
         @provider = context_provider
         @sampler = sampler
         @span_sampler = span_sampler
@@ -146,7 +154,7 @@ module Datadog
                     active_trace
                   end
         rescue StandardError => e
-          Datadog.logger.debug { "Failed to trace: #{e}" }
+          logger.debug { "Failed to trace: #{e}" }
 
           # Tracing failed: fallback and run code without tracing.
           return skip_trace(name, &block)
@@ -268,7 +276,7 @@ module Datadog
           @sampler.sample!(trace_op)
         rescue StandardError => e
           SAMPLE_TRACE_LOG_ONLY_ONCE.run do
-            Datadog.logger.warn { "Failed to sample trace: #{e.class.name} #{e} at #{Array(e.backtrace).first}" }
+            logger.warn { "Failed to sample trace: #{e.class.name} #{e} at #{Array(e.backtrace).first}" }
           end
         end
       end
@@ -488,7 +496,7 @@ module Datadog
           @span_sampler.sample!(trace_op, span)
         rescue StandardError => e
           SAMPLE_SPAN_LOG_ONLY_ONCE.run do
-            Datadog.logger.warn { "Failed to sample span: #{e.class.name} #{e} at #{Array(e.backtrace).first}" }
+            logger.warn { "Failed to sample span: #{e.class.name} #{e} at #{Array(e.backtrace).first}" }
           end
         end
       end
@@ -504,7 +512,7 @@ module Datadog
           write(trace) if trace && !trace.empty?
         rescue StandardError => e
           FLUSH_TRACE_LOG_ONLY_ONCE.run do
-            Datadog.logger.warn { "Failed to flush trace: #{e.class.name} #{e} at #{Array(e.backtrace).first}" }
+            logger.warn { "Failed to flush trace: #{e.class.name} #{e} at #{Array(e.backtrace).first}" }
           end
         end
       end
@@ -518,7 +526,7 @@ module Datadog
         return unless trace && @writer
 
         if Datadog.configuration.diagnostics.debug
-          Datadog.logger.debug { "Writing #{trace.length} spans (enabled: #{@enabled})\n#{trace.spans.pretty_inspect}" }
+          logger.debug { "Writing #{trace.length} spans (enabled: #{@enabled})\n#{trace.spans.pretty_inspect}" }
         end
 
         @writer.write(trace)

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

@@ -1,14 +1,9 @@
 # frozen_string_literal: true
 
-require 'uri'
-
 require_relative '../../core/environment/container'
 require_relative '../../core/environment/ext'
 require_relative '../../core/transport/ext'
-require_relative '../../core/transport/http/adapters/net'
-require_relative '../../core/transport/http/adapters/test'
-require_relative '../../core/transport/http/adapters/unix_socket'
-require_relative '../../core/transport/http/builder'
+require_relative '../../core/transport/http'
 require_relative 'http/api'
 require_relative '../../../datadog/version'
 
@@ -17,21 +12,11 @@ module Datadog
     module Transport
       # Namespace for HTTP transport components
       module HTTP
-        # NOTE: Due to... legacy reasons... This class likes having a default `AgentSettings` instance to fall back to.
-        # Because we generate this instance with an empty instance of `Settings`, the resulting `AgentSettings` below
-        # represents only settings specified via environment variables + the usual defaults.
-        #
-        # DO NOT USE THIS IN NEW CODE, as it ignores any settings specified by users via `Datadog.configure`.
-        DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS = Datadog::Core::Configuration::AgentSettingsResolver.call(
-          Datadog::Core::Configuration::Settings.new,
-          logger: nil,
-        )
-
         module_function
 
         # Builds a new Transport::HTTP::Client
         def new(klass, &block)
-          Core::Transport::HTTP::Builder.new(
+          Core::Transport::HTTP.build(
             api_instance_class: API::Instance, &block
           ).to_transport(klass)
         end
@@ -39,7 +24,7 @@ module Datadog
         # Builds a new Transport::HTTP::Client with default settings
         # Pass a block to override any settings.
         def default(
-          agent_settings: DO_NOT_USE_ENVIRONMENT_AGENT_SETTINGS,
+          agent_settings:,
           **options
         )
           new(Transport::Traces::Transport) do |transport|
@@ -86,20 +71,6 @@ module Datadog
         def default_adapter
           Datadog::Core::Configuration::Ext::Agent::HTTP::ADAPTER
         end
-
-        # Add adapters to registry
-        Core::Transport::HTTP::Builder::REGISTRY.set(
-          Datadog::Core::Transport::HTTP::Adapters::Net,
-          Datadog::Core::Configuration::Ext::Agent::HTTP::ADAPTER
-        )
-        Core::Transport::HTTP::Builder::REGISTRY.set(
-          Datadog::Core::Transport::HTTP::Adapters::Test,
-          Datadog::Core::Transport::Ext::Test::ADAPTER
-        )
-        Core::Transport::HTTP::Builder::REGISTRY.set(
-          Datadog::Core::Transport::HTTP::Adapters::UnixSocket,
-          Datadog::Core::Transport::Ext::UnixSocket::ADAPTER
-        )
       end
     end
   end

data/lib/datadog/tracing/workers/trace_writer.rb

@@ -17,13 +17,20 @@ module Datadog
       # Writes traces to transport synchronously
       class TraceWriter < Core::Worker
         attr_reader \
-          :transport
+          :logger,
+          :transport,
+          :agent_settings
 
         # rubocop:disable Lint/MissingSuper
         def initialize(options = {})
+          @logger = options[:logger] || Datadog.logger
+
           transport_options = options.fetch(:transport_options, {})
 
-          transport_options[:agent_settings] = options[:agent_settings] if options.key?(:agent_settings)
+          if options.key?(:agent_settings)
+            @agent_settings = options[:agent_settings]
+            transport_options = transport_options.merge(agent_settings: @agent_settings)
+          end
 
           @transport = options.fetch(:transport) do
             Datadog::Tracing::Transport::HTTP.default(**transport_options)
@@ -43,7 +50,7 @@ module Datadog
           traces = process_traces(traces)
           flush_traces(traces)
         rescue StandardError => e
-          Datadog.logger.warn(
+          logger.warn(
             "Error while writing traces: dropped #{traces.length} items. Cause: #{e} Location: #{Array(e.backtrace).first}"
           )
         end

data/lib/datadog/tracing/workers.rb

@@ -18,8 +18,7 @@ module Datadog
         BACK_OFF_MAX = 5
         DEFAULT_SHUTDOWN_TIMEOUT = 1
 
-        attr_reader \
-          :trace_buffer
+        attr_reader :trace_buffer, :logger
 
         def initialize(options = {})
           @transport = options[:transport]
@@ -42,6 +41,8 @@ module Datadog
           @mutex = Mutex.new
           @worker = nil
           @run = false
+
+          @logger = options.fetch(:logger)
         end
 
         # Callback function that process traces and executes the +send_traces()+ method.
@@ -56,7 +57,7 @@ module Datadog
             # ensures that the thread will not die because of an exception.
             # TODO[manu]: findout the reason and reschedule the send if it's not
             # a fatal exception
-            Datadog.logger.warn(
+            logger.warn(
               "Error during traces flush: dropped #{traces.length} items. Cause: #{e} Location: #{Array(e.backtrace).first}"
             )
           end
@@ -68,7 +69,7 @@ module Datadog
             return if @run
 
             @run = true
-            Datadog.logger.debug { "Starting thread for: #{self}" }
+            logger.debug { "Starting thread for: #{self}" }
             @worker = Thread.new { perform }
             @worker.name = self.class.name
             @worker.thread_variable_set(:fork_safe, true)

data/lib/datadog/tracing/writer.rb

@@ -13,17 +13,24 @@ module Datadog
     # @public_api
     class Writer
       attr_reader \
+        :logger,
         :transport,
         :worker,
-        :events
+        :events,
+        :agent_settings
 
       def initialize(options = {})
+        @logger = options[:logger] || Datadog.logger
+
         # writer and transport parameters
         @buff_size = options.fetch(:buffer_size, Workers::AsyncTransport::DEFAULT_BUFFER_MAX_SIZE)
         @flush_interval = options.fetch(:flush_interval, Workers::AsyncTransport::DEFAULT_FLUSH_INTERVAL)
         transport_options = options.fetch(:transport_options, {})
 
-        transport_options[:agent_settings] = options[:agent_settings] if options.key?(:agent_settings)
+        if options.key?(:agent_settings)
+          @agent_settings = options[:agent_settings]
+          transport_options = transport_options.merge(agent_settings: @agent_settings)
+        end
 
         # transport and buffers
         @transport = options.fetch(:transport) do
@@ -119,7 +126,7 @@ module Datadog
         if worker_local
           worker_local.enqueue_trace(trace)
         elsif !@stopped
-          Datadog.logger.debug('Writer either failed to start or was stopped before #write could complete')
+          logger.debug('Writer either failed to start or was stopped before #write could complete')
         end
       end
 
@@ -160,7 +167,8 @@ module Datadog
           buffer_size: @buff_size,
           on_trace: @trace_handler,
           interval: @flush_interval,
-          shutdown_timeout: @shutdown_timeout
+          shutdown_timeout: @shutdown_timeout,
+          logger: logger,
         )
 
         @worker.start

data/lib/datadog/version.rb

@@ -3,8 +3,8 @@
 module Datadog
   module VERSION
     MAJOR = 2
-    MINOR = 11
-    PATCH = 0
+    MINOR = 12
+    PATCH = 1
     PRE = nil
     BUILD = nil
     # PRE and BUILD above are modified for dev gems during gem build GHA workflow

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -210,6 +210,9 @@ files:
 - lib/datadog/appsec/contrib/rails/patcher.rb
 - lib/datadog/appsec/contrib/rails/request.rb
 - lib/datadog/appsec/contrib/rails/request_middleware.rb
+- lib/datadog/appsec/contrib/rest_client/integration.rb
+- lib/datadog/appsec/contrib/rest_client/patcher.rb
+- lib/datadog/appsec/contrib/rest_client/request_ssrf_detection_patch.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
@@ -339,6 +342,7 @@ files:
 - lib/datadog/core/telemetry/request.rb
 - lib/datadog/core/telemetry/worker.rb
 - lib/datadog/core/transport/ext.rb
+- lib/datadog/core/transport/http.rb
 - lib/datadog/core/transport/http/adapters/net.rb
 - lib/datadog/core/transport/http/adapters/registry.rb
 - lib/datadog/core/transport/http/adapters/test.rb
@@ -403,7 +407,13 @@ files:
 - lib/datadog/di/redactor.rb
 - lib/datadog/di/remote.rb
 - lib/datadog/di/serializer.rb
-- lib/datadog/di/transport.rb
+- lib/datadog/di/transport/diagnostics.rb
+- lib/datadog/di/transport/http.rb
+- lib/datadog/di/transport/http/api.rb
+- lib/datadog/di/transport/http/client.rb
+- lib/datadog/di/transport/http/diagnostics.rb
+- lib/datadog/di/transport/http/input.rb
+- lib/datadog/di/transport/input.rb
 - lib/datadog/di/utils.rb
 - lib/datadog/kit.rb
 - lib/datadog/kit/appsec/events.rb
@@ -920,8 +930,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.11.0/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.11.0
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.12.1/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.12.1
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/datadog/di/transport.rb

@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'error'
-require_relative '../core/transport/http/adapters/net'
-
-module Datadog
-  module DI
-    # Transport for sending probe statuses and snapshots to local agent.
-    #
-    # Handles encoding of the payloads into multipart posts if necessary,
-    # body formatting/encoding, setting correct headers, etc.
-    #
-    # The transport does not handle batching of statuses or snapshots -
-    # the batching should be implemented upstream of this class.
-    #
-    # Timeout settings are forwarded from agent settings to the Net adapter.
-    #
-    # The send_* methods raise Error::AgentCommunicationError on errors
-    # (network errors and HTTP protocol errors). It is the responsibility
-    # of upstream code to rescue these exceptions appropriately to prevent them
-    # from being propagated to the application.
-    #
-    # @api private
-    class Transport
-      DIAGNOSTICS_PATH = '/debugger/v1/diagnostics'
-      INPUT_PATH = '/debugger/v1/input'
-
-      def initialize(agent_settings)
-        # Note that this uses host, port, timeout and TLS flag from
-        # agent settings.
-        @client = Core::Transport::HTTP::Adapters::Net.new(agent_settings)
-      end
-
-      def send_diagnostics(payload)
-        event_payload = Core::Vendor::Multipart::Post::UploadIO.new(
-          StringIO.new(JSON.dump(payload)), 'application/json', 'event.json'
-        )
-        payload = {'event' => event_payload}
-        # Core transport unconditionally specifies headers to underlying
-        # Net::HTTP client, ends up passing 'nil' as headers if none are
-        # specified by us, which then causes Net::HTTP to die with an exception.
-        send_request('Probe status submission',
-          path: DIAGNOSTICS_PATH, form: payload, headers: {})
-      end
-
-      def send_input(payload)
-        send_request('Probe snapshot submission',
-          path: INPUT_PATH, body: payload.to_json,
-          headers: {'content-type' => 'application/json'},)
-      end
-
-      # TODO status should use either input or diagnostics endpoints
-      # depending on agent version.
-      alias_method :send_status, :send_diagnostics
-
-      alias_method :send_snapshot, :send_input
-
-      private
-
-      attr_reader :client
-
-      def send_request(desc, **options)
-        env = Core::Transport::HTTP::Env.new(nil, options)
-        response = client.post(env)
-        unless response.ok?
-          raise Error::AgentCommunicationError, "#{desc} failed: #{response.code}: #{response.payload}"
-        end
-      # Datadog::Core::Transport does not perform any exception mapping,
-      # therefore we could have any exception here from failure to parse
-      # agent URI for example.
-      # If we ever implement retries for network errors, we should distinguish
-      # actual network errors from non-network errors that are raised by
-      # transport code.
-      rescue => exc
-        raise Error::AgentCommunicationError, "#{desc} failed: #{exc.class}: #{exc}"
-      end
-    end
-  end
-end