datadog 2.28.0 → 2.41.0

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'event'
+require_relative "event"
 
-require 'pathname'
+require "pathname"
 
 module Datadog
   module Core
@@ -37,9 +37,9 @@ module Datadog
             backtrace.map do |line|
               if !vendored_deps && line.start_with?(GEM_ROOT) ||
                   vendored_deps && line.start_with?(GEM_ROOT) && Gem.path.none? { |p| line.start_with?(p) }
-                line[GEM_ROOT.length..-1] || ''
+                line[GEM_ROOT.length..-1] || ""
               else
-                'REDACTED'
+                "REDACTED"
               end
             end.join("\n")
           end
@@ -55,7 +55,7 @@ module Datadog
           telemetry_message = message_for_telemetry(exception)
 
           if description || telemetry_message
-            message << ':'
+            message << ":"
             message << " #{description}" if description
             message << " (#{telemetry_message})" if telemetry_message
           end

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

@@ -24,11 +24,11 @@ module Datadog
           end
 
           def track(value)
-            raise NotImplementedError, 'method must be implemented in subclasses'
+            raise NotImplementedError, "method must be implemented in subclasses"
           end
 
           def type
-            raise NotImplementedError, 'method must be implemented in subclasses'
+            raise NotImplementedError, "method must be implemented in subclasses"
           end
 
           def to_h
@@ -37,7 +37,7 @@ module Datadog
               points: values,
               type: type,
               tags: tags,
-              common: common
+              common: common,
             }
           end
 
@@ -71,7 +71,7 @@ module Datadog
           # @param common [Boolean] true if the metric is common for all languages, false for Ruby-specific metric
           # @param interval [Integer] metrics aggregation interval in seconds
           def initialize(name, interval:, tags: {}, common: true)
-            raise ArgumentError, 'interval must be a positive number' if interval.nil? || interval <= 0
+            raise ArgumentError, "interval must be a positive number" if interval.nil? || interval <= 0
 
             super(name, tags: tags, common: common)
 
@@ -98,7 +98,7 @@ module Datadog
         # Count metric adds up all the submitted values in a time interval. This would be suitable for a
         # metric tracking the number of website hits, for instance.
         class Count < Base
-          TYPE = 'count'
+          TYPE = "count"
 
           def type
             TYPE
@@ -121,7 +121,7 @@ module Datadog
         # CPU usage, where taking the last value provides a representative picture of the host’s behavior during the time
         # interval.
         class Gauge < IntervalMetric
-          TYPE = 'gauge'
+          TYPE = "gauge"
 
           def type
             TYPE
@@ -141,7 +141,7 @@ module Datadog
         # The rate type takes the count and divides it by the length of the time interval. This is useful if you’re
         # interested in the number of hits per second.
         class Rate < IntervalMetric
-          TYPE = 'rate'
+          TYPE = "rate"
 
           def initialize(name, interval:, tags: {}, common: true)
             super
@@ -162,7 +162,7 @@ module Datadog
 
         # Distribution metric represents the global statistical distribution of a set of values.
         class Distribution < Base
-          TYPE = 'distributions'
+          TYPE = "distributions"
 
           def type
             TYPE
@@ -179,7 +179,7 @@ module Datadog
               metric: name,
               points: values,
               tags: tags,
-              common: common
+              common: common,
             }
           end
         end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'event'
-require_relative 'metric'
+require_relative "event"
+require_relative "metric"
 
 module Datadog
   module Core

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

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

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../environment/platform'
-require_relative '../environment/process'
-require_relative '../utils/hash'
+require_relative "../environment/platform"
+require_relative "../environment/process"
+require_relative "../utils/hash"
 
 module Datadog
   module Core
@@ -10,11 +10,9 @@ module Datadog
       # Module defining methods for collecting metadata for telemetry
       module Request
         class << self
-          using Core::Utils::Hash::Refinement
-
           def build_payload(event, seq_id, debug: false)
             hash = {
-              api_version: 'v2',
+              api_version: "v2",
               application: application,
               debug: debug,
               host: host,
@@ -52,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)
@@ -66,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/telemetry/transport/http/telemetry.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../../transport/http/api/endpoint'
-require_relative '../../../transport/http/api/instance'
-require_relative '../../../transport/http/client'
-require_relative '../../../transport/request'
+require_relative "../../../transport/http/api/endpoint"
+require_relative "../../../transport/http/api/instance"
+require_relative "../../../transport/http/client"
+require_relative "../../../transport/request"
 
 module Datadog
   module Core
@@ -13,7 +13,7 @@ module Datadog
           module Telemetry
             module API
               class Endpoint < Datadog::Core::Transport::HTTP::API::Endpoint
-                HEADER_CONTENT_TYPE = 'Content-Type'
+                HEADER_CONTENT_TYPE = "Content-Type"
 
                 attr_reader \
                   :encoder
@@ -37,18 +37,23 @@ module Datadog
 
                 def headers(request_type:, api_key:)
                   {
-                    Core::Transport::Ext::HTTP::HEADER_DD_INTERNAL_UNTRACED_REQUEST => '1',
+                    Core::Transport::Ext::HTTP::HEADER_DD_INTERNAL_UNTRACED_REQUEST => "1",
                     # Provided by encoder
                     # 'Content-Type' => 'application/json',
-                    'DD-Telemetry-API-Version' => 'v2',
-                    'DD-Telemetry-Request-Type' => request_type,
-                    'DD-Client-Library-Language' => Core::Environment::Ext::LANG,
-                    'DD-Client-Library-Version' => Core::Environment::Identity.gem_datadog_version_semver2,
+                    "DD-Telemetry-API-Version" => "v2",
+                    "DD-Telemetry-Request-Type" => request_type,
+                    "DD-Client-Library-Language" => Core::Environment::Ext::LANG,
+                    "DD-Client-Library-Version" => Core::Environment::Identity.gem_datadog_version_semver2,
+                    "DD-Session-ID" => Core::Environment::Identity.id,
 
                     # Enable debug mode for telemetry
                     # 'DD-Telemetry-Debug-Enabled' => 'true',
                   }.tap do |result|
-                    result['DD-API-KEY'] = api_key unless api_key.nil?
+                    result["DD-API-KEY"] = api_key unless api_key.nil?
+                    root = Core::Environment::Identity.root_runtime_id
+                    result["DD-Root-Session-ID"] = root if root
+                    parent = Core::Environment::Identity.parent_runtime_id
+                    result["DD-Parent-Session-ID"] = parent if parent
                   end
                 end
               end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../encoding'
-require_relative '../../transport/http'
-require_relative 'telemetry'
+require_relative "../../encoding"
+require_relative "../../transport/http"
+require_relative "telemetry"
 
 module Datadog
   module Core
@@ -11,12 +11,12 @@ module Datadog
         # Namespace for HTTP transport components
         module HTTP
           AGENT_TELEMETRY = Telemetry::API::Endpoint.new(
-            '/telemetry/proxy/api/v2/apmtelemetry',
+            "/telemetry/proxy/api/v2/apmtelemetry",
             Core::Encoding::JSONEncoder,
           )
 
           AGENTLESS_TELEMETRY = Telemetry::API::Endpoint.new(
-            '/api/v2/apmtelemetry',
+            "/api/v2/apmtelemetry",
             Core::Encoding::JSONEncoder,
           )
 
@@ -35,7 +35,7 @@ module Datadog
               agent_settings: agent_settings,
               headers: headers
             ) do |transport|
-              transport.api 'agentless_telemetry', AGENTLESS_TELEMETRY
+              transport.api "agentless_telemetry", AGENTLESS_TELEMETRY
               # Call block to apply any customization, if provided
               yield(transport) if block_given?
             end.to_transport(Core::Telemetry::Transport::Telemetry::Transport).tap do |transport|
@@ -55,7 +55,7 @@ module Datadog
               agent_settings: agent_settings,
               headers: headers
             ) do |transport|
-              transport.api 'agent_telemetry', AGENT_TELEMETRY
+              transport.api "agent_telemetry", AGENT_TELEMETRY
 
               # Call block to apply any customization, if provided
               yield(transport) if block_given?

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

@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
-require_relative '../../transport/parcel'
-require_relative '../../transport/transport'
-require_relative 'http/telemetry'
+require_relative "../../transport/parcel"
+require_relative "../../transport/transport"
+require_relative "http/telemetry"
 
 module Datadog
   module Core
     module Telemetry
       module Transport
         module Telemetry
-          class EncodedParcel
-            include Datadog::Core::Transport::Parcel
-          end
-
           class Request < Datadog::Core::Transport::Request
             attr_reader :request_type
             attr_reader :api_key
@@ -28,8 +24,11 @@ module Datadog
             attr_accessor :api_key
 
             def send_telemetry(request_type:, 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(request_type, parcel, api_key)
 
               @client.send_request(:telemetry, request)

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'event'
+require_relative "event"
 
-require_relative '../utils/only_once_successful'
-require_relative '../workers/polling'
-require_relative '../workers/queue'
+require_relative "../utils/only_once_successful"
+require_relative "../workers/polling"
+require_relative "../workers/queue"
 
 module Datadog
   module Core
@@ -27,6 +27,9 @@ module Datadog
           metrics_manager:,
           dependency_collection:,
           logger:,
+          settings:,
+          agent_settings:,
+          extended_heartbeat_interval_seconds:,
           enabled: true,
           shutdown_timeout: Workers::Polling::DEFAULT_SHUTDOWN_TIMEOUT,
           buffer_size: DEFAULT_BUFFER_MAX_SIZE
@@ -35,8 +38,11 @@ module Datadog
           @metrics_manager = metrics_manager
           @dependency_collection = dependency_collection
           @logger = logger
+          @settings = settings
+          @agent_settings = agent_settings
 
           @ticks_per_heartbeat = (heartbeat_interval_seconds / metrics_aggregation_interval_seconds).to_i
+          @ticks_per_extended_heartbeat = (extended_heartbeat_interval_seconds / metrics_aggregation_interval_seconds).to_i
           @current_ticks = 0
 
           # Workers::Polling settings
@@ -63,6 +69,7 @@ module Datadog
           self.buffer = buffer_klass.new(@buffer_size)
 
           @initial_event_once = Utils::OnlyOnceSuccessful.new(APP_STARTED_EVENT_RETRIES)
+          @extended_heartbeat_ticks = 0
         end
 
         attr_reader :logger
@@ -151,6 +158,13 @@ module Datadog
           end
 
           @current_ticks += 1
+          @extended_heartbeat_ticks += 1
+
+          if @extended_heartbeat_ticks >= @ticks_per_extended_heartbeat
+            @extended_heartbeat_ticks = 0
+            extended_heartbeat!
+          end
+
           return if @current_ticks < @ticks_per_heartbeat
 
           @current_ticks = 0
@@ -170,6 +184,12 @@ module Datadog
           send_event(Event::AppHeartbeat.new)
         end
 
+        def extended_heartbeat!
+          return if !enabled? || !sent_initial_event?
+
+          send_event(Event::AppExtendedHeartbeat.new(settings: @settings, agent_settings: @agent_settings))
+        end
+
         def started!
           return unless enabled?
 
@@ -219,7 +239,7 @@ module Datadog
         end
 
         def buffer_klass
-          if Core::Environment::Ext::RUBY_ENGINE == 'ruby'
+          if Core::Environment::Ext::RUBY_ENGINE == "ruby"
             Core::Buffer::CRuby
           else
             Core::Buffer::ThreadSafe
@@ -234,7 +254,7 @@ module Datadog
         def disable_on_not_found!(response)
           return unless response.not_found?
 
-          logger.debug('Agent does not support telemetry; disabling future telemetry events.')
+          logger.debug("Agent does not support telemetry; disabling future telemetry events.")
           disable!
         end
 

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

@@ -1,34 +1,35 @@
 # frozen_string_literal: true
 
-require_relative '../configuration/ext'
+require_relative "../configuration/ext"
 module Datadog
   module Core
     module Transport
       # @public_api
       module Ext
         module HTTP
-          HEADER_CONTAINER_ID = 'Datadog-Container-ID'
-          HEADER_ENTITY_ID = 'Datadog-Entity-ID'
-          HEADER_EXTERNAL_ENV = 'Datadog-External-Env'
-          HEADER_DD_API_KEY = 'DD-API-KEY'
+          HEADER_CONTAINER_ID = "Datadog-Container-ID"
+          HEADER_CONTAINER_TAGS_HASH = "Datadog-Container-Tags-Hash"
+          HEADER_ENTITY_ID = "Datadog-Entity-ID"
+          HEADER_EXTERNAL_ENV = "Datadog-External-Env"
+          HEADER_DD_API_KEY = "DD-API-KEY"
           # Tells agent that `_dd.top_level` metrics have been set by the tracer.
           # The agent will not calculate top-level spans but instead trust the tracer tagging.
           #
           # This prevents partially flushed traces being mistakenly marked as top-level.
           #
           # Setting this header to any non-empty value enables this feature.
-          HEADER_CLIENT_COMPUTED_TOP_LEVEL = 'Datadog-Client-Computed-Top-Level'
-          HEADER_CLIENT_COMPUTED_STATS = 'Datadog-Client-Computed-Stats'
-          HEADER_META_LANG = 'Datadog-Meta-Lang'
-          HEADER_META_LANG_VERSION = 'Datadog-Meta-Lang-Version'
-          HEADER_META_LANG_INTERPRETER = 'Datadog-Meta-Lang-Interpreter'
+          HEADER_CLIENT_COMPUTED_TOP_LEVEL = "Datadog-Client-Computed-Top-Level"
+          HEADER_CLIENT_COMPUTED_STATS = "Datadog-Client-Computed-Stats"
+          HEADER_META_LANG = "Datadog-Meta-Lang"
+          HEADER_META_LANG_VERSION = "Datadog-Meta-Lang-Version"
+          HEADER_META_LANG_INTERPRETER = "Datadog-Meta-Lang-Interpreter"
           # Use for distinguishing between CRuby, JRuby, and TruffleRuby.
-          HEADER_META_LANG_INTERPRETER_VENDOR = 'Datadog-Meta-Lang-Interpreter-Vendor'
-          HEADER_META_TRACER_VERSION = 'Datadog-Meta-Tracer-Version'
+          HEADER_META_LANG_INTERPRETER_VENDOR = "Datadog-Meta-Lang-Interpreter-Vendor"
+          HEADER_META_TRACER_VERSION = "Datadog-Meta-Tracer-Version"
 
           # Header that prevents the Net::HTTP integration from tracing internal trace requests.
           # Set it to any value to skip tracing.
-          HEADER_DD_INTERNAL_UNTRACED_REQUEST = 'DD-Internal-Untraced-Request'
+          HEADER_DD_INTERNAL_UNTRACED_REQUEST = "DD-Internal-Untraced-Request"
         end
 
         module Test

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../../../core/transport/response'
-require_relative '../../../../core/vendor/multipart-post/net/http/post/multipart'
+require_relative "../../../../core/transport/response"
+require_relative "../../../../core/vendor/multipart-post/net/http/post/multipart"
 
 module Datadog
   module Core
@@ -90,9 +90,9 @@ module Datadog
               path = env.path
               case query = env.query
               when Hash
-                path = path + '?' + URI.encode_www_form(query)
+                path = path + "?" + URI.encode_www_form(query)
               when String
-                path = path + '?' + query
+                path = path + "?" + query
               when nil
                 # Nothing
               else

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

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

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'net/http'
-require_relative '../../../transport/ext'
-require_relative 'net'
+require "net/http"
+require_relative "../../../transport/ext"
+require_relative "net"
 
 module Datadog
   module Core
@@ -58,7 +58,7 @@ module Datadog
               alias_method :uds_path, :filepath
 
               def initialize(uds_path, options = {})
-                super('localhost', 80)
+                super("localhost", 80)
                 @filepath = uds_path
                 @read_timeout = options.fetch(:read_timeout, DEFAULT_TIMEOUT)
                 @continue_timeout = options.fetch(:continue_timeout, DEFAULT_TIMEOUT)

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

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

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

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

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/agent_settings'
-require_relative 'adapters/registry'
-require_relative 'api/map'
+require_relative "../../configuration/agent_settings"
+require_relative "adapters/registry"
+require_relative "api/map"
 
 module Datadog
   module Core
@@ -108,7 +108,7 @@ module Datadog
 
                 # Resolve fallback and merge headers
                 fallback = api_options.delete(:fallback)
-                api_options[:headers] = @default_headers.merge((api_options[:headers] || {}))
+                api_options[:headers] = @default_headers.merge(api_options[:headers] || {})
 
                 # Add API::Instance with all settings
                 instances[key] = API::Instance.new(
@@ -171,14 +171,14 @@ module Datadog
           # Raised when built without defining APIs.
           class NoApisError < StandardError
             def message
-              'No APIs configured for transport!'
+              "No APIs configured for transport!"
             end
           end
 
           # Raised when client built without defining a default API.
           class NoDefaultApiError < StandardError
             def message
-              'No default API configured for transport!'
+              "No default API configured for transport!"
             end
           end
         end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'env'
-require_relative '../response'
+require_relative "env"
+require_relative "../response"
 
 module Datadog
   module Core

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../core/transport/response'
+require_relative "../../../core/transport/response"
 
 module Datadog
   module Core
@@ -53,6 +53,10 @@ module Datadog
           def code
             @http_response.respond_to?(:code) ? @http_response.code : nil
           end
+
+          def headers
+            @http_response.respond_to?(:headers) ? @http_response.headers : {}
+          end
         end
       end
     end

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

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
-require_relative 'http/builder'
-require_relative 'http/adapters/net'
-require_relative 'http/adapters/unix_socket'
-require_relative 'http/adapters/test'
+require_relative "http/builder"
+require_relative "http/adapters/net"
+require_relative "http/adapters/unix_socket"
+require_relative "http/adapters/test"
+require_relative "../environment/container"
+require_relative "../environment/ext"
 
 module Datadog
   module Core
@@ -49,7 +51,7 @@ module Datadog
 
         def default_headers
           {
-            Core::Transport::Ext::HTTP::HEADER_CLIENT_COMPUTED_TOP_LEVEL => '1',
+            Core::Transport::Ext::HTTP::HEADER_CLIENT_COMPUTED_TOP_LEVEL => "1",
             Core::Transport::Ext::HTTP::HEADER_META_LANG =>
               Datadog::Core::Environment::Ext::LANG,
             Core::Transport::Ext::HTTP::HEADER_META_LANG_VERSION =>
@@ -59,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)
@@ -68,7 +70,7 @@ module Datadog
             unless Datadog.configuration.apm.tracing.enabled
               # Sending this header to the agent will disable metrics computation (and billing) on the agent side
               # by pretending it has already been done on the library side.
-              headers[Core::Transport::Ext::HTTP::HEADER_CLIENT_COMPUTED_STATS] = 'yes'
+              headers[Core::Transport::Ext::HTTP::HEADER_CLIENT_COMPUTED_STATS] = "yes"
             end
           end
         end