datadog 2.29.0 → 2.31.0

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

@@ -10,28 +10,36 @@ module Datadog
         IDENTITY = ->(new_value, _old_value) { new_value }
 
         attr_reader \
+          :is_settings,
           :default,
           :default_proc,
           :env,
           :env_parser,
           :name,
           :after_set,
+          :skip_telemetry,
           :resetter,
           :setter,
           :type,
           :type_options
 
-        def initialize(name, meta, &block)
-          @default = meta[:default]
-          @default_proc = meta[:default_proc]
-          @env = meta[:env]
-          @env_parser = meta[:env_parser]
+        def initialize(name, attributes, &block)
+          # When a settings is defined using the config DSL, an option is also created.
+          # See Datadog::Core::Configuration::Base::ClassMethods#settings for more details.
+          # This flag is used to indicate that the option is a settings option.
+          @is_settings = attributes[:is_settings]
+
+          @default = attributes[:default]
+          @default_proc = attributes[:default_proc]
+          @env = attributes[:env]
+          @env_parser = attributes[:env_parser]
           @name = name.to_sym
-          @after_set = meta[:after_set]
-          @resetter = meta[:resetter]
-          @setter = meta[:setter] || block || IDENTITY
-          @type = meta[:type]
-          @type_options = meta[:type_options]
+          @after_set = attributes[:after_set]
+          @skip_telemetry = attributes[:skip_telemetry]
+          @resetter = attributes[:resetter]
+          @setter = attributes[:setter] || block || IDENTITY
+          @type = attributes[:type]
+          @type_options = attributes[:type_options]
         end
 
         # Creates a new Option, bound to the context provided.
@@ -49,6 +57,8 @@ module Datadog
             :helpers
 
           def initialize(name, options = {})
+            @is_settings = options.fetch(:is_settings, false)
+
             @env = nil
             @env_parser = nil
             @default = nil
@@ -56,6 +66,7 @@ module Datadog
             @helpers = {}
             @name = name.to_sym
             @after_set = nil
+            @skip_telemetry = false
             @resetter = nil
             @setter = OptionDefinition::IDENTITY
             @type = nil
@@ -95,6 +106,16 @@ module Datadog
             @after_set = block
           end
 
+          # This should only be set to true for options that are manually modified
+          # before being added to the telemetry payload in app_started.rb.
+          # E.g. telemetry is skipped for `tracing.writer_options`, but in app_started.rb,
+          # we send two separate entries for the buffer_size and flush_interval values.
+          # Standard: We want to keep this method as skip_telemetry(value),
+          # not skip_telemetry = value, so attr_writer is not used.
+          def skip_telemetry(value) # standard:disable Style/TrivialAccessors
+            @skip_telemetry = value
+          end
+
           def resetter(&block)
             @resetter = block
           end
@@ -119,6 +140,8 @@ module Datadog
             env(options[:env]) if options.key?(:env)
             env_parser(&options[:env_parser]) if options.key?(:env_parser)
             after_set(&options[:after_set]) if options.key?(:after_set)
+            # Steep: https://github.com/soutaro/steep/issues/1979
+            skip_telemetry(options[:skip_telemetry]) if options.key?(:skip_telemetry) # steep:ignore ArgumentTypeMismatch
             resetter(&options[:resetter]) if options.key?(:resetter)
             # Steep: https://github.com/soutaro/steep/issues/1979
             setter(&options[:setter]) if options.key?(:setter) # steep:ignore BlockTypeMismatch
@@ -126,16 +149,19 @@ module Datadog
           end
 
           def to_definition
-            OptionDefinition.new(@name, meta)
+            OptionDefinition.new(@name, attributes)
           end
 
-          def meta
+          def attributes
             {
+              is_settings: @is_settings,
+
               default: @default,
               default_proc: @default_proc,
               env: @env,
               env_parser: @env_parser,
               after_set: @after_set,
+              skip_telemetry: @skip_telemetry,
               resetter: @resetter,
               setter: @setter,
               type: @type,

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

@@ -16,17 +16,47 @@ module Datadog
         # Class behavior for a configuration object with options
         # @public_api
         module ClassMethods
+          def settings_path
+            defined?(@settings_path) ? @settings_path : nil
+          end
+
+          # Registry of nested settings classes keyed by the option name declared
+          # via `Base.settings`. This lets us propagate a new settings path down the
+          # tree without storing parent references on the nested class or on the
+          # option definition itself.
+          def settings_children
+            @settings_children ||= if superclass <= Options
+              superclass.settings_children.dup
+            else
+              {}
+            end
+          end
+
+          def settings_path=(path)
+            @settings_path = path
+
+            # Keep nested settings paths in sync when a parent settings path is
+            # assigned later, which is how contrib integrations inject
+            # "tracing.<integration>" into their configuration classes.
+            settings_children.each do |name, settings_class|
+              nested_settings_path = path ? "#{path}.#{name}" : name.to_s
+              settings_class.settings_path = nested_settings_path
+            end
+          end
+
           def options
             # Allows for class inheritance of option definitions
-            @options ||= (superclass <= Options) ? superclass.options.dup : {}
+            @options ||= if superclass <= Options
+              superclass.options.dup
+            else
+              {}
+            end
           end
 
           protected
 
-          def option(name, meta = {}, &block)
-            settings_name = defined?(@settings_name) && @settings_name
-            option_name = settings_name ? "#{settings_name}.#{name}" : name
-            builder = OptionDefinition::Builder.new(option_name, meta, &block)
+          def option(name, attributes = {}, &block)
+            builder = OptionDefinition::Builder.new(name, attributes, &block)
             options[name] = builder.to_definition.tap do
               # Resolve and define helper functions
               helpers = default_helpers(name)
@@ -75,7 +105,11 @@ module Datadog
           end
 
           def set_option(name, value, precedence: Configuration::Option::Precedence::PROGRAMMATIC)
-            resolve_option(name).set(value, precedence: precedence)
+            option = resolve_option(name)
+            # Populate lower-precedence values so telemetry and `unset` can
+            # still observe the fallback chain after a first programmatic set.
+            option.get
+            option.set(value, precedence: precedence)
           end
 
           def unset_option(name, precedence: Configuration::Option::Precedence::PROGRAMMATIC)
@@ -120,7 +154,7 @@ module Datadog
 
             assert_valid_option!(name)
             definition = self.class.options[name]
-            # @type self: Configuration::Options::GenericSettingsClass
+            # @type self: Configuration::Options::_Settings
             options[name] = definition.build(self)
           end
 

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

@@ -221,6 +221,8 @@ module Datadog
           #
           # @return Logger::Severity
           option :instance do |o|
+            # Telemetry for this option is manually modified and added in the AppStarted event.
+            o.skip_telemetry true
             o.after_set { |value| set_option(:level, value.level) unless value.nil? }
           end
 
@@ -604,6 +606,30 @@ module Datadog
                   !(RUBY_VERSION.start_with?('3.3.') && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.3.4'))
               end
             end
+
+            # Experimental: Controls the CPU sampling interval in milliseconds. This sets how often the profiler
+            # attempts to take a CPU sample. Valid values are 1 to 10.
+            #
+            # Lower values increase accuracy but also increase overhead. If you need to reduce profiler overhead,
+            # use the `overhead_target_percentage` setting instead.
+            #
+            # @warn This setting is experimental and may be removed or changed in future versions.
+            #
+            # # No config via environment variable yet
+            # @default 10
+            option :experimental_cpu_sampling_interval_ms do |o|
+              o.type :int
+              o.default 10
+            end
+
+            # Fallback to system dns instead of using libdatadog built-in resolver.
+            #
+            # @default `DD_PROFILING_EXPERIMENTAL_USE_SYSTEM_DNS` environment variable as a boolean, otherwise `true`
+            option :experimental_use_system_dns do |o|
+              o.type :bool
+              o.env 'DD_PROFILING_EXPERIMENTAL_USE_SYSTEM_DNS'
+              o.default true
+            end
           end
 
           # @public_api
@@ -888,6 +914,19 @@ module Datadog
             o.default 60.0
           end
 
+          # The interval in seconds when extended heartbeat must be sent.
+          #
+          # This method is used internally, for testing purposes only.
+          #
+          # @default `DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL` environment variable, otherwise `86400`.
+          # @return [Integer]
+          # @!visibility private
+          option :extended_heartbeat_interval_seconds do |o|
+            o.type :int
+            o.env Core::Telemetry::Ext::ENV_EXTENDED_HEARTBEAT_INTERVAL
+            o.default 86400
+          end
+
           # The interval in seconds when telemetry metrics are aggregated.
           # Should be a denominator of `heartbeat_interval_seconds`.
           #
@@ -1033,13 +1072,13 @@ module Datadog
           end
         end
 
-        # Enable experimental process tags propagation such that payloads like spans contain the process tag.
+        # Enable process tags propagation such that payloads like spans contain the process tag.
         #
-        # @default `DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED` environment variable, otherwise `false`
+        # @default `DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED` environment variable, otherwise `true`
         # @return [Boolean]
         option :experimental_propagate_process_tags_enabled do |o|
           o.env 'DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED'
-          o.default false
+          o.default true
           o.type :bool
         end
 

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

@@ -77,6 +77,7 @@ module Datadog
           "DD_PROFILING_EXPERIMENTAL_HEAP_ENABLED",
           "DD_PROFILING_EXPERIMENTAL_HEAP_SAMPLE_RATE",
           "DD_PROFILING_EXPERIMENTAL_HEAP_SIZE_ENABLED",
+          "DD_PROFILING_EXPERIMENTAL_USE_SYSTEM_DNS",
           "DD_PROFILING_GC_ENABLED",
           "DD_PROFILING_GVL_ENABLED",
           "DD_PROFILING_HEAP_CLEAN_AFTER_GC_ENABLED",
@@ -106,6 +107,7 @@ module Datadog
           "DD_TAGS",
           "DD_TELEMETRY_AGENTLESS_URL",
           "DD_TELEMETRY_DEPENDENCY_COLLECTION_ENABLED",
+          "DD_TELEMETRY_EXTENDED_HEARTBEAT_INTERVAL",
           "DD_TELEMETRY_HEARTBEAT_INTERVAL",
           "DD_TELEMETRY_LOG_COLLECTION_ENABLED",
           "DD_TELEMETRY_METRICS_AGGREGATION_INTERVAL",
@@ -166,11 +168,13 @@ module Datadog
           "DD_TRACE_ENABLED",
           "DD_TRACE_ETHON_ANALYTICS_ENABLED",
           "DD_TRACE_ETHON_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_ETHON_DISTRIBUTED_TRACING",
           "DD_TRACE_ETHON_ENABLED",
           "DD_TRACE_ETHON_PEER_SERVICE",
           "DD_TRACE_ETHON_SERVICE_NAME",
           "DD_TRACE_EXCON_ANALYTICS_ENABLED",
           "DD_TRACE_EXCON_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_EXCON_DISTRIBUTED_TRACING",
           "DD_TRACE_EXCON_ENABLED",
           "DD_TRACE_EXCON_ERROR_STATUS_CODES",
           "DD_TRACE_EXCON_PEER_SERVICE",
@@ -178,6 +182,7 @@ module Datadog
           "DD_TRACE_EXPERIMENTAL_RUNTIME_ID_ENABLED",
           "DD_TRACE_FARADAY_ANALYTICS_ENABLED",
           "DD_TRACE_FARADAY_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_FARADAY_DISTRIBUTED_TRACING",
           "DD_TRACE_FARADAY_ENABLED",
           "DD_TRACE_FARADAY_ERROR_STATUS_CODES",
           "DD_TRACE_FARADAY_PEER_SERVICE",
@@ -194,6 +199,7 @@ module Datadog
           "DD_TRACE_GRAPHQL_WITH_UNIFIED_TRACER",
           "DD_TRACE_GRPC_ANALYTICS_ENABLED",
           "DD_TRACE_GRPC_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_GRPC_DISTRIBUTED_TRACING",
           "DD_TRACE_GRPC_ENABLED",
           "DD_TRACE_GRPC_PEER_SERVICE",
           "DD_TRACE_GRPC_SERVICE_NAME",
@@ -201,12 +207,14 @@ module Datadog
           "DD_TRACE_HEADER_TAGS",
           "DD_TRACE_HTTPCLIENT_ANALYTICS_ENABLED",
           "DD_TRACE_HTTPCLIENT_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_HTTPCLIENT_DISTRIBUTED_TRACING",
           "DD_TRACE_HTTPCLIENT_ENABLED",
           "DD_TRACE_HTTPCLIENT_ERROR_STATUS_CODES",
           "DD_TRACE_HTTPCLIENT_PEER_SERVICE",
           "DD_TRACE_HTTPCLIENT_SERVICE_NAME",
           "DD_TRACE_HTTPRB_ANALYTICS_ENABLED",
           "DD_TRACE_HTTPRB_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_HTTPRB_DISTRIBUTED_TRACING",
           "DD_TRACE_HTTPRB_ENABLED",
           "DD_TRACE_HTTPRB_ERROR_STATUS_CODES",
           "DD_TRACE_HTTPRB_PEER_SERVICE",
@@ -214,12 +222,14 @@ module Datadog
           "DD_TRACE_HTTP_ANALYTICS_ENABLED",
           "DD_TRACE_HTTP_ANALYTICS_SAMPLE_RATE",
           "DD_TRACE_HTTP_CLIENT_ERROR_STATUSES",
+          "DD_TRACE_HTTP_DISTRIBUTED_TRACING",
           "DD_TRACE_HTTP_ENABLED",
           "DD_TRACE_HTTP_ERROR_STATUS_CODES",
           "DD_TRACE_HTTP_SERVER_ERROR_STATUSES",
           "DD_TRACE_KAFKA_ANALYTICS_ENABLED",
           "DD_TRACE_KAFKA_ANALYTICS_SAMPLE_RATE",
           "DD_TRACE_KAFKA_ENABLED",
+          "DD_TRACE_KARAFKA_DISTRIBUTED_TRACING",
           "DD_TRACE_KARAFKA_ENABLED",
           "DD_TRACE_LOGRAGE_ENABLED",
           "DD_TRACE_MEMCACHED_COMMAND_ENABLED",
@@ -261,6 +271,7 @@ module Datadog
           "DD_TRACE_PROPAGATION_STYLE_INJECT",
           "DD_TRACE_QUE_ANALYTICS_ENABLED",
           "DD_TRACE_QUE_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_QUE_DISTRIBUTED_TRACING",
           "DD_TRACE_QUE_ENABLED",
           "DD_TRACE_QUE_TAG_ARGS_ENABLED",
           "DD_TRACE_QUE_TAG_DATA_ENABLED",
@@ -269,9 +280,11 @@ module Datadog
           "DD_TRACE_RACECAR_ENABLED",
           "DD_TRACE_RACK_ANALYTICS_ENABLED",
           "DD_TRACE_RACK_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_RACK_DISTRIBUTED_TRACING",
           "DD_TRACE_RACK_ENABLED",
           "DD_TRACE_RAILS_ANALYTICS_ENABLED",
           "DD_TRACE_RAILS_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_RAILS_DISTRIBUTED_TRACING",
           "DD_TRACE_RAILS_ENABLED",
           "DD_TRACE_RAKE_ANALYTICS_ENABLED",
           "DD_TRACE_RAKE_ANALYTICS_SAMPLE_RATE",
@@ -291,6 +304,7 @@ module Datadog
           "DD_TRACE_RESQUE_ENABLED",
           "DD_TRACE_REST_CLIENT_ANALYTICS_ENABLED",
           "DD_TRACE_REST_CLIENT_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_REST_CLIENT_DISTRIBUTED_TRACING",
           "DD_TRACE_REST_CLIENT_ENABLED",
           "DD_TRACE_REST_CLIENT_PEER_SERVICE",
           "DD_TRACE_REST_CLIENT_SERVICE_NAME",
@@ -306,9 +320,11 @@ module Datadog
           "DD_TRACE_SHORYUKEN_ENABLED",
           "DD_TRACE_SIDEKIQ_ANALYTICS_ENABLED",
           "DD_TRACE_SIDEKIQ_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_SIDEKIQ_DISTRIBUTED_TRACING",
           "DD_TRACE_SIDEKIQ_ENABLED",
           "DD_TRACE_SINATRA_ANALYTICS_ENABLED",
           "DD_TRACE_SINATRA_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_SINATRA_DISTRIBUTED_TRACING",
           "DD_TRACE_SINATRA_ENABLED",
           "DD_TRACE_SNEAKERS_ANALYTICS_ENABLED",
           "DD_TRACE_SNEAKERS_ANALYTICS_SAMPLE_RATE",
@@ -326,6 +342,7 @@ module Datadog
           "DD_TRACE_TRILOGY_ENABLED",
           "DD_TRACE_TRILOGY_PEER_SERVICE",
           "DD_TRACE_TRILOGY_SERVICE_NAME",
+          "DD_TRACE_WATERDROP_DISTRIBUTED_TRACING",
           "DD_TRACE_WATERDROP_ENABLED",
           "DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH",
           "DD_VERSION",

data/lib/datadog/core/contrib/rails/railtie.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative 'utils'
+require_relative '../../environment/process'
+require_relative '../../process_discovery'
+
+module Datadog
+  module Core
+    module Contrib
+      module Rails
+        # Railtie for core Rails setup that benefits all Datadog products.
+        class Railtie < ::Rails::Railtie
+          def self.after_initialize
+            if Datadog.configuration.experimental_propagate_process_tags_enabled
+              Datadog::Core::Environment::Process.rails_application_name =
+                Datadog::Core::Contrib::Rails::Utils.app_name
+            end
+
+            # Process Discovery should always publish after_initialize since it has access to more information
+            Datadog::Core::ProcessDiscovery.publish(Datadog.configuration)
+          end
+
+          # Registered after the method definition so the method exists if on_load fires immediately
+          # (which happens when the Railtie is loaded into an already-initialized Rails app).
+          ::ActiveSupport.on_load(:after_initialize) do
+            Datadog::Core::Contrib::Rails::Railtie.after_initialize
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/core/contrib/rails/utils.rb

@@ -7,11 +7,15 @@ module Datadog
         # common utilities for Rails
         module Utils
           def self.app_name
-            if ::Rails::VERSION::MAJOR >= 6
-              ::Rails.application.class.module_parent_name.underscore
+            application_name = if ::Rails::VERSION::MAJOR >= 6
+              ::Rails.application.class.module_parent_name
             else
-              ::Rails.application.class.parent_name.underscore
+              ::Rails.application.class.parent_name
             end
+            application_name&.underscore
+          rescue => e
+            Datadog.logger.debug("Failed to extract Rails application name: #{e.class}: #{e}")
+            nil
           end
 
           def self.railtie_supported?

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

@@ -55,7 +55,7 @@ module Datadog
             # Unhandled exception report triggering means that the application is already in a bad state
             # We don't want to swallow non-StandardError exceptions here; we would rather just let the
             # application crash
-            Datadog.logger.debug("Crashtracker failed to report unhandled exception: #{e.message}")
+            Datadog.logger.debug { "Crashtracker failed to report unhandled exception: #{e.class}: #{e}" }
           end
         end
 
@@ -83,12 +83,11 @@ module Datadog
           start_or_update_on_fork(action: :update_on_fork, tags: self.class.latest_tags(settings))
         end
 
-        def report_unhandled_exception(exception, settings: Datadog.configuration)
+        def report_unhandled_exception(exception)
           # Maximum number of stack frames to include in exception crash reports
           # This is the same number used for signal-based crashtracking's runtime stack
           max_exception_stack_frames = 512
 
-          current_tags = self.class.latest_tags(settings)
           # extract all frame data upfront; c expects exactly 3 elements, proper types, no nils
           # limit to max_exception_stack_frames frames
           all_backtrace_locations = exception.backtrace_locations || []
@@ -116,19 +115,12 @@ module Datadog
           end
 
           exception_message = exception.message
-          message =
-            if exception_message && !exception_message.empty?
-              "Process was terminated due to an unhandled exception of type '#{exception.class}'. Message: \"#{exception_message}\""
-            else
-              "Process was terminated due to an unhandled exception of type '#{exception.class}'."
-            end
+          exception_type = exception.class.to_s
 
           success = self.class._native_report_ruby_exception(
-            agent_base_url,
-            message,
+            exception_type,
+            exception_message,
             frames_data,
-            current_tags.to_a,
-            Datadog::VERSION::STRING
           )
 
           logger.debug('Crashtracker failed to report unhandled exception to crash tracker') unless success
@@ -138,7 +130,7 @@ module Datadog
           self.class._native_stop
           logger.debug('Crash tracking stopped successfully')
         rescue => e
-          logger.error("Failed to stop crash tracking: #{e.message}")
+          logger.error("Failed to stop crash tracking: #{e.class}: #{e}")
         end
 
         private
@@ -157,7 +149,7 @@ module Datadog
           )
           logger.debug("Crash tracking action: #{action} successful")
         rescue => e
-          logger.error("Failed to #{action} crash tracking: #{e.message}")
+          logger.error("Failed to #{action} crash tracking: #{e.class}: #{e}")
         end
       end
     end

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

@@ -108,7 +108,7 @@ module Datadog
             end
           rescue => e
             Datadog.logger.debug(
-              "Error while checking cgroup namespace. Cause: #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}"
+              "Error while checking cgroup namespace. Cause: #{e.class}: #{e} Location: #{Array(e.backtrace).first}"
             )
             false
           end
@@ -172,7 +172,7 @@ module Datadog
           @entry = Entry.new # Empty entry if no valid cgroup entry is found
         rescue => e
           Datadog.logger.debug(
-            "Error while reading container entry. Cause: #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}"
+            "Error while reading container entry. Cause: #{e.class}: #{e} Location: #{Array(e.backtrace).first}"
           )
           @entry = Entry.new unless defined?(@entry)
           @entry

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

@@ -41,6 +41,7 @@ module Datadog
         TAG_ENTRYPOINT_NAME = "entrypoint.name"
         TAG_ENTRYPOINT_WORKDIR = "entrypoint.workdir"
         TAG_ENTRYPOINT_TYPE = "entrypoint.type"
+        TAG_RAILS_APPLICATION = "rails.application"
         TAG_PROCESS_TAGS = "_dd.tags.process"
         TAG_SERVICE = 'service'
         TAG_VERSION = 'version'

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

@@ -2,6 +2,7 @@
 
 require 'securerandom'
 
+require_relative '../configuration/config_helper'
 require_relative 'ext'
 require_relative '../utils/forking'
 
@@ -13,18 +14,39 @@ module Datadog
       module Identity
         extend Core::Utils::Forking
 
+        ENV_ROOT_SESSION_ID = '_DD_ROOT_RB_SESSION_ID'
+        ENV_PARENT_SESSION_ID = '_DD_PARENT_RB_SESSION_ID'
+
         module_function
 
-        # Retrieves number of classes from runtime
+        @root_runtime_id = DATADOG_ENV[ENV_ROOT_SESSION_ID]&.freeze
+        @parent_runtime_id = DATADOG_ENV[ENV_PARENT_SESSION_ID]&.freeze
+
         def id
           @id ||= ::SecureRandom.uuid.freeze
 
-          # Check if runtime has changed, e.g. forked.
-          after_fork! { @id = ::SecureRandom.uuid.freeze }
+          after_fork! do
+            # Order matters: capture @id before overwriting
+            @parent_runtime_id = @id
+            @root_runtime_id ||= @id
+            @id = ::SecureRandom.uuid.freeze
+          end
 
           @id
         end
 
+        def root_runtime_id
+          @root_runtime_id
+        end
+
+        def parent_runtime_id
+          @parent_runtime_id
+        end
+
+        def runtime_propagation_envs
+          {ENV_ROOT_SESSION_ID => root_runtime_id || id, ENV_PARENT_SESSION_ID => id}.freeze
+        end
+
         def pid
           ::Process.pid
         end

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

@@ -35,6 +35,9 @@ module Datadog
 
           tags << "#{Environment::Ext::TAG_ENTRYPOINT_TYPE}:#{TagNormalizer.normalize(entrypoint_type, remove_digit_start_char: false)}"
 
+          rails_application_name = TagNormalizer.normalize_process_value(@rails_application_name.to_s)
+          tags << "#{Environment::Ext::TAG_RAILS_APPLICATION}:#{rails_application_name}" unless rails_application_name.empty?
+
           @tags = tags.freeze
         end
 
@@ -80,6 +83,15 @@ module Datadog
           File.basename(File.expand_path(File.dirname($0)))
         end
 
+        # Sets the rails application name from other places in code
+        # @param name [String] the rails application name
+        # @return [void]
+        def self.rails_application_name=(name)
+          @rails_application_name = name
+          remove_instance_variable(:@tags) if instance_variable_defined?(:@tags)
+          remove_instance_variable(:@serialized) if instance_variable_defined?(:@serialized)
+        end
+
         private_class_method :entrypoint_workdir, :entrypoint_type, :entrypoint_name, :entrypoint_basedir
       end
     end

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

@@ -101,7 +101,7 @@ module Datadog
           statsd.count(stat, value, metric_options(options))
         rescue => e
           logger.error(
-            "Failed to send count stat. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+            "Failed to send count stat. Cause: #{e.class}: #{e} Source: #{Array(e.backtrace).first}"
           )
           telemetry.report(e, description: 'Failed to send count stat')
         end
@@ -115,7 +115,7 @@ module Datadog
           statsd.distribution(stat, value, metric_options(options))
         rescue => e
           logger.error(
-            "Failed to send distribution stat. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+            "Failed to send distribution stat. Cause: #{e.class}: #{e} Source: #{Array(e.backtrace).first}"
           )
           telemetry.report(e, description: 'Failed to send distribution stat')
         end
@@ -128,7 +128,7 @@ module Datadog
           statsd.increment(stat, metric_options(options))
         rescue => e
           logger.error(
-            "Failed to send increment stat. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+            "Failed to send increment stat. Cause: #{e.class}: #{e} Source: #{Array(e.backtrace).first}"
           )
           telemetry.report(e, description: 'Failed to send increment stat')
         end
@@ -142,7 +142,7 @@ module Datadog
           statsd.gauge(stat, value, metric_options(options))
         rescue => e
           logger.error(
-            "Failed to send gauge stat. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+            "Failed to send gauge stat. Cause: #{e.class}: #{e} Source: #{Array(e.backtrace).first}"
           )
           telemetry.report(e, description: 'Failed to send gauge stat')
         end
@@ -162,7 +162,7 @@ module Datadog
           rescue => e
             # TODO: Likely to be redundant, since `distribution` handles its own errors.
             logger.error(
-              "Failed to send time stat. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+              "Failed to send time stat. Cause: #{e.class}: #{e} Source: #{Array(e.backtrace).first}"
             )
             telemetry.report(e, description: 'Failed to send time stat')
           end

data/lib/datadog/core/process_discovery.rb

@@ -10,6 +10,11 @@ module Datadog
     module ProcessDiscovery
       class << self
         def publish(settings)
+          if RUBY_PLATFORM.include?("darwin")
+            Datadog.logger.debug { "Skipping process discovery, not yet supported on macOS" }
+            return
+          end
+
           if (libdatadog_api_failure = Datadog::Core::LIBDATADOG_API_FAILURE)
             Datadog.logger.debug { "Cannot enable process discovery: #{libdatadog_api_failure}" }
             return