datadog 2.36.0 → 2.40.0

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

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative '../utils/time'
-require_relative '../utils/only_once'
-require_relative '../telemetry/logger'
-require_relative '../configuration/ext'
+require_relative "../utils/time"
+require_relative "../utils/only_once"
+require_relative "../telemetry/logger"
+require_relative "../configuration/ext"
 
-require_relative 'ext'
-require_relative 'options'
-require_relative 'helpers'
-require_relative 'logging'
-require_relative 'metric'
+require_relative "ext"
+require_relative "options"
+require_relative "helpers"
+require_relative "logging"
+require_relative "metric"
 
 module Datadog
   module Core
@@ -39,10 +39,10 @@ module Datadog
         def supported?
           version = dogstatsd_version
 
-          !version.nil? && version >= Gem::Version.new('3.3.0') &&
+          !version.nil? && version >= Gem::Version.new("3.3.0") &&
             # dogstatsd-ruby >= 5.0 & < 5.2.0 has known issues with process forks
             # and do not support the single thread mode we use to avoid this problem.
-            !(version >= Gem::Version.new('5.0') && version < Gem::Version.new('5.3'))
+            !(version >= Gem::Version.new("5.0") && version < Gem::Version.new("5.3"))
         end
 
         def enabled?
@@ -62,7 +62,7 @@ module Datadog
         end
 
         def default_statsd_client
-          require 'datadog/statsd'
+          require "datadog/statsd"
 
           # Create a StatsD client that points to the agent.
           #
@@ -74,7 +74,7 @@ module Datadog
           # overhead.
           #
           # Versions < 5.0 are always single-threaded, but do not have the kwarg option.
-          options = if dogstatsd_version >= Gem::Version.new('5.2')
+          options = if dogstatsd_version >= Gem::Version.new("5.2")
             {single_thread: true}
           else
             {}
@@ -103,7 +103,7 @@ module Datadog
           logger.error(
             "Failed to send count stat. Cause: #{e.class}: #{e.message} Source: #{Array(e.backtrace).first}"
           )
-          telemetry.report(e, description: 'Failed to send count stat')
+          telemetry.report(e, description: "Failed to send count stat")
         end
 
         def distribution(stat, value = nil, options = nil, &block)
@@ -117,7 +117,7 @@ module Datadog
           logger.error(
             "Failed to send distribution stat. Cause: #{e.class}: #{e.message} Source: #{Array(e.backtrace).first}"
           )
-          telemetry.report(e, description: 'Failed to send distribution stat')
+          telemetry.report(e, description: "Failed to send distribution stat")
         end
 
         def increment(stat, options = nil)
@@ -130,7 +130,7 @@ module Datadog
           logger.error(
             "Failed to send increment stat. Cause: #{e.class}: #{e.message} Source: #{Array(e.backtrace).first}"
           )
-          telemetry.report(e, description: 'Failed to send increment stat')
+          telemetry.report(e, description: "Failed to send increment stat")
         end
 
         def gauge(stat, value = nil, options = nil, &block)
@@ -144,7 +144,7 @@ module Datadog
           logger.error(
             "Failed to send gauge stat. Cause: #{e.class}: #{e.message} Source: #{Array(e.backtrace).first}"
           )
-          telemetry.report(e, description: 'Failed to send gauge stat')
+          telemetry.report(e, description: "Failed to send gauge stat")
         end
 
         def time(stat, options = nil)
@@ -157,14 +157,14 @@ module Datadog
           begin
             if send_stats? && !start.nil?
               finished = Utils::Time.get_time
-              distribution(stat, ((finished - start) * 1000), options)
+              distribution(stat, (finished - start) * 1000, options)
             end
           rescue => e
             # TODO: Likely to be redundant, since `distribution` handles its own errors.
             logger.error(
               "Failed to send time stat. Cause: #{e.class}: #{e.message} Source: #{Array(e.backtrace).first}"
             )
-            telemetry.report(e, description: 'Failed to send time stat')
+            telemetry.report(e, description: "Failed to send time stat")
           end
         end
 
@@ -186,7 +186,7 @@ module Datadog
               Datadog::Statsd::VERSION &&
               Gem::Version.new(Datadog::Statsd::VERSION)
           ) ||
-            Gem.loaded_specs['dogstatsd-ruby']&.version
+            Gem.loaded_specs["dogstatsd-ruby"]&.version
         end
 
         IGNORED_STATSD_ONLY_ONCE = Utils::OnlyOnce.new
@@ -195,7 +195,7 @@ module Datadog
         def ignored_statsd_warning
           IGNORED_STATSD_ONLY_ONCE.run do
             logger.warn(
-              'Ignoring user-supplied statsd instance as currently-installed version of dogstastd-ruby is incompatible. ' \
+              "Ignoring user-supplied statsd instance as currently-installed version of dogstastd-ruby is incompatible. " \
               "To fix this, ensure that you have `gem 'dogstatsd-ruby', '~> 5.3'` on your Gemfile or gems.rb file."
             )
           end

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

@@ -5,13 +5,13 @@ module Datadog
     module Metrics
       # @public_api
       module Ext
-        DEFAULT_HOST = '127.0.0.1'
+        DEFAULT_HOST = "127.0.0.1"
         DEFAULT_PORT = 8125
 
-        TAG_LANG = 'language'
-        TAG_LANG_INTERPRETER = 'language-interpreter'
-        TAG_LANG_VERSION = 'language-version'
-        TAG_TRACER_VERSION = 'tracer-version'
+        TAG_LANG = "language"
+        TAG_LANG_INTERPRETER = "language-interpreter"
+        TAG_LANG_VERSION = "language-version"
+        TAG_TRACER_VERSION = "tracer-version"
       end
     end
   end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'logger'
-require 'json'
+require "logger"
+require "json"
 
 module Datadog
   module Core

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'ext'
-require_relative '../environment/ext'
-require_relative '../environment/identity'
+require_relative "ext"
+require_relative "../environment/ext"
+require_relative "../environment/identity"
 
 module Datadog
   module Core

data/lib/datadog/core/pin.rb

@@ -63,7 +63,7 @@ module Datadog
       # rubocop:enable Style/TrivialAccessors
 
       def to_s
-        pretty_options = options.to_a.map { |k, v| "#{k}:#{v}" }.join(', ')
+        pretty_options = options.to_a.map { |k, v| "#{k}:#{v}" }.join(", ")
         "Pin(#{pretty_options})"
       end
 

data/lib/datadog/core/process_discovery.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'process_discovery/tracer_memfd'
-require_relative 'environment/process'
-require_relative 'environment/container'
+require_relative "process_discovery/tracer_memfd"
+require_relative "environment/process"
+require_relative "environment/container"
 
 module Datadog
   module Core
@@ -48,12 +48,12 @@ module Datadog
             tracer_language: Core::Environment::Identity.lang,
             tracer_version: Core::Environment::Identity.gem_datadog_version_semver2,
             hostname: Core::Environment::Socket.hostname,
-            service_name: settings.service || '',
-            service_env: settings.env || '',
-            service_version: settings.version || '',
+            service_name: settings.service || "",
+            service_env: settings.env || "",
+            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 || ''
+            process_tags: settings.experimental_propagate_process_tags_enabled ? Core::Environment::Process.serialized : "",
+            container_id: Core::Environment::Container.container_id || ""
           }
         end
       end

data/lib/datadog/core/rate_limiter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'utils/time'
+require_relative "utils/time"
 
 module Datadog
   module Core

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

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../utils/base64_codec'
-require_relative '../../../appsec/remote'
-require_relative '../../../tracing/remote'
-require_relative '../../../di/remote'
-require_relative '../../../symbol_database/remote'
-require_relative '../../../open_feature/remote'
+require_relative "../../utils/base64_codec"
+require_relative "../../../appsec/remote"
+require_relative "../../../tracing/remote"
+require_relative "../../../di/remote"
+require_relative "../../../symbol_database"
+require_relative "../../../symbol_database/remote"
+require_relative "../../../open_feature/remote"
 
 module Datadog
   module Core
@@ -13,11 +14,12 @@ module Datadog
       class Client
         # Capabilities
         class Capabilities
-          attr_reader :products, :capabilities, :receivers, :base64_capabilities
+          attr_reader :capabilities, :receivers, :base64_capabilities
 
           def initialize(settings, telemetry)
             @capabilities = []
             @products = []
+            @products_mutex = Mutex.new
             @receivers = []
             @telemetry = telemetry
 
@@ -26,6 +28,22 @@ module Datadog
             @base64_capabilities = capabilities_to_base64
           end
 
+          def products
+            @products_mutex.synchronize { @products.dup }
+          end
+
+          def add_products(*products)
+            @products_mutex.synchronize do
+              products.each { |product| @products << product unless @products.include?(product) }
+            end
+            nil
+          end
+
+          def remove_products(*products)
+            @products_mutex.synchronize { products.each { |product| @products.delete(product) } }
+            nil
+          end
+
           private
 
           def register(settings)
@@ -35,16 +53,45 @@ module Datadog
               register_receivers(Datadog::AppSec::Remote.receivers(@telemetry))
             end
 
-            if settings.respond_to?(:dynamic_instrumentation) && settings.dynamic_instrumentation.enabled
+            # Tracing must register before DI: on a combined RC dispatch,
+            # the APM_TRACING handler must run first to call
+            # Datadog::DI::Remote.handle_rc_enablement and start the
+            # component before the DI receiver processes LIVE_DEBUGGING
+            # changes against `component.started?`. Reversing the order
+            # silently drops the probe — the remote client only
+            # redispatches on content hash changes.
+            register_capabilities(Datadog::Tracing::Remote.capabilities)
+            register_products(Datadog::Tracing::Remote.products)
+            register_receivers(Datadog::Tracing::Remote.receivers(@telemetry))
+
+            if settings.respond_to?(:dynamic_instrumentation) &&
+                !Datadog::DI::Remote.explicitly_disabled?(settings) &&
+                Datadog::DI.supported_runtime?
               register_capabilities(Datadog::DI::Remote.capabilities)
-              register_products(Datadog::DI::Remote.products)
               register_receivers(Datadog::DI::Remote.receivers(@telemetry))
+            end
 
-              # Symbol Database
-              if settings.respond_to?(:symbol_database) && settings.symbol_database.enabled
+            # Skip symbol database registration on runtimes that cannot run it
+            # (JRuby, Ruby < 2.7): DI supports Ruby 2.6 but Symbol Database does
+            # not, so advertising LIVE_DEBUGGING_SYMBOL_DB there would invite
+            # symbol-upload configs the component can never serve.
+            if settings.respond_to?(:symbol_database) && Datadog::SymbolDatabase.supported_runtime?
+              # Symbol database follows DI: when unset it advertises whenever DI
+              # advertises (mirror the DI branch above, including the unset/default
+              # case that RC may enable). An explicit symbol_database.enabled wins.
+              di_enabled = settings.respond_to?(:dynamic_instrumentation) &&
+                !Datadog::DI::Remote.explicitly_disabled?(settings)
+              if Datadog::SymbolDatabase.resolve_enabled(settings.symbol_database.enabled, di_enabled)
                 register_capabilities(Datadog::SymbolDatabase::Remote.capabilities)
-                register_products(Datadog::SymbolDatabase::Remote.products)
                 register_receivers(Datadog::SymbolDatabase::Remote.receivers(@telemetry))
+                # Register the product at startup only when symbol_database is
+                # explicitly set (true here, since resolve_enabled already
+                # excluded false). When it follows DI (enabled nil, default or
+                # explicit), defer the product so it is advertised only once DI
+                # actually starts.
+                unless settings.symbol_database.enabled.nil?
+                  register_products(Datadog::SymbolDatabase::Remote.products)
+                end
               end
             end
 
@@ -53,10 +100,6 @@ module Datadog
               register_products(Datadog::OpenFeature::Remote.products)
               register_receivers(Datadog::OpenFeature::Remote.receivers(@telemetry))
             end
-
-            register_capabilities(Datadog::Tracing::Remote.capabilities)
-            register_products(Datadog::Tracing::Remote.products)
-            register_receivers(Datadog::Tracing::Remote.receivers(@telemetry))
           end
 
           def register_capabilities(capabilities)
@@ -72,10 +115,10 @@ module Datadog
           end
 
           def capabilities_to_base64
-            return '' if capabilities.empty?
+            return "" if capabilities.empty?
 
-            cap_to_hexs = capabilities.reduce(:|).to_s(16).tap { |s| s.size.odd? && s.prepend('0') }.scan(/\h\h/)
-            binary = cap_to_hexs.each_with_object([]) { |hex, acc| acc << hex }.map { |e| e.to_i(16) }.pack('C*')
+            cap_to_hexs = capabilities.reduce(:|).to_s(16).tap { |s| s.size.odd? && s.prepend("0") }.scan(/\h\h/)
+            binary = cap_to_hexs.each_with_object([]) { |hex, acc| acc << hex }.map { |e| e.to_i(16) }.pack("C*")
 
             Datadog::Core::Utils::Base64Codec.strict_encode64(binary)
           end

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'securerandom'
+require "securerandom"
 
-require_relative 'configuration'
-require_relative 'dispatcher'
+require_relative "configuration"
+require_relative "dispatcher"
 
 module Datadog
   module Core
@@ -43,7 +43,7 @@ module Datadog
         def process_response(response)
           # when response is completely empty, do nothing as in: leave as is
           if response.empty?
-            logger.debug { 'remote: empty response => NOOP' }
+            logger.debug { "remote: empty response => NOOP" }
 
             return
           end
@@ -117,7 +117,7 @@ module Datadog
           end
 
           if changes.empty?
-            logger.debug { 'remote: no changes' }
+            logger.debug { "remote: no changes" }
           else
             dispatcher.dispatch(changes, repository)
           end
@@ -210,40 +210,40 @@ module Datadog
         def native_platform
           return @native_platform unless @native_platform.nil?
 
-          os = if RUBY_ENGINE == 'jruby'
-            os_name = java.lang.System.get_property('os.name')
+          os = if RUBY_ENGINE == "jruby"
+            os_name = java.lang.System.get_property("os.name")
 
             case os_name
-            when /linux/i then 'linux'
-            when /mac/i then 'darwin'
+            when /linux/i then "linux"
+            when /mac/i then "darwin"
             else os_name
             end
           else
             Gem::Platform.local.os
           end
 
-          version = if os != 'linux'
+          version = if os != "linux"
             nil
           elsif RUBY_PLATFORM =~ /linux-(.+)$/
             # Old rubygems don't handle non-gnu linux correctly
             Regexp.last_match(1)
           else
-            'gnu'
+            "gnu"
           end
 
-          cpu = if RUBY_ENGINE == 'jruby'
-            os_arch = java.lang.System.get_property('os.arch')
+          cpu = if RUBY_ENGINE == "jruby"
+            os_arch = java.lang.System.get_property("os.arch")
 
             case os_arch
-            when 'amd64' then 'x86_64'
-            when 'aarch64' then (os == 'darwin') ? 'arm64' : 'aarch64'
+            when "amd64" then "x86_64"
+            when "aarch64" then (os == "darwin") ? "arm64" : "aarch64"
             else os_arch
             end
           else
             Gem::Platform.local.cpu
           end
 
-          @native_platform = [cpu, os, version].compact.join('-')
+          @native_platform = [cpu, os, version].compact.join("-")
         end
 
         GemSpecificationFallback = _ = Struct.new(:version, :platform) # rubocop:disable Naming/ConstantName

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'worker'
-require_relative 'client/capabilities'
-require_relative 'client'
-require_relative 'transport/http'
-require_relative '../remote'
-require_relative 'negotiation'
+require_relative "worker"
+require_relative "client/capabilities"
+require_relative "client"
+require_relative "transport/http"
+require_relative "../remote"
+require_relative "negotiation"
 
 module Datadog
   module Core
@@ -30,10 +30,10 @@ module Datadog
 
           @client = Client.new(@transport, @capabilities, settings: settings, logger: logger)
           @healthy = false
-          logger.debug { "new remote configuration client: #{@client.id} products: #{@capabilities.products.sort.join(', ')}" }
+          logger.debug { "new remote configuration client: #{@client.id} products: #{@capabilities.products.sort.join(", ")}" }
 
           @worker = Worker.new(interval: settings.remote.poll_interval_seconds, logger: logger) do
-            unless @healthy || negotiation.endpoint?('/v0.7/config')
+            unless @healthy || negotiation.endpoint?("/v0.7/config")
               @barrier.lift
 
               next
@@ -56,13 +56,13 @@ module Datadog
               # Transient errors due to network or agent. Logged the error but not via telemetry
               logger.error do
                 "remote worker error: #{e.class}: #{e.message} location: #{Array(e.backtrace).first}. " \
-                'resetting client state'
+                "resetting client state"
               end
 
               # client state is unknown, state might be corrupted
               @client = Client.new(@transport, @capabilities, settings: settings, logger: logger)
               @healthy = false
-              logger.debug { "new remote configuration client: #{@client.id} products: #{@capabilities.products.sort.join(', ')}" }
+              logger.debug { "new remote configuration client: #{@client.id} products: #{@capabilities.products.sort.join(", ")}" }
 
               # TODO: bail out if too many errors?
             end
@@ -98,7 +98,15 @@ module Datadog
         def after_fork
           @client = Client.new(@transport, @capabilities, settings: @settings, logger: @logger)
           @healthy = false
-          logger.debug { "remote configuration client recreated after fork: #{@client.id} products: #{@capabilities.products.sort.join(', ')}" }
+          logger.debug { "remote configuration client recreated after fork: #{@client.id} products: #{@capabilities.products.sort.join(", ")}" }
+        end
+
+        def add_products(*products)
+          @capabilities.add_products(*products)
+        end
+
+        def remove_products(*products)
+          @capabilities.remove_products(*products)
         end
 
         # Barrier provides a mechanism to fence execution until a condition happens
@@ -144,7 +152,7 @@ module Datadog
                 #   timeout and an integer otherwise
                 # - before Ruby 3.2, ConditionVariable returns itself
                 # so we have to rely on @once having been set
-                if RubyVersion.is?('>= 3.2')
+                if RubyVersion.is?(">= 3.2")
                   lifted = @condition.wait(@mutex, timeout)
                 else
                   @condition.wait(@mutex, timeout)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'path'
-require_relative 'digest'
+require_relative "path"
+require_relative "digest"
 
 module Datadog
   module Core
@@ -28,7 +28,7 @@ module Datadog
               # As such, the class is not written to expect +data+ to be nil.
               # Detect bad incoming values here to provide earlier diagnostics
               # when developing tests, for example.
-              raise ArgumentError, 'data must not be nil'
+              raise ArgumentError, "data must not be nil"
             end
             unless String === data
               raise ArgumentError, "Invalid type for data: #{data.class}: expected String"

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'digest'
+require "digest"
 
 module Datadog
   module Core

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

@@ -30,21 +30,21 @@ module Datadog
 
               raise ParseError, "could not parse: #{path.inspect}" if m.nil?
 
-              org_id = m['org_id']&.to_i
+              org_id = m["org_id"]&.to_i
 
-              source = m['source']
-              raise ParseError, 'missing source value' unless source
+              source = m["source"]
+              raise ParseError, "missing source value" unless source
 
               source = source.delete("/#{org_id}") if org_id
 
-              product = m['product']
-              raise ParseError, 'missing product value' unless product
+              product = m["product"]
+              raise ParseError, "missing product value" unless product
 
-              config_id = m['config_id']
-              raise ParseError, 'missing config_id value' unless config_id
+              config_id = m["config_id"]
+              raise ParseError, "missing config_id value" unless config_id
 
-              name = m['name']
-              raise ParseError, 'missing name value' unless name
+              name = m["name"]
+              raise ParseError, "missing name value" unless name
 
               new(source: source, org_id: org_id, product: product, config_id: config_id, name: name)
             end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'content'
+require_relative "content"
 
 module Datadog
   module Core
@@ -80,7 +80,7 @@ module Datadog
               @targets_version = repository.targets_version
               @config_states = contents_to_config_states(repository.contents)
               @has_error = false
-              @error = ''
+              @error = ""
               @opaque_backend_state = repository.opaque_backend_state
               @cached_target_files = contents_to_cached_target_files(repository.contents)
             end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'path'
-require_relative 'digest'
+require_relative "path"
+require_relative "digest"
 
 module Datadog
   module Core
@@ -11,15 +11,15 @@ module Datadog
         class TargetMap < Hash
           class << self
             def parse(hash)
-              signed = hash.fetch('signed')
+              signed = hash.fetch("signed")
               # Note that the +dig+ call permits +hash['signed']+ to be
               # missing the +custom+ subtree entirely.
               # Previously the subtree was required but +opaque_backend_state+
               # could still be missing (and obtained here as nil).
-              opaque_backend_state = signed.dig('custom', 'opaque_backend_state')
+              opaque_backend_state = signed.dig("custom", "opaque_backend_state")
               # The version appears to be optional to the rest of this class,
               # and we have tests that do not provide it.
-              version = signed['version']
+              version = signed["version"]
 
               map = new
 
@@ -28,7 +28,7 @@ module Datadog
                 @version = version
               end
 
-              signed.fetch('targets').each_with_object(map) do |(p, t), m|
+              signed.fetch("targets").each_with_object(map) do |(p, t), m|
                 path = Configuration::Path.parse(p)
                 target = Configuration::Target.parse(t)
 
@@ -53,9 +53,9 @@ module Datadog
         class Target
           class << self
             def parse(hash)
-              length = Integer(hash.fetch('length'))
-              digests = Configuration::DigestList.parse(hash.fetch('hashes'))
-              version = Integer(hash.dig('custom', 'v'))
+              length = Integer(hash.fetch("length"))
+              digests = Configuration::DigestList.parse(hash.fetch("hashes"))
+              version = Integer(hash.dig("custom", "v"))
 
               new(digests: digests, length: length, version: version)
             end

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'configuration/path'
-require_relative 'configuration/content'
-require_relative 'configuration/target'
-require_relative 'configuration/repository'
+require_relative "configuration/path"
+require_relative "configuration/content"
+require_relative "configuration/target"
+require_relative "configuration/repository"
 
 module Datadog
   module Core