datadog 2.4.0 → 2.44.0

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../statistics'
+require_relative "../statistics"
 
 module Datadog
   module Tracing
@@ -30,7 +30,7 @@ module Datadog
             private
 
             # The most common status code on a healthy tracer
-            STATUS_CODE_200 = 'status_code:200'
+            STATUS_CODE_200 = "status_code:200"
 
             def metrics_tag_value(status_code)
               if status_code == 200

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

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
-require_relative '../traces'
-require_relative 'client'
-require_relative '../../../core/transport/http/response'
-require_relative '../../../core/transport/http/api/endpoint'
-require_relative 'api/instance'
+require_relative "../../../core/transport/http/response"
+require_relative "../../../core/transport/http/api/endpoint"
+require_relative "../../../core/transport/http/api/instance"
+require_relative "../traces"
 
 module Datadog
   module Tracing
@@ -26,88 +25,15 @@ module Datadog
             end
           end
 
-          # Extensions for HTTP client
-          module Client
-            def send_traces_payload(request)
-              send_request(request) do |api, env|
-                api.send_traces(env)
-              end
-            end
-          end
-
           module API
-            # Extensions for HTTP API Spec
-            module Spec
-              attr_reader :traces
-
-              def traces=(endpoint)
-                @traces = endpoint
-              end
-
-              def send_traces(env, &block)
-                raise NoTraceEndpointDefinedError, self if traces.nil?
-
-                traces.call(env, &block)
-              end
-
-              def encoder
-                traces.encoder
-              end
-
-              # Raised when traces sent but no traces endpoint is defined
-              class NoTraceEndpointDefinedError < StandardError
-                attr_reader :spec
-
-                def initialize(spec)
-                  super
-
-                  @spec = spec
-                end
-
-                def message
-                  'No trace endpoint is defined for API specification!'
-                end
-              end
-            end
-
-            # Extensions for HTTP API Instance
-            module Instance
-              def send_traces(env)
-                raise TracesNotSupportedError, spec unless spec.is_a?(Traces::API::Spec)
-
-                spec.send_traces(env) do |request_env|
-                  call(request_env)
-                end
-              end
-
-              # Raised when traces sent to API that does not support traces
-              class TracesNotSupportedError < StandardError
-                attr_reader :spec
-
-                def initialize(spec)
-                  super
-
-                  @spec = spec
-                end
-
-                def message
-                  'Traces not supported for this API!'
-                end
-              end
-            end
-
             # Endpoint for submitting trace data
             class Endpoint < Datadog::Core::Transport::HTTP::API::Endpoint
-              HEADER_CONTENT_TYPE = 'Content-Type'
-              HEADER_TRACE_COUNT = 'X-Datadog-Trace-Count'
-              SERVICE_RATE_KEY = 'rate_by_service'
-
-              attr_reader \
-                :encoder
+              HEADER_CONTENT_TYPE = "Content-Type"
+              HEADER_TRACE_COUNT = "X-Datadog-Trace-Count"
+              SERVICE_RATE_KEY = "rate_by_service"
 
               def initialize(path, encoder, options = {})
-                super(:post, path)
-                @encoder = encoder
+                super(:post, path, encoder: encoder)
                 @service_rates = options.fetch(:service_rates, false)
               end
 
@@ -124,10 +50,10 @@ module Datadog
                 env.body = env.request.parcel.data
 
                 # Query for response
-                http_response = super(env, &block)
+                http_response = super
 
                 # Process the response
-                response_options = { trace_count: env.request.parcel.trace_count }.tap do |options|
+                response_options = {trace_count: env.request.parcel.trace_count}.tap do |options|
                   # Parse service rates, if configured to do so.
                   if service_rates? && !http_response.payload.to_s.empty?
                     body = JSON.parse(http_response.payload)
@@ -140,11 +66,6 @@ module Datadog
               end
             end
           end
-
-          # Add traces behavior to transport components
-          HTTP::Client.include(Traces::Client)
-          HTTP::API::Spec.include(Traces::API::Spec)
-          HTTP::API::Instance.include(Traces::API::Instance)
         end
       end
     end

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

@@ -1,96 +1,49 @@
 # 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 'http/api'
-require_relative 'http/builder'
-require_relative '../../../datadog/version'
+require_relative "../../core/encoding"
+require_relative "../../core/environment/container"
+require_relative "../../core/environment/ext"
+require_relative "../../core/transport/ext"
+require_relative "../../core/transport/http"
+require_relative "http/traces"
 
 module Datadog
   module Tracing
     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,
+        V4 = Traces::API::Endpoint.new(
+          "/v0.4/traces",
+          Core::Encoding::MsgpackEncoder,
+          service_rates: true
         )
 
-        module_function
+        V3 = Traces::API::Endpoint.new(
+          "/v0.3/traces",
+          Core::Encoding::MsgpackEncoder,
+        )
 
-        # Builds a new Transport::HTTP::Client
-        def new(&block)
-          Builder.new(&block).to_transport
-        end
+        module_function
 
         # 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,
-          **options
+          agent_settings:,
+          logger: Datadog.logger,
+          headers: nil
         )
-          new do |transport|
-            transport.adapter(agent_settings)
-            transport.headers default_headers
-
-            apis = API.defaults
-
-            transport.api API::V4, apis[API::V4], fallback: API::V3, default: true
-            transport.api API::V3, apis[API::V3]
-
-            # 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
+          Core::Transport::HTTP.build(
+            agent_settings: agent_settings,
+            logger: logger,
+            headers: headers
+          ) do |transport|
+            transport.api "v0.4", V4, fallback: "v0.3", default: true
+            transport.api "v0.3", V3
 
             # Call block to apply any customization, if provided
             yield(transport) if block_given?
-          end
+          end.to_transport(Transport::Traces::Transport)
         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?
-          end
-        end
-
-        def default_adapter
-          Datadog::Core::Configuration::Ext::Agent::HTTP::ADAPTER
-        end
-
-        # Add adapters to registry
-        Builder::REGISTRY.set(
-          Datadog::Core::Transport::HTTP::Adapters::Net,
-          Datadog::Core::Configuration::Ext::Agent::HTTP::ADAPTER
-        )
-        Builder::REGISTRY.set(Datadog::Core::Transport::HTTP::Adapters::Test, Datadog::Core::Transport::Ext::Test::ADAPTER)
-        Builder::REGISTRY.set(
-          Datadog::Core::Transport::HTTP::Adapters::UnixSocket,
-          Datadog::Core::Transport::Ext::UnixSocket::ADAPTER
-        )
       end
     end
   end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../statistics'
-require_relative 'response'
+require_relative "../statistics"
+require_relative "response"
 
 module Datadog
   module Tracing
@@ -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
@@ -30,19 +33,18 @@ module Datadog
             # If block is given, allow it to handle writing
             # Otherwise do a standard encode/write/response.
             response = if block_given?
-                         yield(out, request)
-                       else
-                         @request_block.call(out, request)
-                       end
+              yield(out, request)
+            else
+              @request_block.call(out, request)
+            end
 
             # Update statistics
             update_stats_from_response!(response)
 
-            # Return response
             response
-          rescue StandardError => e
+          rescue => e
             message =
-              "Internal error during IO transport request. Cause: #{e.class.name} #{e.message} " \
+              "Internal error during IO transport request. Cause: #{e.class}: #{e.message} " \
                 "Location: #{Array(e.backtrace).first}"
 
             # Log error
@@ -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/response.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../core/transport/response'
+require_relative "../../../core/transport/response"
 
 module Datadog
   module Tracing

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../transport/traces'
-require_relative '../../../core/transport/parcel'
-require_relative 'response'
-require_relative 'client'
+require_relative "../../transport/traces"
+require_relative "../../../core/transport/parcel"
+require_relative "response"
+require_relative "client"
 
 module Datadog
   module Tracing
@@ -21,46 +21,23 @@ 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
             ENCODED_IDS = [
               :trace_id,
               :span_id,
-              :parent_id
+              :parent_id,
             ].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
 
-            def encode_with(encoder)
-              encode_traces(encoder, data)
+                # 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
 

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../core/encoding'
-require_relative 'io/client'
-require_relative 'io/traces'
+require_relative "../../core/encoding"
+require_relative "io/client"
+require_relative "io/traces"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/transport/native/response.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require "json"
+
+module Datadog
+  module Tracing
+    module Transport
+      module Native
+        # Response from the native trace exporter.
+        #
+        # Constructed by the C extension after a send completes (or fails).
+        # Implements the same predicate interface as the HTTP transport's
+        # response so callers can treat both uniformly.
+        class Response
+          SERVICE_RATE_KEY = "rate_by_service"
+
+          attr_reader :trace_count, :payload
+
+          def initialize(ok:, internal_error: false, server_error: false, client_error: false,
+            not_found: false, unsupported: false, trace_count: 0, payload: nil)
+            @ok = ok
+            @internal_error = internal_error
+            @server_error = server_error
+            @client_error = client_error
+            @not_found = not_found
+            @unsupported = unsupported
+            @trace_count = trace_count
+            @payload = payload
+          end
+
+          def ok?
+            @ok
+          end
+
+          def internal_error?
+            @internal_error
+          end
+
+          def server_error?
+            @server_error
+          end
+
+          def client_error?
+            @client_error
+          end
+
+          def not_found?
+            @not_found
+          end
+
+          def unsupported?
+            @unsupported
+          end
+
+          # Parse the agent's JSON response body and extract the
+          # +rate_by_service+ map.  Returns +nil+ when the payload
+          # is absent or does not contain sampling rates.
+          def service_rates
+            payload = @payload
+            return nil if payload.nil? || payload.empty?
+
+            parsed = JSON.parse(payload)
+            parsed[SERVICE_RATE_KEY] if parsed.is_a?(Hash)
+          rescue JSON::ParserError
+            nil
+          end
+        end
+      end
+    end
+  end
+end