datadog 2.39.0 → 2.41.0

data/lib/datadog/appsec/security_engine/engine.rb

@@ -31,7 +31,7 @@ module Datadog
           @waf_builder = WAF::HandleBuilder.new(
             obfuscator: {
               key_regex: appsec_settings.obfuscator_key_regex,
-              value_regex: appsec_settings.obfuscator_value_regex
+              value_regex: appsec_settings.obfuscator_value_regex,
             }
           )
 
@@ -130,7 +130,7 @@ module Datadog
             tags: {
               waf_version: Datadog::AppSec::WAF::VERSION::BASE_STRING,
               event_rules_version: ruleset_version.to_s,
-              success: success.to_s
+              success: success.to_s,
             }
           )
         end
@@ -156,7 +156,7 @@ module Datadog
           common_tags = {
             waf_version: Datadog::AppSec::WAF::VERSION::BASE_STRING,
             event_rules_version: diagnostics["ruleset_version"].to_s,
-            action: action
+            action: action,
           }
 
           if diagnostics["error"]

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

@@ -352,13 +352,13 @@ module Datadog
           # have direct ownership of it.
           old_statsd = [
             runtime_metrics.metrics.statsd,
-            health_metrics.statsd
+            health_metrics.statsd,
           ].compact.uniq
 
           new_statsd = if replacement
             [
               replacement.runtime_metrics.metrics.statsd,
-              replacement.health_metrics.statsd
+              replacement.health_metrics.statsd,
             ].compact.uniq
           else
             []

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

@@ -165,7 +165,7 @@ module Datadog
               resetter: @resetter,
               setter: @setter,
               type: @type,
-              type_options: @type_options
+              type_options: @type_options,
             }
           end
 

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

@@ -84,7 +84,7 @@ module Datadog
             end
             {
               option_name.to_sym => opt_getter,
-              :"#{option_name}=" => opt_setter
+              :"#{option_name}=" => opt_setter,
             }
           end
 

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

@@ -644,6 +644,13 @@ module Datadog
               o.env "DD_PROFILING_EXPERIMENTAL_USE_SYSTEM_DNS"
               o.default true
             end
+
+            # Whether the profiler samples include the class/module name in stack frames, like `Foo::Bar#baz`, or not (`baz`)
+            option :experimental_show_classes_enabled do |o|
+              o.type :bool
+              o.env "DD_PROFILING_EXPERIMENTAL_SHOW_CLASSES_ENABLED"
+              o.default false
+            end
           end
 
           # @public_api
@@ -792,55 +799,40 @@ module Datadog
           end
         end
 
-        # The time provider used by Datadog. It must respect the interface of [Time](https://ruby-doc.org/core-3.0.1/Time.html).
-        #
-        # When testing, it can be helpful to use a different time provider.
-        #
-        # For [Timecop](https://rubygems.org/gems/timecop), for example, `->{ Time.now_without_mock_time }`
-        # allows Datadog features to use the real wall time when time is frozen.
-        #
-        # @default `->{ Time.now }`
-        # @return [Proc<Time>]
+        # Deprecated and no longer does anything.
+        # This gem already takes care to not be affected by timecop.
+        # DEV-3.0: Remove `time_now_provider` option
         option :time_now_provider do |o|
-          o.default_proc { ::Time.now }
+          o.default_proc { Datadog::Core::Utils::Time.now }
           o.type :proc
-
-          o.after_set do |time_provider|
-            Core::Utils::Time.now_provider = time_provider
-          end
-
-          o.resetter do |_value|
-            # TODO: Resetter needs access to the default value
-            # TODO: to help reduce duplication.
-            -> { ::Time.now }.tap do |default|
-              Core::Utils::Time.now_provider = default
+          o.after_set do |_, _, precedence|
+            unless precedence == Datadog::Core::Configuration::Option::Precedence::DEFAULT
+              unless defined?(Datadog::CI) # the datadog-ci gem needs to work with any datadog gem version and not warn
+                Core.log_deprecation(key: :time_now_provider) do
+                  "The time_now_provider setting has been deprecated for removal " \
+                    "and no longer does anything. Please remove it from your Datadog.configure block. " \
+                    "The datadog gem always uses the real non-mocked time, even when the timecop gem monkey-patches Time."
+                end
+              end
             end
           end
         end
 
-        # The monotonic clock time provider used by Datadog. This option is internal and is used by `datadog-ci`
-        # gem to avoid traces' durations being skewed by timecop.
-        #
-        # It must respect the interface of [Datadog::Core::Utils::Time#get_time] method.
-        #
-        # For [Timecop](https://rubygems.org/gems/timecop), for example,
-        # `->(unit = :float_second) { ::Process.clock_gettime_without_mock(Datadog::Core::Utils::Time::MONOTONIC_CLOCK_ID, unit) }`
-        # allows Datadog features to use the real monotonic time when time is frozen with
-        # `Timecop.mock_process_clock = true`.
-        #
-        # @default `->(unit = :float_second) { ::Process.clock_gettime(Core::Utils::Time::MONOTONIC_CLOCK_ID, unit) }`
-        # @return [Proc<Numeric>]
+        # Deprecated and no longer does anything.
+        # This gem already takes care to not be affected by timecop.
+        # DEV-3.0: Remove `get_time_provider` option
         option :get_time_provider do |o|
-          o.default_proc { |unit = :float_second| ::Process.clock_gettime(Core::Utils::Time::MONOTONIC_CLOCK_ID, unit) }
+          o.default_proc { |unit = :float_second| Datadog::Core::Utils::Time.get_time(unit) }
           o.type :proc
-
-          o.after_set do |get_time_provider|
-            Core::Utils::Time.get_time_provider = get_time_provider
-          end
-
-          o.resetter do |_value|
-            ->(unit = :float_second) { ::Process.clock_gettime(Core::Utils::Time::MONOTONIC_CLOCK_ID, unit) }.tap do |default|
-              Core::Utils::Time.get_time_provider = default
+          o.after_set do |_, _, precedence|
+            unless precedence == Datadog::Core::Configuration::Option::Precedence::DEFAULT
+              unless defined?(Datadog::CI) # the datadog-ci gem needs to work with any datadog gem version and not warn
+                Core.log_deprecation(key: :get_time_provider) do
+                  "The get_time_provider setting has been deprecated for removal " \
+                    "and no longer does anything. Please remove it from your Datadog.configure block. " \
+                    "The datadog gem always uses the real non-mocked time, even when the timecop gem monkey-patches Process.clock_gettime."
+                end
+              end
             end
           end
         end

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

@@ -24,6 +24,7 @@ module Datadog
           "DD_API_SECURITY_REQUEST_SAMPLE_RATE",
           "DD_API_SECURITY_SAMPLE_DELAY",
           "DD_APM_TRACING_ENABLED",
+          "DD_APPSEC_AGENTIC_ONBOARDING",
           "DD_APPSEC_AUTOMATED_USER_EVENTS_TRACKING",
           "DD_APPSEC_AUTO_USER_INSTRUMENTATION_MODE",
           "DD_APPSEC_BODY_PARSING_SIZE_LIMIT",
@@ -60,6 +61,7 @@ module Datadog
           "DD_ERROR_TRACKING_HANDLED_ERRORS_INCLUDE",
           "DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED",
           "DD_EXPERIMENTAL_FLAGGING_PROVIDER_SPAN_ENRICHMENT_ENABLED",
+          "DD_EXPERIMENTAL_NATIVE_TRANSPORT_ENABLED",
           "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED",
           "DD_EXTERNAL_ENV",
           "DD_FLAGGING_EVALUATION_COUNTS_ENABLED",
@@ -85,6 +87,7 @@ module Datadog
           "DD_PROFILING_EXPERIMENTAL_HEAP_ENABLED",
           "DD_PROFILING_EXPERIMENTAL_HEAP_SAMPLE_RATE",
           "DD_PROFILING_EXPERIMENTAL_HEAP_SIZE_ENABLED",
+          "DD_PROFILING_EXPERIMENTAL_SHOW_CLASSES_ENABLED",
           "DD_PROFILING_EXPERIMENTAL_USE_SYSTEM_DNS",
           "DD_PROFILING_GC_ENABLED",
           "DD_PROFILING_GVL_ENABLED",

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

@@ -75,7 +75,10 @@ module Datadog
               tags: tags,
               runtime_metrics_enabled: runtime_metrics_enabled,
               vm: vm,
-              health_metrics_enabled: health_metrics_enabled
+              health_metrics_enabled: health_metrics_enabled,
+              otlp_traces_export_enabled: otlp_traces_export_enabled,
+              otlp_metrics_export_enabled: otlp_metrics_export_enabled,
+              otlp_logs_export_enabled: otlp_logs_export_enabled,
             }
           end
 
@@ -159,8 +162,40 @@ module Datadog
             !!Datadog.configuration.health_metrics.enabled
           end
 
+          # @return [Boolean] whether the tracer exports traces over OTLP.
+          #   Always false: Ruby exports spans in Datadog's native format and has no OTLP trace exporter.
+          def otlp_traces_export_enabled
+            false
+          end
+
+          # @return [Boolean] whether the tracer exports metrics over OTLP
+          def otlp_metrics_export_enabled
+            metrics = opentelemetry_settings&.metrics
+            # A "none" exporter skips the OTLP metric reader even when metrics are enabled
+            # (mirrors Datadog::OpenTelemetry::Ext::EXPORTER_NONE).
+            !!(metrics&.enabled && metrics.exporter != "none")
+          end
+
+          # @return [Boolean] whether the tracer exports logs over OTLP
+          def otlp_logs_export_enabled
+            logs = opentelemetry_settings&.logs
+            # A "none" exporter skips the OTLP log record processor even when logs are enabled
+            # (mirrors Datadog::OpenTelemetry::Ext::EXPORTER_NONE).
+            !!(logs&.enabled && logs.exporter != "none")
+          end
+
           private
 
+          # The `opentelemetry` settings namespace is registered by core configuration, but access it
+          # defensively so a missing/unregistered namespace defaults to `false` rather than raising.
+          def opentelemetry_settings
+            return unless Datadog.configuration.respond_to?(:opentelemetry)
+
+            Datadog.configuration.opentelemetry
+          rescue
+            nil
+          end
+
           # Outputs "k1:v1,k2:v2,..."
           def hash_serializer(h)
             h.map { |k, v| "#{k}:#{v}" }.join(",")

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

@@ -12,7 +12,7 @@ module Datadog
         end
 
         def available?
-          defined?(::GC) && ::GC.respond_to?(:stat)
+          !!(defined?(::GC) && ::GC.respond_to?(:stat))
         end
       end
     end

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

@@ -56,7 +56,7 @@ module Datadog
         end
 
         def available?
-          defined?(::RubyVM) && ::RubyVM.respond_to?(:stat)
+          !!(defined?(::RubyVM) && ::RubyVM.respond_to?(:stat))
         end
       end
     end

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

@@ -59,9 +59,9 @@ module Datadog
         end
 
         def available?
-          defined?(::RubyVM::YJIT) \
+          !!(defined?(::RubyVM::YJIT) \
             && ::RubyVM::YJIT.enabled? \
-            && ::RubyVM::YJIT.respond_to?(:runtime_stats)
+            && ::RubyVM::YJIT.respond_to?(:runtime_stats))
         end
       end
     end

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

@@ -10,7 +10,7 @@ module Datadog
           :distribution,
           :increment,
           :gauge,
-          :time
+          :time,
         ].each do |metric_type|
           define_method(metric_type) do |name, stat|
             name = name.to_sym

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

@@ -16,8 +16,8 @@ module Datadog
             "#{Ext::TAG_LANG_VERSION}:#{Environment::Identity.lang_version}",
             # TODO: Technically not accurate, if tracing version diverges from datadog gem version
             #       If we extract tracing to its own gem, this needs to be updated.
-            "#{Ext::TAG_TRACER_VERSION}:#{Environment::Identity.gem_datadog_version}"
-          ].freeze
+            "#{Ext::TAG_TRACER_VERSION}:#{Environment::Identity.gem_datadog_version}",
+          ].freeze,
         }.freeze
 
         def metric_options(options = nil)

data/lib/datadog/core/process_discovery.rb

@@ -53,7 +53,7 @@ module Datadog
             service_version: settings.version || "",
             # Follows Java: https://github.com/DataDog/dd-trace-java/blob/2ebc964340ac530342cc389ba68ff0f5070d5f9f/dd-trace-core/src/main/java/datadog/trace/core/servicediscovery/ServiceDiscovery.java#L37-L38
             process_tags: settings.experimental_propagate_process_tags_enabled ? Core::Environment::Process.serialized : "",
-            container_id: Core::Environment::Container.container_id || ""
+            container_id: Core::Environment::Container.container_id || "",
           }
         end
       end

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

@@ -185,7 +185,7 @@ module Datadog
               is_agent: false,
               client_tracer: client_tracer,
               # base64 is needed otherwise the Go agent fails with an unmarshal error
-              capabilities: @capabilities.base64_capabilities
+              capabilities: @capabilities.base64_capabilities,
             },
             cached_target_files: state.cached_target_files,
           }

data/lib/datadog/core/remote/configuration/repository.rb

@@ -111,9 +111,9 @@ module Datadog
                   hashes: content.hashes.map do |algorithm, hexdigest|
                     {
                       algorithm: algorithm,
-                      hash: hexdigest
+                      hash: hexdigest,
                     }
-                  end
+                  end,
                 }
               end
             end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Core
+    module Telemetry
+      module ConfigurationValue
+        module_function
+
+        def convert(value)
+          case value
+          when Integer, String, true, false, nil
+            value
+          when Float
+            value.finite? ? value : value.to_s
+          when Hash
+            value.map { |key, entry_value| "#{key}:#{entry_value}" }.join(",")
+          when Array
+            value.join(",")
+          when Module
+            value.name.to_s
+          else
+            implements_to_s = begin
+              value.method(:to_s).owner != Kernel
+            rescue NameError
+              false
+            end
+
+            if implements_to_s
+              value.to_s
+            else
+              value.class.to_s
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/core/telemetry/event/app_client_configuration_change.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "base"
+require_relative "../configuration_value"
 
 module Datadog
   module Core
@@ -27,10 +28,11 @@ module Datadog
           def configuration
             config = Datadog.configuration
 
+            # @type var res: Array[telemetry_configuration]
             res = @changes.map do |name, value|
               {
                 name: name,
-                value: value,
+                value: Telemetry::ConfigurationValue.convert(value),
                 origin: @origin,
                 seq_id: Configuration::Option::Precedence::REMOTE_CONFIGURATION.numeric.next,
               }

data/lib/datadog/core/telemetry/event/app_endpoints_loaded.rb

@@ -20,7 +20,7 @@ module Datadog
           def payload
             {
               is_first: @is_first,
-              endpoints: @endpoints
+              endpoints: @endpoints,
             }
           end
         end

data/lib/datadog/core/telemetry/event/app_started.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "base"
+require_relative "../configuration_value"
 
 module Datadog
   module Core
@@ -65,7 +66,7 @@ module Datadog
                 # actually enabled by env var or by implicit enablement via
                 # remote config.
                 enabled: components.dynamic_instrumentation&.started? || false,
-              }
+              },
             }
 
             if (unsupported_reason = Datadog::Profiling.unsupported_reason)
@@ -214,23 +215,9 @@ module Datadog
           end
 
           def to_telemetry_value(value)
-            # TODO: Add float if telemetry starts accepting it
-            case value
-            when Integer, String, true, false, nil
-              value
-            when Hash
-              value.map { |key, entry_value| "#{key}:#{entry_value}" }.join(",")
-            when Array
-              value.join(",")
-            when Module
-              value.name.to_s
-            else
-              if implements_to_s?(value)
-                value.to_s
-              else
-                value.class.to_s
-              end
-            end
+            return value.to_s if value.is_a?(Float)
+
+            Telemetry::ConfigurationValue.convert(value)
           end
 
           def install_signature(settings)
@@ -280,12 +267,6 @@ module Datadog
             parent_setting = settings.dig(*split_option)
             parent_setting.send(:resolve_option, option_name.to_sym)
           end
-
-          def implements_to_s?(value)
-            value.method(:to_s).owner != Kernel
-          rescue NameError
-            false
-          end
         end
       end
     end

data/lib/datadog/core/telemetry/event/generate_metrics.rb

@@ -23,7 +23,7 @@ module Datadog
           def payload
             {
               namespace: @namespace,
-              series: @metric_series.map(&:to_h)
+              series: @metric_series.map(&:to_h),
             }
           end
 

data/lib/datadog/core/telemetry/event/log.rb

@@ -52,8 +52,8 @@ module Datadog
                   level: @level,
                   stack_trace: @stack_trace,
                   count: @count,
-                }.compact
-              ]
+                }.compact,
+              ],
             }
           end
 

data/lib/datadog/core/telemetry/event/synth_app_client_configuration_change.rb

@@ -57,7 +57,7 @@ module Datadog
           end
 
           def reset?
-            defined?(@reset) && !!@reset
+            !!(defined?(@reset) && @reset)
           end
         end
       end

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

@@ -37,7 +37,7 @@ module Datadog
               points: values,
               type: type,
               tags: tags,
-              common: common
+              common: common,
             }
           end
 
@@ -179,7 +179,7 @@ module Datadog
               metric: name,
               points: values,
               tags: tags,
-              common: common
+              common: common,
             }
           end
         end

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

@@ -50,7 +50,7 @@ module Datadog
               runtime_version: Core::Environment::Ext::ENGINE_VERSION,
               service_name: config.service,
               service_version: config.version,
-              tracer_version: tracer_version
+              tracer_version: tracer_version,
             }
 
             tag_process_tags!(app, config)
@@ -64,7 +64,7 @@ module Datadog
               hostname: Core::Environment::Platform.hostname,
               kernel_name: Core::Environment::Platform.kernel_name,
               kernel_release: Core::Environment::Platform.kernel_release,
-              kernel_version: Core::Environment::Platform.kernel_version
+              kernel_version: Core::Environment::Platform.kernel_version,
             }
           end
 

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

@@ -61,7 +61,7 @@ module Datadog
             Core::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER_VENDOR =>
               Core::Environment::Ext::LANG_ENGINE,
             Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION =>
-              Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION
+              Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION,
           }.tap do |headers|
             # Add application container info
             headers.merge!(Core::Environment::Container.to_headers)

data/lib/datadog/core/transport/transport.rb

@@ -69,7 +69,7 @@ module Datadog
 
           @current_api_id = api_id
           client_class = self.class.http_client_class || Core::Transport::HTTP::Client
-          @client = client_class.new(current_api, logger: logger) # steep:ignore
+          @client = client_class.new(current_api, logger: logger)
         end
 
         def downgrade?(response)