datadog 2.30.0 → 2.43.0

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'msgpack'
-require 'datadog/tracing/utils'
+require "json"
+require "msgpack"
+require "datadog/tracing/utils"
 
 module Datadog
   module Tracing
@@ -76,10 +76,10 @@ module Datadog
           if span.stopped?
             packer.write_map_header(number_of_elements_to_write + 2) # Set header with how many elements in the map
 
-            packer.write('start')
+            packer.write("start")
             packer.write(time_nano(span.start_time))
 
-            packer.write('duration')
+            packer.write("duration")
             packer.write(duration_nano(span.duration))
           else
             packer.write_map_header(number_of_elements_to_write) # Set header with how many elements in the map
@@ -88,40 +88,40 @@ module Datadog
           if span.events.any?
             if @native_events_supported
               # Use top-level field for native events
-              packer.write('span_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)
+              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.
           # DEV: By providing strings directly, we skip this indirection operation.
-          packer.write('span_id')
+          packer.write("span_id")
           packer.write(span.id)
-          packer.write('parent_id')
+          packer.write("parent_id")
           packer.write(span.parent_id)
-          packer.write('trace_id')
+          packer.write("trace_id")
           packer.write(@trace_id)
-          packer.write('name')
+          packer.write("name")
           packer.write(span.name)
-          packer.write('service')
+          packer.write("service")
           packer.write(span.service)
-          packer.write('resource')
+          packer.write("resource")
           packer.write(span.resource)
-          packer.write('type')
+          packer.write("type")
           packer.write(span.type)
-          packer.write('meta')
+          packer.write("meta")
           packer.write(span.meta)
-          packer.write('metrics')
+          packer.write("metrics")
           packer.write(span.metrics)
-          packer.write('meta_struct')
+          packer.write("meta_struct")
           packer.write(span.metastruct)
-          packer.write('span_links')
+          packer.write("span_links")
           packer.write(span.links.map(&:to_hash))
-          packer.write('error')
+          packer.write("error")
           packer.write(span.status)
           packer
         end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Tracing
+    module Transport
+      # Shared agent capability negotiation for span event wire formats.
+      module SpanEventsNegotiation
+        private
+
+        # Queries whether the agent accepts typed span events, which selects
+        # between the typed field and legacy JSON metadata. Only successful
+        # capability responses are cached so a later flush can recover.
+        #
+        # The memo is read and written without synchronization, independent of
+        # any lock the including transport holds for its own sends (the native
+        # transport's +@send_mutex+, for example). Two concurrent sends can both
+        # observe it unset and each issue an +agent_info.fetch+; the duplicate
+        # fetch is self-correcting because the last writer wins.
+        #
+        # @return [Boolean] true if typed span events are supported
+        def native_events_supported?
+          return @native_events_supported if defined?(@native_events_supported)
+
+          option = Datadog.configuration.tracing.native_span_events
+          unless option.nil?
+            @native_events_supported = option
+            return option
+          end
+
+          components = Datadog.send(:components, allow_initialization: false)
+          return false unless components
+
+          response = components.agent_info.fetch
+          return false unless response
+
+          @native_events_supported = response.span_events == true
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../core/metrics/metric'
-require_relative '../../core/diagnostics/health'
+require_relative "../../core/metrics/metric"
+require_relative "../../core/diagnostics/health"
 
 module Datadog
   module Tracing

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../../core/environment/identity'
-require_relative '../../core/environment/process'
-require_relative '../../core/environment/socket'
-require_relative '../../core/environment/git'
-require_relative '../../core/git/ext'
-require_relative '../../core/runtime/ext'
-require_relative '../metadata/ext'
-require_relative '../trace_segment'
+require_relative "../../core/environment/identity"
+require_relative "../../core/environment/process"
+require_relative "../../core/environment/socket"
+require_relative "../../core/environment/git"
+require_relative "../../core/git/ext"
+require_relative "../../core/runtime/ext"
+require_relative "../metadata/ext"
+require_relative "../trace_segment"
 
 module Datadog
   module Tracing
@@ -117,7 +117,7 @@ module Datadog
 
           root_span.set_tag(
             Tracing::Metadata::Ext::Distributed::TAG_KNUTH_SAMPLING_RATE,
-            format('%.6g', rate)
+            format("%.6f", (rate * 1e6).round / 1e6).sub(/\.?0+\z/, "")
           )
         end
 
@@ -213,7 +213,7 @@ module Datadog
         def tag_apm_tracing_disabled!
           return if trace.apm_tracing_enabled
 
-          root_span.set_tag(Tracing::Metadata::Ext::TAG_APM_ENABLED, 0)
+          trace.spans.each { |span| span.set_metric(Tracing::Metadata::Ext::TAG_APM_ENABLED, 0) }
         end
 
         def tag_git_repository_url!

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

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
-require_relative '../../core/chunker'
-require_relative '../../core/transport/parcel'
-require_relative '../../core/transport/request'
-require_relative '../../core/transport/transport'
-require_relative '../../core/utils/array'
-require_relative 'http/client'
-require_relative 'serializable_trace'
-require_relative 'trace_formatter'
+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 "span_events_negotiation"
+require_relative "trace_formatter"
 
 module Datadog
   module Tracing
@@ -62,7 +63,7 @@ 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 = Core::Utils::Array.filter_map(traces) do |trace|
+            encoded_traces = Core::Utils::EnumerableCompat.filter_map(traces) do |trace|
               encode_one(trace)
             end
 
@@ -118,6 +119,7 @@ module Datadog
         # batches of traces into smaller chunks and handles
         # API version downgrade handshake.
         class Transport < Core::Transport::Transport
+          include SpanEventsNegotiation
           self.http_client_class = Tracing::Transport::HTTP::Client
 
           def send_traces(traces)
@@ -161,28 +163,6 @@ module Datadog
           def stats
             client.stats
           end
-
-          private
-
-          # Queries the agent for native span events serialization support.
-          # This changes how the serialization of span events performed.
-          def native_events_supported?
-            return @native_events_supported if defined?(@native_events_supported)
-
-            # Check for an explicit override
-            option = Datadog.configuration.tracing.native_span_events
-            unless option.nil?
-              @native_events_supported = option
-              return option
-            end
-
-            # Otherwise, check for agent support, to ensure a configuration-less setup.
-            if (res = Datadog.send(:components).agent_info.fetch)
-              @native_events_supported = res.span_events == true
-            else
-              false
-            end
-          end
         end
       end
     end

data/lib/datadog/tracing/utils.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../core/utils/forking'
-require_relative '../core/utils/time'
+require_relative "../core/utils/forking"
+require_relative "../core/utils/time"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/workers.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'buffer'
-require_relative 'pipeline'
+require_relative "buffer"
+require_relative "pipeline"
 
 module Datadog
   module Tracing
@@ -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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'event'
-require_relative 'runtime/metrics'
-require_relative 'workers'
+require_relative "event"
+require_relative "runtime/metrics"
+require_relative "workers"
 
-require_relative 'transport/http'
+require_relative "transport/http"
 
 module Datadog
   module Tracing
@@ -122,7 +122,7 @@ module Datadog
         if worker_local
           worker_local.enqueue_trace(trace)
         elsif !@stopped
-          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
 
@@ -130,7 +130,7 @@ module Datadog
       def stats
         {
           traces_flushed: @traces_flushed,
-          transport: @transport.stats
+          transport: @transport.stats,
         }
       end
 
@@ -173,10 +173,23 @@ module Datadog
       def stop_worker
         @stopped = true
 
-        return if @worker.nil?
+        if @worker
+          @worker.stop
+          @worker = nil
+        end
 
-        @worker.stop
-        @worker = nil
+        # Stopping a writer is permanent: once `@stopped` is set, `#start`
+        # refuses to spin up a new worker, so this writer (and the transport it
+        # owns) is being discarded for good. Forks do not stop the writer
+        # (`#start` re-creates the worker for the new pid while reusing the same
+        # transport), so this only runs on real teardown/reconfiguration.
+        #
+        # Deterministically release transports that hold native resources
+        # (e.g. the native trace exporter's Rust runtime and process-global
+        # fork hooks) instead of waiting on the GC finalizer. The default HTTP
+        # transport has no `#close` and is left untouched. `#close` is
+        # idempotent, so repeated `#stop` calls are safe.
+        @transport.close if @transport.respond_to?(:close)
 
         true
       end

data/lib/datadog/tracing.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'core'
-require_relative 'tracing/pipeline'
+require_relative "core"
+require_relative "tracing/pipeline"
 
 module Datadog
   # Datadog APM tracing public API.
@@ -121,7 +121,7 @@ module Datadog
       # @return [String] correlation information; or an empty String if Tracing is disabled (`!enabled?`)
       # @public_api
       def log_correlation
-        return '' unless enabled?
+        return "" unless enabled?
 
         correlation.to_log_format
       end

data/lib/datadog/version.rb

@@ -3,15 +3,15 @@
 module Datadog
   module VERSION
     MAJOR = 2
-    MINOR = 30
+    MINOR = 43
     PATCH = 0
     PRE = nil
     BUILD = nil
     # PRE and BUILD above are modified for dev gems during gem build GHA workflow
 
-    STRING = [MAJOR, MINOR, PATCH, PRE, BUILD].compact.join('.')
+    STRING = [MAJOR, MINOR, PATCH, PRE, BUILD].compact.join(".")
 
-    MINIMUM_RUBY_VERSION = '2.5.0'
+    MINIMUM_RUBY_VERSION = "2.5.0"
 
     # Restrict the installation of this gem with untested future versions of Ruby.
     #
@@ -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 = '4.1'
+    MAXIMUM_RUBY_VERSION = "4.1"
   end
 end

data/lib/datadog.rb

@@ -1,22 +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'
+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/data_streams'
-require_relative 'datadog/open_feature'
+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'
+require_relative "datadog/error_tracking"
+require_relative "datadog/kit"