datadog 2.21.0 → 2.38.0

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

@@ -3,6 +3,9 @@
 require_relative '../../core/chunker'
 require_relative '../../core/transport/parcel'
 require_relative '../../core/transport/request'
+require_relative '../../core/transport/transport'
+require_relative '../../core/utils/enumerable_compat'
+require_relative 'http/client'
 require_relative 'serializable_trace'
 require_relative 'trace_formatter'
 
@@ -11,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
@@ -65,11 +62,8 @@ module Datadog
           # @return [Enumerable[Array[Bytes,Integer]]] list of encoded chunks: each containing a byte array and
           #   number of traces
           def encode_in_chunks(traces)
-            encoded_traces = if traces.respond_to?(:filter_map)
-              # DEV Supported since Ruby 2.7, saves an intermediate object creation
-              traces.filter_map { |t| encode_one(t) }
-            else
-              traces.map { |t| encode_one(t) }.reject(&:nil?)
+            encoded_traces = Core::Utils::EnumerableCompat.filter_map(traces) do |trace|
+              encode_one(trace)
             end
 
             Datadog::Core::Chunker.chunk_by_size(encoded_traces, max_size).map do |chunk|
@@ -123,16 +117,8 @@ module Datadog
         # This class initializes the HTTP client, breaks down large
         # batches of traces into smaller chunks and handles
         # API version downgrade handshake.
-        class Transport
-          attr_reader :client, :apis, :default_api, :current_api_id, :logger
-
-          def initialize(apis, default_api, logger: Datadog.logger)
-            @apis = apis
-            @default_api = default_api
-            @logger = logger
-
-            change_api!(default_api)
-          end
+        class Transport < Core::Transport::Transport
+          self.http_client_class = Tracing::Transport::HTTP::Client
 
           def send_traces(traces)
             encoder = current_api.encoder
@@ -143,9 +129,9 @@ 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_traces_payload(request).tap do |response|
+              client.send_request(:traces, request).tap do |response|
                 if downgrade?(response)
                   downgrade!
                   return send_traces(traces)
@@ -173,35 +159,11 @@ module Datadog
           end
 
           def stats
-            @client.stats
-          end
-
-          def current_api
-            apis[@current_api_id]
+            client.stats
           end
 
           private
 
-          def downgrade?(response)
-            return false unless apis.fallbacks.key?(@current_api_id)
-
-            response.not_found? || response.unsupported?
-          end
-
-          def downgrade!
-            downgrade_api_id = apis.fallbacks[@current_api_id]
-            raise NoDowngradeAvailableError, @current_api_id if downgrade_api_id.nil?
-
-            change_api!(downgrade_api_id)
-          end
-
-          def change_api!(api_id)
-            raise UnknownApiVersionError, api_id unless apis.key?(api_id)
-
-            @current_api_id = api_id
-            @client = HTTP::Client.new(current_api, logger: logger)
-          end
-
           # Queries the agent for native span events serialization support.
           # This changes how the serialization of span events performed.
           def native_events_supported?
@@ -221,36 +183,6 @@ module Datadog
               false
             end
           end
-
-          # Raised when configured with an unknown API version
-          class UnknownApiVersionError < StandardError
-            attr_reader :version
-
-            def initialize(version)
-              super
-
-              @version = version
-            end
-
-            def message
-              "No matching transport API for version #{version}!"
-            end
-          end
-
-          # Raised when configured with an unknown API version
-          class NoDowngradeAvailableError < StandardError
-            attr_reader :version
-
-            def initialize(version)
-              super
-
-              @version = version
-            end
-
-            def message
-              "No downgrade from transport API version #{version} is available!"
-            end
-          end
         end
       end
     end

data/lib/datadog/tracing/workers.rb

@@ -58,7 +58,8 @@ module Datadog
             # TODO[manu]: findout the reason and reschedule the send if it's not
             # a fatal exception
             logger.warn(
-              "Error during traces flush: dropped #{traces.length} items. Cause: #{e} Location: #{Array(e.backtrace).first}"
+              "Error during traces flush: dropped #{traces.length} items. " \
+              "Cause: #{e.class}: #{e.message} Location: #{Array(e.backtrace).first}"
             )
           end
         end

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 \
@@ -19,6 +18,7 @@ module Datadog
         :events,
         :agent_settings
 
+      # DEV-3.0: change to keyword arguments
       def initialize(options = {})
         @logger = options[:logger] || Datadog.logger
 

data/lib/datadog/version.rb

@@ -3,7 +3,7 @@
 module Datadog
   module VERSION
     MAJOR = 2
-    MINOR = 21
+    MINOR = 38
     PATCH = 0
     PRE = nil
     BUILD = nil
@@ -21,6 +21,6 @@ module Datadog
     # To allow testing with the next unreleased version of Ruby, the version check is performed
     # as `< #{MAXIMUM_RUBY_VERSION}`, meaning prereleases of MAXIMUM_RUBY_VERSION are allowed
     # but not stable MAXIMUM_RUBY_VERSION releases.
-    MAXIMUM_RUBY_VERSION = '3.5'
+    MAXIMUM_RUBY_VERSION = '4.1'
   end
 end

data/lib/datadog.rb

@@ -1,19 +1,26 @@
 # frozen_string_literal: true
 
+# Load core first so shared helpers (e.g. Datadog::RubyVersion) are available at require-time
+require_relative 'datadog/core'
+
 # Load tracing
 require_relative 'datadog/tracing'
 require_relative 'datadog/tracing/contrib'
 
 # Load other products (must follow tracing)
 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'
 
 # Line probes will not work on Ruby < 2.6 because of lack of :script_compiled
 # trace point. Activate DI automatically on supported Ruby versions but
 # always load its settings so that, for example, turning DI off when
 # we are on Ruby 2.5 does not produce exceptions.
-require_relative 'datadog/di/boot' if RUBY_VERSION >= '2.6' && RUBY_ENGINE != 'jruby'
+require_relative 'datadog/di/boot' if Datadog::RubyVersion.is?('>= 2.6') && RUBY_ENGINE != 'jruby'
 
 require_relative 'datadog/error_tracking'
 require_relative 'datadog/kit'