datadog 2.38.0 → 2.47.0

data/lib/datadog/symbol_database/logger.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'forwardable'
+require "forwardable"
 
 module Datadog
   module SymbolDatabase

data/lib/datadog/symbol_database/remote.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../di/fatal_exceptions'
+require_relative "../di/fatal_exceptions"
 
 module Datadog
   module SymbolDatabase
@@ -24,7 +24,7 @@ module Datadog
     #
     # @api private
     module Remote
-      PRODUCT = 'LIVE_DEBUGGING_SYMBOL_DB'
+      PRODUCT = "LIVE_DEBUGGING_SYMBOL_DB"
 
       class << self
         # Declare products this receiver handles.
@@ -39,6 +39,21 @@ module Datadog
           []
         end
 
+        # Symbol Database follows DI when its enabled setting is nil — the
+        # default, or an explicit c.symbol_database.enabled = nil. In that
+        # follow-DI case the product is deferred and added/removed alongside DI
+        # so it is never advertised while DI is inactive. An explicit true/false
+        # is independent and manages its own product at startup.
+        def deferred_products(settings)
+          if settings.respond_to?(:symbol_database) &&
+              settings.symbol_database.enabled.nil? &&
+              Datadog::SymbolDatabase.supported_runtime?
+            [PRODUCT]
+          else
+            []
+          end
+        end
+
         # Create receivers for remote configuration.
         # @return [Array<Receiver>] Array of receivers
         def receivers(_telemetry)
@@ -49,7 +64,7 @@ module Datadog
             rescue Exception => e # standard:disable Lint/RescueException
               Datadog::DI.reraise_if_fatal(e)
               Datadog.logger.debug { "symdb: failed to look up component in RC receiver: #{e.class}: #{e.message}" }
-              telemetry&.report(e, description: 'symdb: failed to look up component in RC receiver')
+              telemetry&.report(e, description: "symdb: failed to look up component in RC receiver")
               nil
             end
 
@@ -114,7 +129,7 @@ module Datadog
         rescue Exception => e # standard:disable Lint/RescueException
           Datadog::DI.reraise_if_fatal(e)
           component.logger.debug { "symdb: error processing remote config change: #{e.class}: #{e.message}" }
-          telemetry&.report(e, description: 'symdb: error processing remote config change')
+          telemetry&.report(e, description: "symdb: error processing remote config change")
           # Rescue runs regardless of which branch raised — Steep cannot narrow the
           # union type from a respond_to? check.
           content_obj = change.respond_to?(:content) ? change.content : change.previous # steep:ignore NoMethod
@@ -133,7 +148,7 @@ module Datadog
             return
           end
 
-          if config['upload_symbols']
+          if config["upload_symbols"]
             component.logger.debug { "symdb: upload enabled via remote config" }
             component.start_upload
           else
@@ -167,7 +182,7 @@ module Datadog
             return nil
           end
 
-          unless config.key?('upload_symbols')
+          unless config.key?("upload_symbols")
             logger.debug { "symdb: missing 'upload_symbols' key in config" }
             return nil
           end

data/lib/datadog/symbol_database/scope.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
 module Datadog
   module SymbolDatabase
@@ -85,7 +85,7 @@ module Datadog
         # Always emit has_injectible_lines (even when false) on METHOD scopes.
         # Wire format keeps the historical spelling +injectible+; Ruby identifier
         # is +targetable_lines+.
-        if scope_type == 'METHOD'
+        if scope_type == "METHOD"
           h[:has_injectible_lines] = targetable_lines? # steep:ignore ArgumentTypeMismatch
           h[:injectible_lines] = targetable_lines if targetable_lines && !targetable_lines.empty?
         end

data/lib/datadog/symbol_database/scope_batcher.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'set'
-require_relative '../di/fatal_exceptions'
+require "set"
+require_relative "../di/fatal_exceptions"
 
 module Datadog
   module SymbolDatabase

data/lib/datadog/symbol_database/service_version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
 module Datadog
   module SymbolDatabase
@@ -28,13 +28,13 @@ module Datadog
       # @param final [Boolean, nil] true if this is the last batch of the upload
       # @raise [ArgumentError] if service empty or scopes not an array
       def initialize(service:, env:, version:, scopes:, upload_id: nil, batch_num: nil, final: nil)
-        raise ArgumentError, 'service is required' if service.nil? || service.empty?
-        raise ArgumentError, 'scopes must be an array' unless scopes.is_a?(Array)
+        raise ArgumentError, "service is required" if service.nil? || service.empty?
+        raise ArgumentError, "scopes must be an array" unless scopes.is_a?(Array)
 
         @service = service
         @env = env
         @version = version
-        @language = 'ruby'
+        @language = "ruby"
         @scopes = scopes
         @upload_id = upload_id
         @batch_num = batch_num

data/lib/datadog/symbol_database/symbol.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
 module Datadog
   module SymbolDatabase

data/lib/datadog/symbol_database/transport/http/endpoint.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../core/transport/http/api/endpoint'
+require_relative "../../../core/transport/http/api/endpoint"
 
 module Datadog
   module SymbolDatabase

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../core/encoding'
-require_relative '../../core/transport/http'
-require_relative 'http/endpoint'
-require_relative '../transport'
+require_relative "../../core/encoding"
+require_relative "../../core/transport/http"
+require_relative "http/endpoint"
+require_relative "../transport"
 
 module Datadog
   module SymbolDatabase
@@ -14,7 +14,7 @@ module Datadog
         # Multipart form-data is dispatched via `env.form` from the
         # `Symbols::Client` subclass.
         SYMBOLS_ENDPOINT = API::Endpoint.new(
-          '/symdb/v1/input',
+          "/symdb/v1/input",
           Datadog::Core::Encoding::JSONEncoder,
         )
 
@@ -34,7 +34,7 @@ module Datadog
             agent_settings: agent_settings,
             headers: headers,
           ) do |transport|
-            transport.api 'symbols', SYMBOLS_ENDPOINT, default: true
+            transport.api "symbols", SYMBOLS_ENDPOINT, default: true
 
             yield(transport) if block_given?
           end.to_transport(SymbolDatabase::Transport::Symbols::Transport)

data/lib/datadog/symbol_database/transport.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../core/transport/request'
-require_relative '../core/transport/transport'
-require_relative '../core/transport/http/client'
-require_relative '../core/transport/http/env'
+require_relative "../core/transport/request"
+require_relative "../core/transport/transport"
+require_relative "../core/transport/http/client"
+require_relative "../core/transport/http/env"
 
 module Datadog
   module SymbolDatabase

data/lib/datadog/symbol_database/uploader.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require 'json'
-require 'securerandom'
-require 'zlib'
-require 'stringio'
-require_relative '../core/environment/identity'
-require_relative '../core/vendor/multipart-post/multipart/post/composite_read_io'
-require_relative '../tracing/ext'
-require_relative 'service_version'
-require_relative 'transport/http'
-require_relative '../di/fatal_exceptions'
+require "json"
+require "securerandom"
+require "zlib"
+require "stringio"
+require_relative "../core/environment/identity"
+require_relative "../core/vendor/multipart-post/multipart/post/composite_read_io"
+require_relative "../tracing/ext"
+require_relative "service_version"
+require_relative "transport/http"
+require_relative "../di/fatal_exceptions"
 
 module Datadog
   module SymbolDatabase
@@ -72,7 +72,7 @@ module Datadog
         # Emitted unconditionally so the rare oversized case is observable.
         @telemetry&.distribution(
           Tracing::Ext::TELEMETRY_METRICS_NAMESPACE,
-          'symbol_database.payload_size',
+          "symbol_database.payload_size",
           compressed_data.bytesize
         )
 
@@ -90,7 +90,7 @@ module Datadog
       rescue Exception => e # standard:disable Lint/RescueException
         Datadog::DI.reraise_if_fatal(e)
         @logger.debug { "symdb: upload failed: #{e.class}: #{e.message}" }
-        @telemetry&.report(e, description: 'symdb: upload failed')
+        @telemetry&.report(e, description: "symdb: upload failed")
       end
 
       private
@@ -139,19 +139,19 @@ module Datadog
 
         event_upload = Datadog::Core::Vendor::Multipart::Post::UploadIO.new(
           event_io,
-          'application/json',
-          'event.json',
+          "application/json",
+          "event.json",
         )
 
         file_upload = Datadog::Core::Vendor::Multipart::Post::UploadIO.new(
           file_io,
-          'application/gzip',
+          "application/gzip",
           "symbols_#{Process.pid}.json.gz",
         )
 
         {
-          'event' => event_upload,
-          'file' => file_upload,
+          "event" => event_upload,
+          "file" => file_upload,
         }
       end
 
@@ -162,13 +162,13 @@ module Datadog
       # @return [String] JSON string for event metadata
       def build_event_metadata(attachment_size, upload_id:, batch_num:)
         JSON.generate(
-          ddsource: 'ruby',
+          ddsource: "ruby",
           service: @settings.service,
           version: @settings.version,
-          language: 'ruby',
+          language: "ruby",
           runtimeId: Datadog::Core::Environment::Identity.id,
           parentId: nil,  # Fork tracking deferred for MVP
-          type: 'symdb',
+          type: "symdb",
           uploadId: upload_id,
           batchNum: batch_num,
           # Always false: the Ruby tracer continuously uploads new code
@@ -194,8 +194,8 @@ module Datadog
           end
           @batch_num += 1 # steep:ignore NoMethod
           # @upload_id and @batch_num are non-nil after the branch above; refine for Steep.
-          upload_id = @upload_id or raise('unreachable: @upload_id should be set')
-          batch_num = @batch_num or raise('unreachable: @batch_num should be set')
+          upload_id = @upload_id or raise("unreachable: @upload_id should be set")
+          batch_num = @batch_num or raise("unreachable: @batch_num should be set")
           [upload_id, batch_num]
         end
       end

data/lib/datadog/symbol_database.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'ruby_version'
+require_relative "ruby_version"
 
 module Datadog
   # Namespace for Datadog symbol database upload.
@@ -65,7 +65,7 @@ module Datadog
     # does not).
     # @return [Boolean]
     def self.supported_runtime?
-      RUBY_ENGINE == 'ruby' && RubyVersion.is?('>= 2.7')
+      RUBY_ENGINE == "ruby" && RubyVersion.is?(">= 2.7")
     end
   end
 end

data/lib/datadog/tracing/analytics.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'metadata/ext'
+require_relative "metadata/ext"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/buffer.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../core/environment/ext'
-require_relative '../core/buffer/thread_safe'
-require_relative '../core/buffer/cruby'
-require_relative '../core/diagnostics/health'
+require_relative "../core/environment/ext"
+require_relative "../core/buffer/thread_safe"
+require_relative "../core/buffer/cruby"
+require_relative "../core/diagnostics/health"
 
 module Datadog
   module Tracing
@@ -120,7 +120,7 @@ module Datadog
     #
     # TODO We should restructure this module, so that classes are not declared at top-level ::Datadog.
     # TODO Making such a change is potentially breaking for users manually configuring the tracer.
-    TraceBuffer = if Core::Environment::Ext::RUBY_ENGINE == 'ruby'
+    TraceBuffer = if Core::Environment::Ext::RUBY_ENGINE == "ruby"
       CRubyTraceBuffer
     else
       ThreadSafeTraceBuffer

data/lib/datadog/tracing/client_ip.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../core/configuration'
-require_relative '../core/utils/network'
-require_relative 'metadata/ext'
-require_relative 'span'
+require_relative "../core/configuration"
+require_relative "../core/utils/network"
+require_relative "metadata/ext"
+require_relative "span"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/component.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require_relative 'tracer'
-require_relative 'flush'
-require_relative 'sync_writer'
-require_relative 'sampling/span/rule_parser'
-require_relative 'sampling/span/sampler'
-require_relative 'diagnostics/environment_logger'
-require_relative 'contrib/component'
+require_relative "otel_thread_context"
+require_relative "tracer"
+require_relative "flush"
+require_relative "sync_writer"
+require_relative "sampling/span/rule_parser"
+require_relative "sampling/span/sampler"
+require_relative "diagnostics/environment_logger"
+require_relative "contrib/component"
 
 module Datadog
   module Tracing
@@ -20,14 +21,14 @@ module Datadog
         tracer = settings.tracing.instance
         return tracer unless tracer.nil?
 
+        sampler = build_sampler(settings)
+
         # Apply test mode settings if test mode is activated
         if settings.tracing.test_mode.enabled
           trace_flush = build_test_mode_trace_flush(settings)
-          sampler = build_test_mode_sampler
           writer = build_test_mode_writer(settings, agent_settings)
         else
           trace_flush = build_trace_flush(settings)
-          sampler = build_sampler(settings)
           writer = build_writer(settings, agent_settings)
         end
 
@@ -42,6 +43,7 @@ module Datadog
           default_service: settings.service,
           enabled: settings.tracing.enabled,
           logger: logger,
+          otel_thread_context: OTelThreadContext.build(settings.tracing),
           trace_flush: trace_flush,
           sampler: sampler_delegator,
           span_sampler: build_span_sampler(settings),
@@ -60,7 +62,26 @@ module Datadog
         end
       end
 
+      def bind_transport_telemetry(tracer, telemetry)
+        return unless tracer.is_a?(Tracing::Tracer)
+
+        writer = tracer.writer
+        return unless writer.respond_to?(:transport)
+
+        transport = writer.transport
+        if transport.is_a?(Transport::Traces::Transport) ||
+            (defined?(Transport::Native::Transport) && transport.is_a?(Transport::Native::Transport))
+          transport.telemetry = telemetry
+        end
+        nil
+      end
+
+      # Builds the sampler for the given settings: the sampler that keeps
+      # every trace when test mode is enabled, otherwise the sampler built
+      # from the custom sampler, sampling rules and rates.
       def build_sampler(settings)
+        return build_test_mode_sampler if settings.tracing.test_mode.enabled
+
         # A custom sampler is provided
         if (sampler = settings.tracing.sampler)
           return sampler
@@ -104,9 +125,30 @@ module Datadog
           return writer
         end
 
+        if !options.key?(:transport) && settings.tracing.native_transport && (transport = build_native_transport(agent_settings))
+          options = options.merge(transport: transport)
+        end
+
         Tracing::Writer.new(agent_settings: agent_settings, **options)
       end
 
+      def build_native_transport(agent_settings)
+        require_relative "transport/native"
+
+        unless Transport::Native.supported?
+          Datadog.logger.warn(
+            "Native transport requested but not available: #{Transport::Native::UNSUPPORTED_REASON}. " \
+            "Falling back to default HTTP transport."
+          )
+          return nil
+        end
+
+        Transport::Native::Transport.new(
+          agent_settings: agent_settings,
+          logger: Datadog.logger
+        )
+      end
+
       def subscribe_to_writer_events!(writer, sampler_delegator, test_mode)
         return unless writer.respond_to?(:events) # Check if it's a custom, external writer
 

data/lib/datadog/tracing/configuration/dynamic/option.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../../../core/telemetry/configuration_value"
+
 module Datadog
   module Tracing
     module Configuration
@@ -56,6 +58,8 @@ module Datadog
                 precedence: Core::Configuration::Option::Precedence::REMOTE_CONFIGURATION
               )
             end
+
+            Core::Telemetry::ConfigurationValue.convert(value)
           end
 
           protected

data/lib/datadog/tracing/configuration/dynamic.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'dynamic/option'
+require_relative "dynamic/option"
 
 module Datadog
   module Tracing
@@ -11,37 +11,38 @@ module Datadog
         # Dynamic configuration for `DD_LOGS_INJECTION`.
         class LogInjectionEnabled < SimpleOption
           def initialize
-            super('log_injection_enabled', 'DD_LOGS_INJECTION', :log_injection)
+            super("log_injection_enabled", "DD_LOGS_INJECTION", :log_injection)
           end
         end
 
         # Dynamic configuration for `DD_TRACE_HEADER_TAGS`.
         class TracingHeaderTags < SimpleOption
           def initialize
-            super('tracing_header_tags', 'DD_TRACE_HEADER_TAGS', :header_tags)
+            super("tracing_header_tags", "DD_TRACE_HEADER_TAGS", :header_tags)
           end
 
           def call(tracing_header_tags)
             # Modify the remote configuration value that it matches the
             # environment variable it configures.
-            tracing_header_tags&.map! do |hash|
+            parsed_header_tags = tracing_header_tags&.map do |hash|
               "#{hash["header"]}:#{hash["tag_name"]}"
             end
 
-            super
+            super(parsed_header_tags)
           end
         end
 
         # Dynamic configuration for `DD_TRACE_SAMPLE_RATE`.
         class TracingSamplingRate < SimpleOption
           def initialize
-            super('tracing_sampling_rate', 'DD_TRACE_SAMPLE_RATE', :default_rate)
+            super("tracing_sampling_rate", "DD_TRACE_SAMPLE_RATE", :default_rate)
           end
 
           # Ensures sampler is rebuilt and new configuration is applied
           def call(tracing_sampling_rate)
             super
             Datadog.send(:components).reconfigure_sampler
+            tracing_sampling_rate
           end
 
           protected
@@ -54,7 +55,7 @@ module Datadog
         # Dynamic configuration for `DD_TRACE_SAMPLING_RULES`.
         class TracingSamplingRules < SimpleOption
           def initialize
-            super('tracing_sampling_rules', 'DD_TRACE_SAMPLING_RULES', :rules)
+            super("tracing_sampling_rules", "DD_TRACE_SAMPLING_RULES", :rules)
           end
 
           # Ensures sampler is rebuilt and new configuration is applied
@@ -63,23 +64,24 @@ module Datadog
             # local environment variable it configures.
             if tracing_sampling_rules
               tracing_sampling_rules.each do |rule|
-                next unless (tags = rule['tags'])
+                next unless (tags = rule["tags"])
 
                 # Tag maps come in as arrays of 'key' and `value_glob`.
                 # We need to convert them into a hash for local use.
                 tag_array = tags.map! do |tag|
-                  [tag['key'], tag['value_glob']]
+                  [tag["key"], tag["value_glob"]]
                 end
 
-                rule['tags'] = tag_array.to_h
+                rule["tags"] = tag_array.to_h
               end
 
               # The configuration is stored as JSON, so we need to convert it back
               tracing_sampling_rules = tracing_sampling_rules.to_json
             end
 
-            super
+            telemetry_value = super
             Datadog.send(:components).reconfigure_sampler
+            telemetry_value
           end
 
           protected