datadog 2.30.0 → 2.45.0

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

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-require 'securerandom'
+require "securerandom"
 
-require_relative 'ext'
-require_relative '../utils/forking'
+require_relative "../configuration/config_helper"
+require_relative "ext"
+require_relative "../utils/forking"
 
 module Datadog
   module Core
@@ -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
@@ -54,18 +76,32 @@ module Datadog
           Core::Environment::Ext::GEM_DATADOG_VERSION
         end
 
-        # Returns tracer version, comforming to https://semver.org/spec/v2.0.0.html
+        # Returns the tracer version in SemVer-2 form (https://semver.org/spec/v2.0.0.html).
+        #
+        # Converts the RubyGems-style version returned by {.gem_datadog_version}
+        # (dot-separated prerelease/build segments, e.g. "2.34.0.dev") into the
+        # SemVer-2 form expected by cross-language Datadog consumers (hyphen-separated
+        # prerelease, "+" build metadata, e.g. "2.34.0-dev").
+        #
+        # Called by reporters that emit a tracer version on the wire and must match
+        # the format used by other-language tracers:
+        # - process discovery memfd (`Core::ProcessDiscovery.get_metadata` → `tracer_version`)
+        # - telemetry payloads (`Core::Telemetry::Request#application`)
+        # - remote configuration client identification (`Core::Remote::Client#tracer_version`)
+        #
+        # Use {.gem_datadog_version} (not this method) when a RubyGems-style string is
+        # required (e.g. gem-internal contexts, gemspec interop).
         def gem_datadog_version_semver2
-          major, minor, patch, rest = gem_datadog_version.split('.', 4)
+          major, minor, patch, rest = gem_datadog_version.split(".", 4)
 
           semver = "#{major}.#{minor}.#{patch}"
 
           return semver unless rest
 
-          pre = ''
-          build = ''
+          pre = ""
+          build = ""
 
-          rest.split('.').tap do |segments|
+          rest.split(".").tap do |segments|
             if segments.length >= 4
               pre = "-#{segments.shift}"
               build = "+#{segments.join(".")}"

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'etc'
+require "etc"
 
-require_relative 'identity'
+require_relative "identity"
 
 module Datadog
   module Core
@@ -13,32 +13,32 @@ module Datadog
 
         # @return [String] ISA of host; `uname -m`
         def architecture
-          (Identity.lang_version >= '2.2') ? Etc.uname[:machine] : Gem::Platform.local.cpu
+          (Identity.lang_version >= "2.2") ? Etc.uname[:machine] : Gem::Platform.local.cpu
         end
 
         # @return [String] name of host; `uname -n`
         def hostname
-          (Identity.lang_version >= '2.2') ? Etc.uname[:nodename] : nil
+          (Identity.lang_version >= "2.2") ? Etc.uname[:nodename] : nil
         end
 
         # System name, normally `Linux` or `Darwin` (but 'Mac OS X' on JRuby);
         # @return [String] name of kernel; `uname -s`.
         def kernel_name
-          (Identity.lang_version >= '2.2') ? Etc.uname[:sysname] : Gem::Platform.local.os.capitalize
+          (Identity.lang_version >= "2.2") ? Etc.uname[:sysname] : Gem::Platform.local.os.capitalize
         end
 
         # @return [String] kernel release; `uname -r`
         def kernel_release
-          if Identity.lang_engine == 'jruby'
+          if Identity.lang_engine == "jruby"
             Etc.uname[:version] # Java's `os.version` maps to `uname -r`
-          elsif Identity.lang_version >= '2.2'
+          elsif Identity.lang_version >= "2.2"
             Etc.uname[:release]
           end
         end
 
         # @return [String] kernel version; `uname -v`
         def kernel_version
-          Etc.uname[:version] if Identity.lang_engine != 'jruby' && Identity.lang_version >= '2.2'
+          Etc.uname[:version] if Identity.lang_engine != "jruby" && Identity.lang_version >= "2.2"
         end
       end
     end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'ext'
-require_relative '../tag_normalizer'
+require_relative "ext"
+require_relative "../tag_normalizer"
 
 module Datadog
   module Core
@@ -10,18 +10,17 @@ module Datadog
       #
       # @api private
       module Process
-        # This method returns a key/value part of serialized tags in the format of k1:v1,k2:v2,k3:v3
-        # @return [String] comma-separated normalized key:value pairs
+        # Returns a comma-separated string of normalized key:value pairs.
+        # Includes svc.user or svc.auto based on whether the service was explicitly configured.
+        # @return [String]
         def self.serialized
-          return @serialized if defined?(@serialized)
-
-          @serialized = tags.join(',').freeze
+          tags.join(",").freeze
         end
 
-        # This method returns an array in the format ["k1:v1","k2:v2","k3:v3"]
-        # @return [Array<String>] array of normalized key:value pairs
+        # Returns an array of normalized key:value pair strings.
+        # Includes svc.user or svc.auto based on whether the service was explicitly configured.
+        # @return [Array<String>]
         def self.tags
-          return @tags if defined?(@tags)
           tags = []
 
           workdir = TagNormalizer.normalize_process_value(entrypoint_workdir.to_s)
@@ -35,14 +34,46 @@ module Datadog
 
           tags << "#{Environment::Ext::TAG_ENTRYPOINT_TYPE}:#{TagNormalizer.normalize(entrypoint_type, remove_digit_start_char: false)}"
 
-          @tags = tags.freeze
+          if defined?(@rails_application_name)
+            rails_name = TagNormalizer.normalize_process_value(@rails_application_name.to_s)
+            tags << "#{Environment::Ext::TAG_RAILS_APPLICATION}:#{rails_name}" unless rails_name.empty?
+          end
+
+          if defined?(@service_user_configured)
+            if @service_user_configured
+              tags << "#{Environment::Ext::TAG_SVC_USER}:true"
+            else
+              svc = TagNormalizer.normalize_process_value(@service_name.to_s)
+              tags << "#{Environment::Ext::TAG_SVC_AUTO}:#{svc}" unless svc.empty?
+            end
+          end
+
+          tags.freeze
+        end
+
+        # Called via after_set on option :service in settings.rb whenever the service value changes.
+        # @param name [String] the service name
+        # @param user_configured [Boolean] whether the service was explicitly set by the user
+        # @return [void]
+        def self.set_service(name, user_configured:)
+          @service_name = name
+          @service_user_configured = user_configured
+        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
         end
 
         # Returns the last segment of the working directory of the process
         # Example: /app/myapp -> myapp
         # @return [String] the last segment of the working directory
         def self.entrypoint_workdir
-          File.basename(Dir.pwd)
+          return @entrypoint_workdir if defined?(@entrypoint_workdir)
+
+          @entrypoint_workdir = File.basename(Dir.pwd)
         end
 
         # Returns the entrypoint type of the process
@@ -52,10 +83,10 @@ module Datadog
           Environment::Ext::PROCESS_TYPE
         end
 
-        # Returns the last segment of the base directory of the process
+        # Returns the basename of the script being run
         # Example 1: /bin/mybin -> mybin
-        # Example 2: ruby /test/myapp.rb -> myapp
-        # @return [String] the last segment of base directory of the script
+        # Example 2: ruby /test/myapp.rb -> myapp.rb
+        # @return [String] the basename of the script
         #
         # @note Determining true entrypoint name is rather complicated. This method
         # is the initial implementation but it does not produce optimal output in all cases.
@@ -63,12 +94,14 @@ module Datadog
         # as their entrypoint name.
         # We might improve the behavior in the future if there is customer demand for it.
         def self.entrypoint_name
-          File.basename($0)
+          return @entrypoint_name if defined?(@entrypoint_name)
+
+          @entrypoint_name = File.basename($0)
         end
 
-        # Returns the last segment of the base directory of the process
+        # Returns the last segment of the directory containing the script
         # Example 1: /bin/mybin -> bin
-        # Example 2: ruby /test/myapp.js -> test
+        # Example 2: ruby /test/myapp.rb -> test
         # @return [String] the last segment of the base directory of the script
         #
         # @note As with entrypoint name, determining true entrypoint directory is complicated.
@@ -77,7 +110,9 @@ module Datadog
         # the entrypoint basedir is `bin` which is not very helpful.
         # We might improve this in the future if there is customer demand.
         def self.entrypoint_basedir
-          File.basename(File.expand_path(File.dirname($0)))
+          return @entrypoint_basedir if defined?(@entrypoint_basedir)
+
+          @entrypoint_basedir = File.basename(File.expand_path(File.dirname($0)))
         end
 
         private_class_method :entrypoint_workdir, :entrypoint_type, :entrypoint_name, :entrypoint_basedir

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'socket'
-require_relative '../utils/forking'
+require "socket"
+require_relative "../utils/forking"
 
 module Datadog
   module Core
@@ -18,6 +18,19 @@ module Datadog
 
           @hostname ||= ::Socket.gethostname.freeze
         end
+
+        # Returns the resolved hostname when `report_hostname` is enabled:
+        # the configured DD_HOSTNAME if set, otherwise the system hostname.
+        # Returns nil when `report_hostname` is disabled or no hostname is available.
+        def resolved_hostname(settings)
+          return nil unless settings.tracing.report_hostname
+
+          configured = settings.hostname
+          return configured if configured && !configured.empty?
+
+          resolved_hostname = hostname
+          resolved_hostname if resolved_hostname && !resolved_hostname.empty?
+        end
       end
     end
   end

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

@@ -23,7 +23,7 @@ module Datadog
           if var && DATADOG_ENV.key?(var)
             value = DATADOG_ENV[var].to_s.strip
             value.downcase!
-            value == 'true' || value == '1'
+            value == "true" || value == "1"
           else
             default
           end

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

@@ -56,7 +56,7 @@ module Datadog
         end
 
         def available?
-          defined?(::RubyVM) && ::RubyVM.respond_to?(:stat)
+          !!(defined?(::RubyVM) && ::RubyVM.respond_to?(:stat))
         end
       end
     end

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

@@ -59,9 +59,9 @@ module Datadog
         end
 
         def available?
-          defined?(::RubyVM::YJIT) \
+          !!(defined?(::RubyVM::YJIT) \
             && ::RubyVM::YJIT.enabled? \
-            && ::RubyVM::YJIT.respond_to?(:runtime_stats)
+            && ::RubyVM::YJIT.respond_to?(:runtime_stats))
         end
       end
     end

data/lib/datadog/core/error.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'utils'
+require_relative "utils"
 
 module Datadog
   module Core
@@ -39,7 +39,7 @@ module Datadog
         # but it's around 3x faster in our benchmark test
         # at `error_spec.rb`.
         def full_backtrace(ex)
-          backtrace = +''
+          backtrace = +""
           backtrace_for(ex, backtrace)
 
           # Avoid circular causes
@@ -70,11 +70,11 @@ module Datadog
           if trace[0]
             # Add Exception information to error line
             backtrace << trace[0]
-            backtrace << ': '
+            backtrace << ": "
             backtrace << ex.message.to_s
-            backtrace << ' ('
+            backtrace << " ("
             backtrace << ex.class.to_s
-            backtrace << ')'
+            backtrace << ")"
           end
 
           if trace[1]

data/lib/datadog/core/evp.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Core
+    module EVP
+      SUBDOMAIN_HEADER_NAME = "X-Datadog-EVP-Subdomain"
+      EVENT_PLATFORM_INTAKE_SUBDOMAIN = "event-platform-intake"
+      PAYLOAD_SIZE_LIMIT_BYTES = 5 * 1024 * 1024
+    end
+  end
+end

data/lib/datadog/core/extensions.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'configuration'
+require_relative "configuration"
 
 # Global namespace that includes all Datadog functionality.
 # @public_api

data/lib/datadog/core/feature_flags.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
 module Datadog
   module Core
@@ -37,14 +37,14 @@ module Datadog
           #       moved into C extension
           @value = json?(value) ? JSON.parse(value) : value
         rescue JSON::ParserError => e
-          raise Error, "Failed to parse JSON value: #{e.class}: #{e}"
+          raise Error, "Failed to parse JSON value: #{e.class}: #{e.message}"
         end
 
         # Check if the resolution resulted in an error
         #
         # @return [Boolean] True if there was an error
         def error?
-          reason == 'ERROR'
+          reason == "ERROR"
         end
 
         private

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

@@ -5,11 +5,11 @@ module Datadog
     module Git
       # Defines constants for Git tags
       module Ext
-        TAG_REPOSITORY_URL = '_dd.git.repository_url'
-        TAG_COMMIT_SHA = '_dd.git.commit.sha'
+        TAG_REPOSITORY_URL = "_dd.git.repository_url"
+        TAG_COMMIT_SHA = "_dd.git.commit.sha"
 
-        ENV_REPOSITORY_URL = 'DD_GIT_REPOSITORY_URL'
-        ENV_COMMIT_SHA = 'DD_GIT_COMMIT_SHA'
+        ENV_REPOSITORY_URL = "DD_GIT_REPOSITORY_URL"
+        ENV_COMMIT_SHA = "DD_GIT_COMMIT_SHA"
       end
     end
   end

data/lib/datadog/core/knuth_sampler.rb

@@ -32,7 +32,9 @@ module Datadog
         @knuth_factor = knuth_factor
 
         rate = rate.to_f
-        unless rate >= 0.0 && rate <= 1.0
+        # Not using `between?` here: it raises on NaN instead of falling back to 1.0 below.
+        # No current caller passes NaN, but this guards against it defensively for future ones.
+        unless rate >= 0.0 && rate <= 1.0 # rubocop:disable Style/ComparableBetween
           Datadog.logger.warn("Sample rate #{rate} is not between 0.0 and 1.0, falling back to 1.0")
           rate = 1.0
         end

data/lib/datadog/core/logger.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'logger'
+require "logger"
 
 module Datadog
   module Core
@@ -9,7 +9,7 @@ module Datadog
     # - adds last caller stack-trace info to know where the message comes from
     # @public_api
     class Logger < ::Logger
-      PREFIX = 'datadog'
+      PREFIX = "datadog"
 
       def initialize(*args, &block)
         super
@@ -18,7 +18,7 @@ module Datadog
       end
 
       def add(severity, message = nil, progname = nil, &block)
-        where = ''
+        where = ""
 
         # We are in debug mode, or this is an error, add stack trace to help debugging
         if debug? || severity >= ::Logger::ERROR

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

@@ -6,7 +6,7 @@ module Datadog
       module Ext
         # The technology from which the log originated.
         # @see https://docs.datadoghq.com/api/latest/logs/#send-logs
-        DD_SOURCE = 'ruby'
+        DD_SOURCE = "ruby"
       end
     end
   end

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

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

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

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

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

@@ -10,7 +10,7 @@ module Datadog
           :distribution,
           :increment,
           :gauge,
-          :time
+          :time,
         ].each do |metric_type|
           define_method(metric_type) do |name, stat|
             name = name.to_sym

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

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