datadog 2.28.0 → 2.41.0

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
@@ -57,7 +57,7 @@ module Datadog
 
             contents = Configuration::ContentList.parse(response.target_files)
           rescue Remote::Configuration::Path::ParseError => e
-            raise SyncError, e.message
+            raise SyncError, "#{e.class}: #{e.message}"
           end
 
           # To make sure steep does not complain
@@ -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
@@ -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,
           }
@@ -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
@@ -19,18 +19,21 @@ module Datadog
 
         def initialize(settings, capabilities, agent_settings, logger:)
           @logger = logger
+          @settings = settings
+          @capabilities = capabilities
+          @agent_settings = agent_settings
 
           negotiation = Negotiation.new(settings, agent_settings, logger: logger)
-          transport_v7 = Datadog::Core::Remote::Transport::HTTP.v7(agent_settings: agent_settings, logger: logger)
+          @transport = Datadog::Core::Remote::Transport::HTTP.v7(agent_settings: agent_settings, logger: logger)
 
           @barrier = Barrier.new(settings.remote.boot_timeout_seconds)
 
-          @client = Client.new(transport_v7, capabilities, settings: settings, logger: logger)
+          @client = Client.new(@transport, @capabilities, settings: settings, logger: logger)
           @healthy = false
-          logger.debug { "new remote configuration client: #{@client.id}" }
+          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
@@ -42,7 +45,7 @@ module Datadog
             rescue Client::SyncError => e
               # Transient errors due to network or agent. Logged the error but not via telemetry
               logger.error do
-                "remote worker client sync error: #{e.message} location: #{Array(e.backtrace).first}. skipping sync"
+                "remote worker client sync error: #{e.class}: #{e.message} location: #{Array(e.backtrace).first}. skipping sync"
               end
             rescue => e
               # In case of unexpected errors, reset the negotiation object
@@ -52,14 +55,14 @@ module Datadog
 
               # Transient errors due to network or agent. Logged the error but not via telemetry
               logger.error do
-                "remote worker error: #{e.class.name} #{e.message} location: #{Array(e.backtrace).first}. " \
-                'resetting client state'
+                "remote worker error: #{e.class}: #{e.message} location: #{Array(e.backtrace).first}. " \
+                "resetting client state"
               end
 
               # client state is unknown, state might be corrupted
-              @client = Client.new(transport_v7, capabilities, settings: settings, logger: logger)
+              @client = Client.new(@transport, @capabilities, settings: settings, logger: logger)
               @healthy = false
-              logger.debug { "new remote configuration client: #{@client.id}" }
+              logger.debug { "new remote configuration client: #{@client.id} products: #{@capabilities.products.sort.join(", ")}" }
 
               # TODO: bail out if too many errors?
             end
@@ -90,10 +93,27 @@ module Datadog
           @worker.stop
         end
 
+        # Recreates the remote configuration client after a fork.
+        # This ensures each forked process has a unique client ID and fresh state.
+        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(", ")}" }
+        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
         class Barrier
           def initialize(timeout = nil)
             @once = false
+            @waited = false
             @timeout = timeout
 
             @mutex = Mutex.new
@@ -101,37 +121,53 @@ module Datadog
           end
 
           # Wait for first lift to happen, otherwise don't wait
+          #
+          # Returns:
+          # - :lift if the barrier was lifted (worker completed a cycle)
+          # - :timeout if the wait timed out before the barrier was lifted
+          # - :pass if wait_once was already called previously
+          #
+          # Uses a separate @waited flag to distinguish "already waited" (:pass)
+          # from "worker lifted before we could wait" (:lift). Without this,
+          # a race between Worker#start and wait_once can cause the first call
+          # to return :pass if the worker completes before wait_once runs.
           def wait_once(timeout = nil)
-            # TTAS (Test and Test-And-Set) optimisation
-            # Since @once only ever goes from false to true, this is semantically valid
-            return :pass if @once
-
-            begin
-              @mutex.lock
+            # TTAS (Test and Test-And-Set) optimisation for subsequent calls.
+            # @waited is only set inside the mutex and only transitions false -> true,
+            # so an unsynchronized read is safe: a stale `false` just falls through
+            # to the synchronized path which re-checks.
+            return :pass if @waited
 
-              return :pass if @once
-
-              timeout ||= @timeout
+            @mutex.synchronize do
+              return :pass if @waited
 
-              # - starting with Ruby 3.2, ConditionVariable#wait returns nil on
-              #   timeout and an integer otherwise
-              # - before Ruby 3.2, ConditionVariable returns itself
-              # so we have to rely on @once having been set
-              if RUBY_VERSION >= '3.2'
-                lifted = @condition.wait(@mutex, timeout)
+              if @once
+                # Worker lifted the barrier before we could wait.
+                # This is still the first call, so return :lift not :pass.
+                lifted = true
               else
-                @condition.wait(@mutex, timeout)
-                lifted = @once
+                timeout ||= @timeout
+
+                # - starting with Ruby 3.2, ConditionVariable#wait returns nil on
+                #   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")
+                  lifted = @condition.wait(@mutex, timeout)
+                else
+                  @condition.wait(@mutex, timeout)
+                  lifted = @once
+                end
               end
 
+              @waited = true
+
               if lifted
                 :lift
               else
                 @once = true
                 :timeout
               end
-            ensure
-              @mutex.unlock
             end
           end
 

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
@@ -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/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

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

@@ -4,9 +4,9 @@ module Datadog
   module Core
     module Remote
       module Ext
-        ENV_ENABLED = 'DD_REMOTE_CONFIGURATION_ENABLED'
-        ENV_POLL_INTERVAL_SECONDS = 'DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS'
-        ENV_BOOT_TIMEOUT_SECONDS = 'DD_REMOTE_CONFIG_BOOT_TIMEOUT_SECONDS'
+        ENV_ENABLED = "DD_REMOTE_CONFIGURATION_ENABLED"
+        ENV_POLL_INTERVAL_SECONDS = "DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS"
+        ENV_BOOT_TIMEOUT_SECONDS = "DD_REMOTE_CONFIG_BOOT_TIMEOUT_SECONDS"
       end
     end
   end

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

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

data/lib/datadog/core/remote/tie/tracing.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../tie'
+require_relative "../tie"
 
 module Datadog
   module Core
@@ -17,18 +17,18 @@ module Datadog
 
             # TODO: this is not thread-consistent
             ready = Datadog::Core::Remote.active_remote.healthy
-            status = ready ? 'ready' : 'disconnected'
+            status = ready ? "ready" : "disconnected"
 
-            span.set_tag('_dd.rc.client_id', Datadog::Core::Remote.active_remote.client.id)
-            span.set_tag('_dd.rc.status', status)
+            span.set_tag("_dd.rc.client_id", Datadog::Core::Remote.active_remote.client.id)
+            span.set_tag("_dd.rc.status", status)
 
             if boot.barrier != :pass
-              span.set_tag('_dd.rc.boot.time', boot.time)
+              span.set_tag("_dd.rc.boot.time", boot.time)
 
               if boot.barrier == :timeout
-                span.set_tag('_dd.rc.boot.timeout', true)
+                span.set_tag("_dd.rc.boot.timeout", true)
               else
-                span.set_tag('_dd.rc.boot.ready', ready)
+                span.set_tag("_dd.rc.boot.ready", ready)
               end
             end
           end

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

@@ -1,24 +1,15 @@
 # frozen_string_literal: true
 
-require_relative '../../../core/transport/request'
-require_relative '../../../core/transport/parcel'
-require_relative '../../../core/transport/transport'
-require_relative 'http/config'
+require_relative "../../../core/transport/request"
+require_relative "../../../core/transport/parcel"
+require_relative "../../../core/transport/transport"
+require_relative "http/config"
 
 module Datadog
   module Core
     module Remote
       module Transport
         module Config
-          # Data transfer object for encoded traces
-          class EncodedParcel
-            include Datadog::Core::Transport::Parcel
-
-            def count
-              data.length
-            end
-          end
-
           # Config request
           class Request < Datadog::Core::Transport::Request
           end
@@ -26,8 +17,11 @@ module Datadog
           # Config transport
           class Transport < Core::Transport::Transport
             def send_config(payload)
-              json = JSON.dump(payload)
-              parcel = EncodedParcel.new(json)
+              encoder = Core::Encoding::JSONEncoder
+              parcel = Core::Transport::Parcel.new(
+                encoder.encode(payload),
+                content_type: encoder.content_type,
+              )
               request = Request.new(parcel)
 
               @client.send_request(:config, request)

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
-require_relative '../../../transport/http/api/endpoint'
-require_relative '../../../transport/http/response'
-require_relative '../../../utils/base64'
-require_relative '../../../utils/truncation'
+require_relative "../../../transport/http/api/endpoint"
+require_relative "../../../transport/http/response"
+require_relative "../../../utils/base64_codec"
+require_relative "../../../utils/truncation"
 
 module Datadog
   module Core
@@ -35,7 +35,7 @@ module Datadog
 
                 # TODO: these fallbacks should be improved
                 roots = payload[:roots] || []
-                targets = payload[:targets] || Datadog::Core::Utils::Base64.strict_encode64('{}')
+                targets = payload[:targets] || Datadog::Core::Utils::Base64Codec.strict_encode64("{}")
                 target_files = payload[:target_files] || []
                 client_configs = payload[:client_configs] || []
 
@@ -45,7 +45,7 @@ module Datadog
                   raise TypeError.new(String, root) unless root.is_a?(String)
 
                   decoded = begin
-                    Datadog::Core::Utils::Base64.strict_decode64(root) # TODO: unprocessed, don't symbolize_names
+                    Datadog::Core::Utils::Base64Codec.strict_decode64(root) # TODO: unprocessed, don't symbolize_names
                   rescue ArgumentError
                     raise DecodeError.new(:roots, root)
                   end
@@ -65,7 +65,7 @@ module Datadog
 
                 @targets = begin
                   decoded = begin
-                    Datadog::Core::Utils::Base64.strict_decode64(targets)
+                    Datadog::Core::Utils::Base64Codec.strict_decode64(targets)
                   rescue ArgumentError
                     raise DecodeError.new(:targets, targets)
                   end
@@ -93,7 +93,7 @@ module Datadog
                   raise TypeError.new(String, raw) unless raw.is_a?(String)
 
                   content = begin
-                    Datadog::Core::Utils::Base64.strict_decode64(raw)
+                    Datadog::Core::Utils::Base64Codec.strict_decode64(raw)
                   rescue ArgumentError
                     raise DecodeError.new(:target_files, raw)
                   end
@@ -180,7 +180,7 @@ module Datadog
             module API
               # Endpoint for remote configuration
               class Endpoint < Datadog::Core::Transport::HTTP::API::Endpoint
-                HEADER_CONTENT_TYPE = 'Content-Type'
+                HEADER_CONTENT_TYPE = "Content-Type"
 
                 attr_reader :encoder
 

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
-require_relative '../../../transport/http/client'
-require_relative '../../../transport/http/response'
-require_relative '../../../transport/http/api/endpoint'
+require_relative "../../../transport/http/client"
+require_relative "../../../transport/http/response"
+require_relative "../../../transport/http/api/endpoint"
 
 module Datadog
   module Core

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../environment/container'
-require_relative '../../environment/ext'
-require_relative '../../transport/ext'
-require_relative '../../transport/http'
-require_relative 'config'
-require_relative 'negotiation'
+require_relative "../../environment/container"
+require_relative "../../environment/ext"
+require_relative "../../transport/ext"
+require_relative "../../transport/http"
+require_relative "config"
+require_relative "negotiation"
 
 # TODO: Decouple transport/http
 #
@@ -20,11 +20,11 @@ module Datadog
         # Namespace for HTTP transport components
         module HTTP
           ROOT = Negotiation::API::Endpoint.new(
-            '/info',
+            "/info",
           )
 
           V7 = Config::API::Endpoint.new(
-            '/v0.7/config',
+            "/v0.7/config",
             Core::Encoding::JSONEncoder,
           )
 
@@ -42,7 +42,7 @@ module Datadog
               logger: logger,
               headers: headers
             ) do |transport|
-              transport.api 'root', ROOT
+              transport.api "root", ROOT
 
               # Call block to apply any customization, if provided
               yield(transport) if block_given?
@@ -61,7 +61,7 @@ module Datadog
               logger: logger,
               headers: headers
             ) do |transport|
-              transport.api 'v7', V7
+              transport.api "v7", V7
 
               # Call block to apply any customization, if provided
               yield(transport) if block_given?