ddtrace 1.7.0 → 1.9.0

data/lib/datadog/core/configuration/settings.rb

@@ -3,19 +3,20 @@
 require 'logger'
 
 require_relative 'base'
+require_relative 'ext'
 require_relative '../environment/ext'
 require_relative '../runtime/ext'
 require_relative '../telemetry/ext'
 require_relative '../../profiling/ext'
-require_relative '../../tracing/configuration/ext'
+
+require_relative '../../tracing/configuration/settings'
 
 module Datadog
   module Core
     module Configuration
-      # Global configuration settings for the trace library.
+      # Global configuration settings for the Datadog library.
       # @public_api
       # rubocop:disable Metrics/BlockLength
-      # rubocop:disable Layout/LineLength
       class Settings
         include Base
 
@@ -99,7 +100,7 @@ module Datadog
           # @default `DD_TRACE_DEBUG` environment variable, otherwise `false`
           # @return [Boolean]
           option :debug do |o|
-            o.default { env_to_bool(Datadog::Core::Diagnostics::Ext::DD_TRACE_DEBUG, false) }
+            o.default { env_to_bool(Datadog::Core::Configuration::Ext::Diagnostics::ENV_DEBUG_ENABLED, false) }
             o.lazy
             o.on_set do |enabled|
               # Enable rich debug print statements.
@@ -110,7 +111,6 @@ module Datadog
 
           # Internal {Datadog::Statsd} metrics collection.
           #
-          # The list of metrics collected can be found in {Datadog::Core::Diagnostics::Ext::Health::Metrics}.
           # @public_api
           settings :health_metrics do
             # Enable health metrics collection.
@@ -118,7 +118,7 @@ module Datadog
             # @default `DD_HEALTH_METRICS_ENABLED` environment variable, otherwise `false`
             # @return [Boolean]
             option :enabled do |o|
-              o.default { env_to_bool(Datadog::Core::Diagnostics::Ext::Health::Metrics::ENV_ENABLED, false) }
+              o.default { env_to_bool(Datadog::Core::Configuration::Ext::Diagnostics::ENV_HEALTH_METRICS_ENABLED, false) }
               o.lazy
             end
 
@@ -144,7 +144,7 @@ module Datadog
             # @return [Boolean,nil]
             option :enabled do |o|
               # Defaults to nil as we want to know when the default value is being used
-              o.default { env_to_bool(Datadog::Core::Diagnostics::Ext::DD_TRACE_STARTUP_LOGS, nil) }
+              o.default { env_to_bool(Datadog::Core::Configuration::Ext::Diagnostics::ENV_STARTUP_LOGS_ENABLED, nil) }
               o.lazy
             end
           end
@@ -210,6 +210,8 @@ module Datadog
 
             # Controls the maximum number of frames for each thread sampled. Can be tuned to avoid omitted frames in the
             # produced profiles. Increasing this may increase the overhead of profiling.
+            #
+            # @default `DD_PROFILING_MAX_FRAMES` environment variable, otherwise 400
             option :max_frames do |o|
               o.default { env_to_int(Profiling::Ext::ENV_MAX_FRAMES, 400) }
               o.lazy
@@ -269,7 +271,9 @@ module Datadog
             # If you use Ruby 3.x and your application does not use Ractors (or if your Ruby has been patched), the
             # feature is fully safe to enable and this toggle can be used to do so.
             #
-            # We expect that once the above issue is patched, we'll automatically re-enable the feature on fixed Ruby
+            # Furthermore, currently this feature can add a lot of overhead for GC-heavy workloads.
+            #
+            # We expect the once the above issues are overcome, we'll automatically enable the feature on fixed Ruby
             # versions.
             option :force_enable_gc_profiling do |o|
               o.default { env_to_bool('DD_PROFILING_FORCE_ENABLE_GC', false) }
@@ -408,338 +412,6 @@ module Datadog
           end
         end
 
-        # Tracer specific configurations.
-        # @public_api
-        settings :tracing do
-          # Legacy [App Analytics](https://docs.datadoghq.com/tracing/legacy_app_analytics/) configuration.
-          #
-          # @configure_with {Datadog::Tracing}
-          # @deprecated Use [Trace Retention and Ingestion](https://docs.datadoghq.com/tracing/trace_retention_and_ingestion/)
-          #   controls.
-          # @public_api
-          settings :analytics do
-            # @default `DD_TRACE_ANALYTICS_ENABLED` environment variable, otherwise `nil`
-            # @return [Boolean,nil]
-            option :enabled do |o|
-              o.default { env_to_bool(Tracing::Configuration::Ext::Analytics::ENV_TRACE_ANALYTICS_ENABLED, nil) }
-              o.lazy
-            end
-          end
-
-          # [Distributed Tracing](https://docs.datadoghq.com/tracing/setup_overview/setup/ruby/#distributed-tracing) propagation
-          # style configuration.
-          #
-          # The supported formats are:
-          # * `Datadog`: Datadog propagation format, described by [Distributed Tracing](https://docs.datadoghq.com/tracing/setup_overview/setup/ruby/#distributed-tracing).
-          # * `B3`: B3 Propagation using multiple headers, described by [openzipkin/b3-propagation](https://github.com/openzipkin/b3-propagation#multiple-headers).
-          # * `B3 single header`: B3 Propagation using a single header, described by [openzipkin/b3-propagation](https://github.com/openzipkin/b3-propagation#single-header).
-          #
-          # @public_api
-          settings :distributed_tracing do
-            # An ordered list of what data propagation styles the tracer will use to extract distributed tracing propagation
-            # data from incoming requests and messages.
-            #
-            # The tracer will try to find distributed headers in the order they are present in the list provided to this option.
-            # The first format to have valid data present will be used.
-            #
-            # @default `DD_PROPAGATION_STYLE_EXTRACT` environment variable (comma-separated list),
-            #   otherwise `['Datadog','B3','B3 single header']`.
-            # @return [Array<String>]
-            option :propagation_extract_style do |o|
-              o.default do
-                # Look for all headers by default
-                env_to_list(
-                  Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_EXTRACT,
-                  [
-                    Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG,
-                    Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3,
-                    Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_SINGLE_HEADER
-                  ],
-                  comma_separated_only: true
-                )
-              end
-
-              o.lazy
-            end
-
-            # The data propagation styles the tracer will use to inject distributed tracing propagation
-            # data into outgoing requests and messages.
-            #
-            # The tracer will inject data from all styles specified in this option.
-            #
-            # @default `DD_PROPAGATION_STYLE_INJECT` environment variable (comma-separated list), otherwise `['Datadog']`.
-            # @return [Array<String>]
-            option :propagation_inject_style do |o|
-              o.default do
-                env_to_list(
-                  Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_INJECT,
-                  [Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG],
-                  comma_separated_only: true # Only inject Datadog headers by default
-                )
-              end
-
-              o.lazy
-            end
-          end
-
-          # Enable trace collection and span generation.
-          #
-          # You can use this option to disable tracing without having to
-          # remove the library as a whole.
-          #
-          # @default `DD_TRACE_ENABLED` environment variable, otherwise `true`
-          # @return [Boolean]
-          option :enabled do |o|
-            o.default { env_to_bool(Datadog::Core::Diagnostics::Ext::DD_TRACE_ENABLED, true) }
-            o.lazy
-          end
-
-          # A custom tracer instance.
-          #
-          # It must respect the contract of {Datadog::Tracing::Tracer}.
-          # It's recommended to delegate methods to {Datadog::Tracing::Tracer} to ease the implementation
-          # of a custom tracer.
-          #
-          # This option will not return the live tracer instance: it only holds a custom tracing instance, if any.
-          #
-          # For internal use only.
-          #
-          # @default `nil`
-          # @return [Object,nil]
-          option :instance
-
-          # Automatic correlation between tracing and logging.
-          # @see https://docs.datadoghq.com/tracing/setup_overview/setup/ruby/#trace-correlation
-          # @return [Boolean]
-          option :log_injection do |o|
-            o.default { env_to_bool(Tracing::Configuration::Ext::Correlation::ENV_LOGS_INJECTION_ENABLED, true) }
-            o.lazy
-          end
-
-          # Configures an alternative trace transport behavior, where
-          # traces can be sent to the agent and backend before all spans
-          # have finished.
-          #
-          # This is useful for long-running jobs or very large traces.
-          #
-          # The trace flame graph will display the partial trace as it is received and constantly
-          # update with new spans as they are flushed.
-          # @public_api
-          settings :partial_flush do
-            # Enable partial trace flushing.
-            #
-            # @default `false`
-            # @return [Boolean]
-            option :enabled, default: false
-
-            # Minimum number of finished spans required in a single unfinished trace before
-            # the tracer will consider that trace for partial flushing.
-            #
-            # This option helps preserve a minimum amount of batching in the
-            # flushing process, reducing network overhead.
-            #
-            # This threshold only applies to unfinished traces. Traces that have finished
-            # are always flushed immediately.
-            #
-            # @default 500
-            # @return [Integer]
-            option :min_spans_threshold, default: 500
-          end
-
-          # Enables {https://docs.datadoghq.com/tracing/trace_retention_and_ingestion/#datadog-intelligent-retention-filter
-          # Datadog intelligent retention filter}.
-          # @default `true`
-          # @return [Boolean,nil]
-          option :priority_sampling
-
-          option :report_hostname do |o|
-            o.default { env_to_bool(Tracing::Configuration::Ext::NET::ENV_REPORT_HOSTNAME, false) }
-            o.lazy
-          end
-
-          # A custom sampler instance.
-          # The object must respect the {Datadog::Tracing::Sampling::Sampler} interface.
-          # @default `nil`
-          # @return [Object,nil]
-          option :sampler
-
-          # Client-side sampling configuration.
-          # @see https://docs.datadoghq.com/tracing/trace_ingestion/mechanisms/
-          # @public_api
-          settings :sampling do
-            # Default sampling rate for the tracer.
-            #
-            # If `nil`, the trace uses an automatic sampling strategy that tries to ensure
-            # the collection of traces that are considered important (e.g. traces with an error, traces
-            # for resources not seen recently).
-            #
-            # @default `DD_TRACE_SAMPLE_RATE` environment variable, otherwise `nil`.
-            # @return [Float,nil]
-            option :default_rate do |o|
-              o.default { env_to_float(Tracing::Configuration::Ext::Sampling::ENV_SAMPLE_RATE, nil) }
-              o.lazy
-            end
-
-            # Rate limit for number of spans per second.
-            #
-            # Spans created above the limit will contribute to service metrics, but won't
-            # have their payload stored.
-            #
-            # @default `DD_TRACE_RATE_LIMIT` environment variable, otherwise 100.
-            # @return [Numeric,nil]
-            option :rate_limit do |o|
-              o.default { env_to_float(Tracing::Configuration::Ext::Sampling::ENV_RATE_LIMIT, 100) }
-              o.lazy
-            end
-
-            # Single span sampling rules.
-            # These rules allow a span to be kept when its encompassing trace is dropped.
-            #
-            # The syntax for single span sampling rules can be found here:
-            # TODO: <Single Span Sampling documentation URL here>
-            #
-            # @default `DD_SPAN_SAMPLING_RULES` environment variable.
-            #   Otherwise, `ENV_SPAN_SAMPLING_RULES_FILE` environment variable.
-            #   Otherwise `nil`.
-            # @return [String,nil]
-            # @public_api
-            option :span_rules do |o|
-              o.default do
-                rules = ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES]
-                rules_file = ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE]
-
-                if rules
-                  if rules_file
-                    Datadog.logger.warn(
-                      'Both DD_SPAN_SAMPLING_RULES and DD_SPAN_SAMPLING_RULES_FILE were provided: only ' \
-                        'DD_SPAN_SAMPLING_RULES will be used. Please do not provide DD_SPAN_SAMPLING_RULES_FILE when ' \
-                        'also providing DD_SPAN_SAMPLING_RULES as their configuration conflicts. ' \
-                        "DD_SPAN_SAMPLING_RULES_FILE=#{rules_file} DD_SPAN_SAMPLING_RULES=#{rules}"
-                    )
-                  end
-                  rules
-                elsif rules_file
-                  begin
-                    File.read(rules_file)
-                  rescue => e
-                    # `File#read` errors have clear and actionable messages, no need to add extra exception info.
-                    Datadog.logger.warn(
-                      "Cannot read span sampling rules file `#{rules_file}`: #{e.message}." \
-                      'No span sampling rules will be applied.'
-                    )
-                    nil
-                  end
-                end
-              end
-              o.lazy
-            end
-          end
-
-          # [Continuous Integration Visibility](https://docs.datadoghq.com/continuous_integration/) configuration.
-          # @public_api
-          settings :test_mode do
-            # Enable test mode. This allows the tracer to collect spans from test runs.
-            #
-            # It also prevents the tracer from collecting spans in a production environment. Only use in a test environment.
-            #
-            # @default `DD_TRACE_TEST_MODE_ENABLED` environment variable, otherwise `false`
-            # @return [Boolean]
-            option :enabled do |o|
-              o.default { env_to_bool(Tracing::Configuration::Ext::Test::ENV_MODE_ENABLED, false) }
-              o.lazy
-            end
-
-            option :trace_flush do |o|
-              o.default { nil }
-              o.lazy
-            end
-
-            option :writer_options do |o|
-              o.default { {} }
-              o.lazy
-            end
-          end
-
-          # @see file:docs/GettingStarted.md#configuring-the-transport-layer Configuring the transport layer
-          #
-          # A {Proc} that configures a custom tracer transport.
-          # @yield Receives a {Datadog::Transport::HTTP} that can be modified with custom adapters and settings.
-          # @yieldparam [Datadog::Transport::HTTP] t transport to be configured.
-          # @default `nil`
-          # @return [Proc,nil]
-          option :transport_options, default: nil
-
-          # A custom writer instance.
-          # The object must respect the {Datadog::Tracing::Writer} interface.
-          #
-          # This option is recommended for internal use only.
-          #
-          # @default `nil`
-          # @return [Object,nil]
-          option :writer
-
-          # A custom {Hash} with keyword options to be passed to {Datadog::Tracing::Writer#initialize}.
-          #
-          # This option is recommended for internal use only.
-          #
-          # @default `{}`
-          # @return [Hash,nil]
-          option :writer_options, default: ->(_i) { {} }, lazy: true
-
-          # Client IP configuration
-          # @public_api
-          settings :client_ip do
-            # Whether client IP collection is enabled. When enabled client IPs from HTTP requests will
-            #   be reported in traces.
-            #
-            # Usage of the DD_TRACE_CLIENT_IP_HEADER_DISABLED environment variable is deprecated.
-            #
-            # @see https://docs.datadoghq.com/tracing/configure_data_security#configuring-a-client-ip-header
-            #
-            # @default `DD_TRACE_CLIENT_IP_ENABLED` environment variable, otherwise `false`.
-            # @return [Boolean]
-            option :enabled do |o|
-              o.default do
-                disabled = env_to_bool(Tracing::Configuration::Ext::ClientIp::ENV_DISABLED)
-
-                enabled = if disabled.nil?
-                            false
-                          else
-                            Datadog.logger.warn { "#{Tracing::Configuration::Ext::ClientIp::ENV_DISABLED} environment variable is deprecated, found set to #{disabled}, use #{Tracing::Configuration::Ext::ClientIp::ENV_ENABLED}=#{!disabled}" }
-
-                            !disabled
-                          end
-
-                # ENABLED env var takes precedence over deprecated DISABLED
-                env_to_bool(Tracing::Configuration::Ext::ClientIp::ENV_ENABLED, enabled)
-              end
-              o.lazy
-            end
-
-            # An optional name of a custom header to resolve the client IP from.
-            #
-            # @default `DD_TRACE_CLIENT_IP_HEADER` environment variable, otherwise `nil`.
-            # @return [String,nil]
-            option :header_name do |o|
-              o.default { ENV.fetch(Tracing::Configuration::Ext::ClientIp::ENV_HEADER_NAME, nil) }
-              o.lazy
-            end
-          end
-
-          # Maximum size for the `x-datadog-tags` distributed trace tags header.
-          #
-          # If the serialized size of distributed trace tags is larger than this value, it will
-          # not be parsed if incoming, nor exported if outgoing. An error message will be logged
-          # in this case.
-          #
-          # @default `DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH` environment variable, otherwise `512`
-          # @return [Integer]
-          option :x_datadog_tags_max_length do |o|
-            o.default { env_to_int(Tracing::Configuration::Ext::Distributed::ENV_X_DATADOG_TAGS_MAX_LENGTH, 512) }
-            o.lazy
-          end
-        end
-
         # The `version` tag in Datadog. Use it to enable [Deployment Tracking](https://docs.datadoghq.com/tracing/deployment_tracking/).
         # @see https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging
         # @default `DD_VERSION` environment variable, otherwise `nils`
@@ -763,9 +435,12 @@ module Datadog
             o.lazy
           end
         end
+
+        # TODO: Tracing should manage its own settings.
+        #       Keep this extension here for now to keep things working.
+        extend Datadog::Tracing::Configuration::Settings
       end
       # rubocop:enable Metrics/BlockLength
-      # rubocop:enable Layout/LineLength
     end
   end
 end

data/lib/datadog/core/diagnostics/environment_logger.rb

@@ -221,9 +221,9 @@ module Datadog
           !!Datadog.configuration.diagnostics.health_metrics.enabled
         end
 
-        # TODO: Populate when profiling is implemented
-        # def profiling_enabled
-        # end
+        def profiling_enabled
+          !!Datadog.configuration.profiling.enabled
+        end
 
         # TODO: Populate when automatic log correlation is implemented
         # def logs_correlation_enabled
@@ -254,6 +254,7 @@ module Datadog
             partial_flushing_enabled: partial_flushing_enabled,
             priority_sampling_enabled: priority_sampling_enabled,
             health_metrics_enabled: health_metrics_enabled,
+            profiling_enabled: profiling_enabled,
             **instrumented_integrations_settings
           }
         end

data/lib/datadog/core/diagnostics/health.rb

@@ -1,7 +1,7 @@
-# typed: strict
+# typed: ignore
 
-require_relative 'ext'
 require_relative '../metrics/client'
+require_relative '../../tracing/diagnostics/health'
 
 module Datadog
   module Core
@@ -10,26 +10,8 @@ module Datadog
       module Health
         # Health metrics for diagnostics
         class Metrics < Core::Metrics::Client
-          count :api_errors, Ext::Health::Metrics::METRIC_API_ERRORS
-          count :api_requests, Ext::Health::Metrics::METRIC_API_REQUESTS
-          count :api_responses, Ext::Health::Metrics::METRIC_API_RESPONSES
-          count :error_context_overflow, Ext::Health::Metrics::METRIC_ERROR_CONTEXT_OVERFLOW
-          count :error_instrumentation_patch, Ext::Health::Metrics::METRIC_ERROR_INSTRUMENTATION_PATCH
-          count :error_span_finish, Ext::Health::Metrics::METRIC_ERROR_SPAN_FINISH
-          count :error_unfinished_spans, Ext::Health::Metrics::METRIC_ERROR_UNFINISHED_SPANS
-          count :instrumentation_patched, Ext::Health::Metrics::METRIC_INSTRUMENTATION_PATCHED
-          count :queue_accepted, Ext::Health::Metrics::METRIC_QUEUE_ACCEPTED
-          count :queue_accepted_lengths, Ext::Health::Metrics::METRIC_QUEUE_ACCEPTED_LENGTHS
-          count :queue_dropped, Ext::Health::Metrics::METRIC_QUEUE_DROPPED
-          count :traces_filtered, Ext::Health::Metrics::METRIC_TRACES_FILTERED
-          count :transport_trace_too_large, Ext::Health::Metrics::METRIC_TRANSPORT_TRACE_TOO_LARGE
-          count :transport_chunked, Ext::Health::Metrics::METRIC_TRANSPORT_CHUNKED
-          count :writer_cpu_time, Ext::Health::Metrics::METRIC_WRITER_CPU_TIME
-
-          gauge :queue_length, Ext::Health::Metrics::METRIC_QUEUE_LENGTH
-          gauge :queue_max_length, Ext::Health::Metrics::METRIC_QUEUE_MAX_LENGTH
-          gauge :queue_spans, Ext::Health::Metrics::METRIC_QUEUE_SPANS
-          gauge :sampling_service_cache_length, Ext::Health::Metrics::METRIC_SAMPLING_SERVICE_CACHE_LENGTH
+          # TODO: Don't reference this. Have tracing add its metrics behavior.
+          extend Tracing::Diagnostics::Health::Metrics
         end
       end
     end

data/lib/datadog/core/environment/variable_helpers.rb

@@ -9,18 +9,45 @@ module Datadog
       module VariableHelpers
         extend self
 
-        def env_to_bool(var, default = nil)
-          var = decode_array(var)
+        # Reads an environment variable as a Boolean.
+        #
+        # @param [String] var environment variable
+        # @param [Array<String>] var list of environment variables
+        # @param [Boolean] default the default value if the keys in `var` are not present in the environment
+        # @param [Boolean] deprecation_warning when `var` is a list, record a deprecation log when
+        #   the first key in `var` is not used.
+        # @return [Boolean] if the environment value is the string `true`
+        # @return [default] if the environment value is not found
+        def env_to_bool(var, default = nil, deprecation_warning: true)
+          var = decode_array(var, deprecation_warning)
           var && ENV.key?(var) ? ENV[var].to_s.strip.downcase == 'true' : default
         end
 
-        def env_to_int(var, default = nil)
-          var = decode_array(var)
+        # Reads an environment variable as an Integer.
+        #
+        # @param [String] var environment variable
+        # @param [Array<String>] var list of environment variables
+        # @param [Integer] default the default value if the keys in `var` are not present in the environment
+        # @param [Boolean] deprecation_warning when `var` is a list, record a deprecation log when
+        #   the first key in `var` is not used.
+        # @return [Integer] if the environment value is a valid Integer
+        # @return [default] if the environment value is not found
+        def env_to_int(var, default = nil, deprecation_warning: true)
+          var = decode_array(var, deprecation_warning)
           var && ENV.key?(var) ? ENV[var].to_i : default
         end
 
-        def env_to_float(var, default = nil)
-          var = decode_array(var)
+        # Reads an environment variable as a Float.
+        #
+        # @param [String] var environment variable
+        # @param [Array<String>] var list of environment variables
+        # @param [Float] default the default value if the keys in `var` are not present in the environment
+        # @param [Boolean] deprecation_warning when `var` is a list, record a deprecation log when
+        #   the first key in `var` is not used.
+        # @return [Float] if the environment value is a valid Float
+        # @return [default] if the environment value is not found
+        def env_to_float(var, default = nil, deprecation_warning: true)
+          var = decode_array(var, deprecation_warning)
           var && ENV.key?(var) ? ENV[var].to_f : default
         end
 
@@ -33,8 +60,16 @@ module Datadog
         # either trailing or leading are trimmed.
         #
         # Empty entries, after trimmed, are also removed from the result.
-        def env_to_list(var, default = [], comma_separated_only:)
-          var = decode_array(var)
+        #
+        # @param [String] var environment variable
+        # @param [Array<String>] var list of environment variables
+        # @param [Array<Object>] default the default value if the keys in `var` are not present in the environment
+        # @param [Boolean] deprecation_warning when `var` is a list, record a deprecation log when
+        #   the first key in `var` is not used.
+        # @return [Array<Object>] if the environment value is a valid list
+        # @return [default] if the environment value is not found
+        def env_to_list(var, default = [], comma_separated_only:, deprecation_warning: true)
+          var = decode_array(var, deprecation_warning)
           if var && ENV.key?(var)
             value = ENV[var]
 
@@ -59,8 +94,21 @@ module Datadog
 
         private
 
-        def decode_array(var)
-          var.is_a?(Array) ? var.find { |env_var| ENV.key?(env_var) } : var
+        def decode_array(var, deprecation_warning)
+          if var.is_a?(Array)
+            var.find.with_index do |env_var, i|
+              found = ENV.key?(env_var)
+
+              # Check if we are using a non-preferred environment variable
+              if deprecation_warning && found && i != 0
+                Datadog::Core.log_deprecation { "#{env_var} environment variable is deprecated, use #{var.first} instead." }
+              end
+
+              found
+            end
+          else
+            var
+          end
         end
       end
     end

data/lib/datadog/core/metrics/client.rb

@@ -2,6 +2,7 @@
 
 require_relative '../utils/time'
 require_relative '../utils/only_once'
+require_relative '../configuration/ext'
 
 require_relative 'ext'
 require_relative 'options'
@@ -50,11 +51,11 @@ module Datadog
         end
 
         def default_hostname
-          ENV.fetch(Ext::ENV_DEFAULT_HOST, Ext::DEFAULT_HOST)
+          ENV.fetch(Configuration::Ext::Transport::ENV_DEFAULT_HOST, Ext::DEFAULT_HOST)
         end
 
         def default_port
-          ENV.fetch(Ext::ENV_DEFAULT_PORT, Ext::DEFAULT_PORT).to_i
+          ENV.fetch(Configuration::Ext::Metrics::ENV_DEFAULT_PORT, Ext::DEFAULT_PORT).to_i
         end
 
         def default_statsd_client

data/lib/datadog/core/metrics/ext.rb

@@ -7,8 +7,6 @@ module Datadog
       module Ext
         DEFAULT_HOST = '127.0.0.1'.freeze
         DEFAULT_PORT = 8125
-        ENV_DEFAULT_HOST = 'DD_AGENT_HOST'.freeze
-        ENV_DEFAULT_PORT = 'DD_METRIC_AGENT_PORT'.freeze
 
         TAG_LANG = 'language'.freeze
         TAG_LANG_INTERPRETER = 'language-interpreter'.freeze

data/lib/datadog/core/telemetry/collector.rb

@@ -135,6 +135,7 @@ module Datadog
             format_configuration_value(configuration.tracing.writer_options[:flush_interval])
           options['logger.instance'] = configuration.logger.instance.class.to_s
           options['appsec.enabled'] = configuration.dig('appsec', 'enabled') if configuration.respond_to?('appsec')
+          options['tracing.opentelemetry.enabled'] = !defined?(Datadog::OpenTelemetry::LOADED).nil?
           compact_hash(options)
         end
 

data/lib/datadog/core/utils.rb

@@ -1,7 +1,6 @@
 # typed: true
 
 require_relative 'utils/forking'
-require_relative '../tracing/span'
 
 module Datadog
   module Core
@@ -11,26 +10,6 @@ module Datadog
       extend Forking
 
       EMPTY_STRING = ''.encode(::Encoding::UTF_8).freeze
-      # We use a custom random number generator because we want no interference
-      # with the default one. Using the default prng, we could break code that
-      # would rely on srand/rand sequences.
-
-      # Return a randomly generated integer, valid as a Span ID or Trace ID.
-      # This method is thread-safe and fork-safe.
-      def self.next_id
-        after_fork! { reset! }
-        id_rng.rand(Tracing::Span::RUBY_ID_RANGE)
-      end
-
-      def self.id_rng
-        @id_rng ||= Random.new
-      end
-
-      def self.reset!
-        @id_rng = Random.new
-      end
-
-      private_class_method :id_rng, :reset!
 
       # Stringifies `value` and ensures the outcome is
       # string is no longer than `size`.