datadog 2.28.0 → 2.41.0

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../../core/transport/request'
-require_relative '../../../core/transport/transport'
-require_relative 'http/negotiation'
+require_relative "../../../core/transport/request"
+require_relative "../../../core/transport/transport"
+require_relative "http/negotiation"
 
 # TODO: Resolve conceptual conundrum
 #

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

@@ -15,7 +15,7 @@ module Datadog
 
           @interval = interval
           @logger = logger
-          raise ArgumentError, 'can not initialize a worker without a block' unless block
+          raise ArgumentError, "can not initialize a worker without a block" unless block
 
           @block = block
         end
@@ -27,7 +27,7 @@ module Datadog
 
           @mutex.synchronize do
             if @stopped
-              logger.debug('remote worker: refusing to restart after previous stop')
+              logger.debug("remote worker: refusing to restart after previous stop")
               return
             end
 
@@ -44,7 +44,7 @@ module Datadog
             @starting = false
           end
 
-          logger.debug { 'remote worker started' }
+          logger.debug { "remote worker started" }
         end
 
         def stop
@@ -63,7 +63,7 @@ module Datadog
             @stopped = true
           end
 
-          logger.debug { 'remote worker stopped' }
+          logger.debug { "remote worker stopped" }
         end
 
         def started?
@@ -83,7 +83,7 @@ module Datadog
         end
 
         def call
-          logger.debug { 'remote worker perform' }
+          logger.debug { "remote worker perform" }
 
           @block.call
         end

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

@@ -5,34 +5,34 @@ module Datadog
     module Runtime
       # @public_api
       module Ext
-        TAG_ID = 'runtime-id'
-        TAG_LANG = 'language'
-        TAG_PROCESS_ID = 'process_id'
+        TAG_ID = "runtime-id"
+        TAG_LANG = "language"
+        TAG_PROCESS_ID = "process_id"
 
         # Metrics
         # @public_api
         module Metrics
-          ENV_ENABLED = 'DD_RUNTIME_METRICS_ENABLED'
+          ENV_ENABLED = "DD_RUNTIME_METRICS_ENABLED"
 
-          METRIC_CLASS_COUNT = 'runtime.ruby.class_count'
-          METRIC_GC_PREFIX = 'runtime.ruby.gc'
-          METRIC_THREAD_COUNT = 'runtime.ruby.thread_count'
-          METRIC_GLOBAL_CONSTANT_STATE = 'runtime.ruby.global_constant_state'
-          METRIC_GLOBAL_METHOD_STATE = 'runtime.ruby.global_method_state'
-          METRIC_CONSTANT_CACHE_INVALIDATIONS = 'runtime.ruby.constant_cache_invalidations'
-          METRIC_CONSTANT_CACHE_MISSES = 'runtime.ruby.constant_cache_misses'
-          METRIC_YJIT_CODE_GC_COUNT = 'runtime.ruby.yjit.code_gc_count'
-          METRIC_YJIT_CODE_REGION_SIZE = 'runtime.ruby.yjit.code_region_size'
-          METRIC_YJIT_FREED_CODE_SIZE = 'runtime.ruby.yjit.freed_code_size'
-          METRIC_YJIT_FREED_PAGE_COUNT = 'runtime.ruby.yjit.freed_page_count'
-          METRIC_YJIT_INLINE_CODE_SIZE = 'runtime.ruby.yjit.inline_code_size'
-          METRIC_YJIT_LIVE_PAGE_COUNT = 'runtime.ruby.yjit.live_page_count'
-          METRIC_YJIT_OBJECT_SHAPE_COUNT = 'runtime.ruby.yjit.object_shape_count'
-          METRIC_YJIT_OUTLINED_CODE_SIZE = 'runtime.ruby.yjit.outlined_code_size'
-          METRIC_YJIT_YJIT_ALLOC_SIZE = 'runtime.ruby.yjit.yjit_alloc_size'
-          METRIC_YJIT_RATIO_IN_YJIT = 'runtime.ruby.yjit.ratio_in_yjit'
+          METRIC_CLASS_COUNT = "runtime.ruby.class_count"
+          METRIC_GC_PREFIX = "runtime.ruby.gc"
+          METRIC_THREAD_COUNT = "runtime.ruby.thread_count"
+          METRIC_GLOBAL_CONSTANT_STATE = "runtime.ruby.global_constant_state"
+          METRIC_GLOBAL_METHOD_STATE = "runtime.ruby.global_method_state"
+          METRIC_CONSTANT_CACHE_INVALIDATIONS = "runtime.ruby.constant_cache_invalidations"
+          METRIC_CONSTANT_CACHE_MISSES = "runtime.ruby.constant_cache_misses"
+          METRIC_YJIT_CODE_GC_COUNT = "runtime.ruby.yjit.code_gc_count"
+          METRIC_YJIT_CODE_REGION_SIZE = "runtime.ruby.yjit.code_region_size"
+          METRIC_YJIT_FREED_CODE_SIZE = "runtime.ruby.yjit.freed_code_size"
+          METRIC_YJIT_FREED_PAGE_COUNT = "runtime.ruby.yjit.freed_page_count"
+          METRIC_YJIT_INLINE_CODE_SIZE = "runtime.ruby.yjit.inline_code_size"
+          METRIC_YJIT_LIVE_PAGE_COUNT = "runtime.ruby.yjit.live_page_count"
+          METRIC_YJIT_OBJECT_SHAPE_COUNT = "runtime.ruby.yjit.object_shape_count"
+          METRIC_YJIT_OUTLINED_CODE_SIZE = "runtime.ruby.yjit.outlined_code_size"
+          METRIC_YJIT_YJIT_ALLOC_SIZE = "runtime.ruby.yjit.yjit_alloc_size"
+          METRIC_YJIT_RATIO_IN_YJIT = "runtime.ruby.yjit.ratio_in_yjit"
 
-          TAG_SERVICE = 'service'
+          TAG_SERVICE = "service"
         end
       end
     end

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require_relative 'ext'
+require_relative "ext"
 
-require_relative '../metrics/client'
-require_relative '../environment/class_count'
-require_relative '../environment/gc'
-require_relative '../environment/thread_count'
-require_relative '../environment/vm_cache'
-require_relative '../environment/yjit'
-require_relative '../environment/process'
+require_relative "../metrics/client"
+require_relative "../environment/class_count"
+require_relative "../environment/gc"
+require_relative "../environment/thread_count"
+require_relative "../environment/vm_cache"
+require_relative "../environment/yjit"
+require_relative "../environment/process"
 
 module Datadog
   module Core
@@ -26,8 +26,7 @@ module Datadog
           # Initialize the collection of runtime-id
           @runtime_id_enabled = options.fetch(:experimental_runtime_id_enabled, false)
 
-          # Initialized process tags support
-          @process_tags_enabled = options.fetch(:experimental_propagate_process_tags_enabled, false)
+          @process_tags_enabled = options.fetch(:experimental_propagate_process_tags_enabled)
         end
 
         # Associate service with runtime metrics
@@ -101,7 +100,7 @@ module Datadog
         def try_flush
           yield
         rescue => e
-          Datadog.logger.warn("Error while sending runtime metric. Cause: #{e.class.name} #{e.message}")
+          Datadog.logger.warn("Error while sending runtime metric. Cause: #{e.class}: #{e.message}")
         end
 
         def default_metric_options
@@ -150,7 +149,7 @@ module Datadog
         end
 
         def to_metric_name(str)
-          str.downcase.gsub(/[-\s]/, '_')
+          str.downcase.gsub(/[-\s]/, "_")
         end
 
         def gauge_if_not_nil(metric_name, metric_value)

data/lib/datadog/core/tag_builder.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'environment/socket'
-require_relative 'environment/identity'
-require_relative 'environment/git'
+require_relative "environment/socket"
+require_relative "environment/identity"
+require_relative "environment/git"
 
 module Datadog
   module Core
@@ -12,14 +12,14 @@ module Datadog
     module TagBuilder
       def self.fixed_environment_tags
         @fixed_environment_tags ||= {
-          'language' => Environment::Identity.lang,
-          'runtime' => Environment::Identity.lang, # Known to be duplicated from language above
-          'runtime_engine' => Environment::Identity.lang_engine,
-          'runtime_platform' => Environment::Identity.lang_platform,
-          'runtime_version' => Environment::Identity.lang_version,
-          'library_version' => Environment::Identity.gem_datadog_version,
-          'git.repository_url' => Environment::Git.git_repository_url,
-          'git.commit.sha' => Environment::Git.git_commit_sha,
+          "language" => Environment::Identity.lang,
+          "runtime" => Environment::Identity.lang, # Known to be duplicated from language above
+          "runtime_engine" => Environment::Identity.lang_engine,
+          "runtime_platform" => Environment::Identity.lang_platform,
+          "runtime_version" => Environment::Identity.lang_version,
+          "library_version" => Environment::Identity.gem_datadog_version,
+          "git.repository_url" => Environment::Git.git_repository_url,
+          "git.commit.sha" => Environment::Git.git_commit_sha,
         }.compact.freeze
       end
 
@@ -29,15 +29,15 @@ module Datadog
         # empty strings).
         settings.tags.merge(fixed_environment_tags).merge({
           # Hostname can possibly change during application runtime.
-          'host' => Environment::Socket.hostname,
+          "host" => Environment::Socket.hostname,
           # Runtime ID changes upon a fork.
-          'runtime-id' => Environment::Identity.id,
+          "runtime-id" => Environment::Identity.id,
           # Process ID changes upon a fork.
-          'process_id' => Process.pid.to_s,
+          "process_id" => Process.pid.to_s,
           # Unified service tagging.
-          'env' => settings.env,
-          'service' => settings.service,
-          'version' => settings.version,
+          "env" => settings.env,
+          "service" => settings.service,
+          "version" => settings.version,
         }.compact)
       end
 
@@ -45,7 +45,7 @@ module Datadog
         # DEV: Should there be some sort of escaping done here?
         tags.map do |key, value|
           "#{key}:#{value}"
-        end.join(',')
+        end.join(",")
       end
     end
   end

data/lib/datadog/core/tag_normalizer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'utils'
+require_relative "utils"
 
 module Datadog
   module Core
@@ -35,7 +35,7 @@ module Datadog
       def self.normalize(original_value, remove_digit_start_char: false)
         # DEV-3.0: Ideally this encode call should be replaced with Datadog::Core::Utils.utf8_encode once it
         #          is safe to modify the default behavior.
-        value = original_value.to_s.encode('UTF-8', invalid: :replace, undef: :replace)
+        value = original_value.to_s.encode("UTF-8", invalid: :replace, undef: :replace)
         value.strip!
         return "" if value.empty?
 
@@ -48,14 +48,14 @@ module Datadog
         end
 
         value.downcase!
-        value.gsub!(INVALID_TAG_CHARACTERS, '_')
+        value.gsub!(INVALID_TAG_CHARACTERS, "_")
 
         # The Trace Agent allows tag values to start with a number so this logic is here too
         leading_invalid_regex = remove_digit_start_char ? LEADING_INVALID_CHARS_NO_DIGITS : LEADING_INVALID_CHARS_WITH_DIGITS
         value.sub!(leading_invalid_regex, "")
 
-        value.squeeze!('_') if value.include?('__')
-        value.delete_suffix!('_')
+        value.squeeze!("_") if value.include?("__")
+        value.delete_suffix!("_")
 
         value
       end
@@ -69,8 +69,8 @@ module Datadog
         value = normalize(value)
         return value if value.empty?
 
-        value.tr!(':', '_')
-        value.squeeze!('_') if value.include?('__')
+        value.tr!(":", "_")
+        value.squeeze!("_") if value.include?("__")
 
         if value.bytesize > MAX_PROCESS_VALUE_BYTE_SIZE
           value = value.byteslice(0, MAX_PROCESS_VALUE_BYTE_SIZE) || value

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

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-require_relative 'emitter'
-require_relative 'event'
-require_relative 'metrics_manager'
-require_relative 'worker'
-require_relative 'logging'
-require_relative 'transport/http'
+require_relative "emitter"
+require_relative "event"
+require_relative "metrics_manager"
+require_relative "worker"
+require_relative "logging"
+require_relative "transport/http"
 
-require_relative '../configuration/ext'
-require_relative '../configuration/agentless_settings_resolver'
-require_relative '../utils/forking'
+require_relative "../configuration/ext"
+require_relative "../configuration/agentless_settings_resolver"
+require_relative "../utils/forking"
 
 module Datadog
   module Core
@@ -21,8 +21,6 @@ module Datadog
       class Component
         ENDPOINT_COLLECTION_MESSAGE_LIMIT = 300
 
-        ONLY_ONCE = Utils::OnlyOnce.new
-
         attr_reader :enabled
         attr_reader :logger
         attr_reader :transport
@@ -44,7 +42,7 @@ module Datadog
 
           if agentless_enabled && settings.api_key.nil?
             enabled = false
-            logger.debug { 'Telemetry disabled. Agentless telemetry requires a DD_API_KEY variable to be set.' }
+            logger.debug { "Telemetry disabled. Agentless telemetry requires a DD_API_KEY variable to be set." }
           end
 
           Telemetry::Component.new(
@@ -62,17 +60,6 @@ module Datadog
           logger:,
           enabled:
         )
-          ONLY_ONCE.run do
-            Utils::AtForkMonkeyPatch.apply!
-
-            # All of the other at fork monkey patch callbacks reference
-            # globals, follow that pattern here to avoid having the component
-            # referenced via the at fork callbacks.
-            Datadog::Core::Utils::AtForkMonkeyPatch.at_fork(:child) do
-              Datadog.send(:components, allow_initialization: false)&.telemetry&.after_fork
-            end
-          end
-
           @enabled = enabled
           @log_collection_enabled = settings.telemetry.log_collection_enabled
           @logger = logger
@@ -91,9 +78,9 @@ module Datadog
             # settings, even though the telemetry itself may be using a different path.
             telemetry_specific_agent_settings = Core::Configuration::AgentlessSettingsResolver.call(
               settings,
-              host_prefix: 'instrumentation-telemetry-intake',
+              host_prefix: "instrumentation-telemetry-intake",
               url_override: settings.telemetry.agentless_url_override,
-              url_override_source: 'c.telemetry.agentless_url_override',
+              url_override_source: "c.telemetry.agentless_url_override",
               logger: logger,
             )
             Telemetry::Transport::HTTP.agentless_telemetry(
@@ -112,6 +99,7 @@ module Datadog
           @worker = Telemetry::Worker.new(
             enabled: @enabled,
             heartbeat_interval_seconds: settings.telemetry.heartbeat_interval_seconds,
+            extended_heartbeat_interval_seconds: settings.telemetry.extended_heartbeat_interval_seconds,
             metrics_aggregation_interval_seconds: settings.telemetry.metrics_aggregation_interval_seconds,
             emitter: Emitter.new(
               @transport,
@@ -121,6 +109,8 @@ module Datadog
             metrics_manager: @metrics_manager,
             dependency_collection: settings.telemetry.dependency_collection,
             logger: logger,
+            settings: settings,
+            agent_settings: agent_settings,
             shutdown_timeout: settings.telemetry.shutdown_timeout_seconds,
           )
 
@@ -191,7 +181,7 @@ module Datadog
         def client_configuration_change!(changes)
           return unless enabled?
 
-          @worker.enqueue(Event::AppClientConfigurationChange.new(changes, 'remote_config'))
+          @worker.enqueue(Event::AppClientConfigurationChange.new(changes, "remote_config"))
         end
 
         # Report application endpoints

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/emitter.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'request'
-require_relative '../transport/response'
-require_relative '../utils/sequence'
-require_relative '../utils/forking'
+require_relative "request"
+require_relative "../transport/response"
+require_relative "../utils/sequence"
+require_relative "../utils/forking"
 
 module Datadog
   module Core
@@ -39,7 +39,7 @@ module Datadog
           res
         rescue => e
           logger.debug {
-            "Unable to send telemetry request for event `#{event.respond_to?(:type) ? event.type : event.to_s}`: #{e.class}: #{e}"
+            "Unable to send telemetry request for event `#{event.respond_to?(:type) ? event.type : event.to_s}`: #{e.class}: #{e.message}"
           }
           Core::Transport::InternalErrorResponse.new(e)
         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 "base"
+require_relative "../configuration_value"
 
 module Datadog
   module Core
@@ -11,7 +12,7 @@ module Datadog
           attr_reader :changes, :origin
 
           def type
-            'app-client-configuration-change'
+            "app-client-configuration-change"
           end
 
           def initialize(changes, origin)
@@ -26,24 +27,24 @@ module Datadog
 
           def configuration
             config = Datadog.configuration
-            seq_id = Event.configuration_sequence.next
 
+            # @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: seq_id,
+                seq_id: Configuration::Option::Precedence::REMOTE_CONFIGURATION.numeric.next,
               }
             end
 
             # DEV: This seems unnecessary (we send the state of sca_enabled for each remote config change)
-            unless config.dig('appsec', 'sca_enabled').nil?
+            unless config.dig("appsec", "sca_enabled").nil?
               res << {
-                name: 'appsec.sca_enabled',
+                name: "appsec.sca_enabled",
                 value: config.appsec.sca_enabled,
-                origin: 'code',
-                seq_id: seq_id,
+                origin: "code",
+                seq_id: Configuration::Option::Precedence::PROGRAMMATIC.numeric.next,
               }
             end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'base'
+require_relative "base"
 
 module Datadog
   module Core
@@ -9,7 +9,7 @@ module Datadog
         # Telemetry class for the 'app-closing' event
         class AppClosing < Base
           def type
-            'app-closing'
+            "app-closing"
           end
         end
       end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'base'
+require_relative "base"
 
 module Datadog
   module Core
@@ -9,7 +9,7 @@ module Datadog
         # Telemetry class for the 'app-dependencies-loaded' event
         class AppDependenciesLoaded < Base
           def type
-            'app-dependencies-loaded'
+            "app-dependencies-loaded"
           end
 
           def payload

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'base'
+require_relative "base"
 
 module Datadog
   module Core
@@ -14,13 +14,13 @@ module Datadog
           end
 
           def type
-            'app-endpoints'
+            "app-endpoints"
           end
 
           def payload
             {
               is_first: @is_first,
-              endpoints: @endpoints
+              endpoints: @endpoints,
             }
           end
         end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative "app_started"
+
+module Datadog
+  module Core
+    module Telemetry
+      module Event
+        # Telemetry class for the 'app-extended-heartbeat' event
+        class AppExtendedHeartbeat < AppStarted
+          def initialize(settings:, agent_settings:)
+            @configuration = configuration(settings, agent_settings)
+          end
+
+          def type
+            "app-extended-heartbeat"
+          end
+
+          def payload
+            {
+              configuration: @configuration,
+            }
+          end
+
+          def app_started?
+            false
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'base'
+require_relative "base"
 
 module Datadog
   module Core
@@ -9,7 +9,7 @@ module Datadog
         # Telemetry class for the 'app-heartbeat' event
         class AppHeartbeat < Base
           def type
-            'app-heartbeat'
+            "app-heartbeat"
           end
         end
       end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'base'
+require_relative "base"
 
 module Datadog
   module Core
@@ -9,7 +9,7 @@ module Datadog
         # Telemetry class for the 'app-integrations-change' event
         class AppIntegrationsChange < Base
           def type
-            'app-integrations-change'
+            "app-integrations-change"
           end
 
           def payload