datadog 2.20.0 → 2.26.0

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

@@ -12,6 +12,7 @@ require_relative '../remote/ext'
 require_relative '../../profiling/ext'
 
 require_relative '../../tracing/configuration/settings'
+require_relative '../../opentelemetry/configuration/settings'
 
 module Datadog
   module Core
@@ -122,8 +123,8 @@ module Datadog
           # @default `DD_TRACE_DEBUG` environment variable, otherwise `false`
           # @return [Boolean]
           option :debug do |o|
-            o.env [Datadog::Core::Configuration::Ext::Diagnostics::ENV_DEBUG_ENABLED,
-              Datadog::Core::Configuration::Ext::Diagnostics::ENV_OTEL_LOG_LEVEL]
+            # Note: Alias (OTEL_LOG_LEVEL) defined in supported-configurations.json
+            o.env Datadog::Core::Configuration::Ext::Diagnostics::ENV_DEBUG_ENABLED
             o.default false
             o.type :bool
             o.env_parser do |value|
@@ -169,6 +170,20 @@ module Datadog
           o.env Core::Environment::Ext::ENV_ENVIRONMENT
         end
 
+        # Configuration for container environments. For internal use only.
+        # @!visibility private
+        settings :container do
+          # Data supplied by the container runner to assist in uniquely identifying this process.
+          # Used in [Origin Detection](https://docs.datadoghq.com/developers/dogstatsd/unix_socket/?tab=host#origin-detection)
+          #
+          # @default `DD_EXTERNAL_ENV` environment variable, otherwise `nil`
+          # @return [String,nil]
+          option :external_env do |o|
+            o.type :string, nilable: true
+            o.env Core::Environment::Ext::ENV_EXTERNAL_ENV
+          end
+        end
+
         # Internal {Datadog::Statsd} metrics collection.
         #
         # @public_api
@@ -212,6 +227,7 @@ module Datadog
           # Log level for `Datadog.logger`.
           # @see Logger::Severity
           # @return Logger::Severity
+          # TODO: Add environment variable for this `DD_TRACE_LOG_LEVEL`
           option :level, default: ::Logger::INFO
         end
 
@@ -291,9 +307,6 @@ module Datadog
             #       for Ruby versions 2.x, 3.1.4+, 3.2.3+ and 3.3.0+
             #       (more details in {Datadog::Profiling::Component.enable_gc_profiling?})
             #
-            # @warn Due to a VM bug in the Ractor implementation (https://bugs.ruby-lang.org/issues/19112) this feature
-            #       stops working when Ractors get garbage collected.
-            #
             # @default `DD_PROFILING_GC_ENABLED` environment variable, otherwise `true`
             option :gc_enabled do |o|
               o.type :bool
@@ -485,7 +498,7 @@ module Datadog
             # @default `DD_PROFILING_GVL_ENABLED` environment variable as a boolean, otherwise `true`
             option :gvl_enabled do |o|
               o.type :bool
-              o.deprecated_env 'DD_PROFILING_PREVIEW_GVL_ENABLED'
+              # Note: Deprecated alias (DD_PROFILING_PREVIEW_GVL_ENABLED) defined in supported-configurations.json
               o.env 'DD_PROFILING_GVL_ENABLED'
               o.default true
             end
@@ -604,7 +617,8 @@ module Datadog
 
           option :experimental_runtime_id_enabled do |o|
             o.type :bool
-            o.env ['DD_TRACE_EXPERIMENTAL_RUNTIME_ID_ENABLED', 'DD_RUNTIME_METRICS_RUNTIME_ID_ENABLED']
+            # Note: Alias (DD_TRACE_EXPERIMENTAL_RUNTIME_ID_ENABLED) defined in supported-configurations.json
+            o.env 'DD_RUNTIME_METRICS_RUNTIME_ID_ENABLED'
             o.default false
           end
 
@@ -620,7 +634,8 @@ module Datadog
           o.type :string, nilable: true
 
           # NOTE: service also gets set as a side effect of tags. See the WORKAROUND note in #initialize for details.
-          o.env [Core::Environment::Ext::ENV_SERVICE, Core::Environment::Ext::ENV_OTEL_SERVICE]
+          # Note: Alias (OTEL_SERVICE_NAME) defined in supported-configurations.json
+          o.env Core::Environment::Ext::ENV_SERVICE
           o.default Core::Environment::Ext::FALLBACK_SERVICE_NAME
 
           # There's a few cases where we don't want to use the fallback service name, so this helper allows us to get a
@@ -655,7 +670,8 @@ module Datadog
         # @return [Hash<String,String>]
         option :tags do |o|
           o.type :hash, nilable: true
-          o.env [Core::Environment::Ext::ENV_TAGS, Core::Environment::Ext::ENV_OTEL_RESOURCE_ATTRIBUTES]
+          # Note: Alias (OTEL_RESOURCE_ATTRIBUTES) defined in supported-configurations.json
+          o.env Core::Environment::Ext::ENV_TAGS
           o.env_parser do |env_value|
             # Parses a string containing key-value pairs and returns a hash.
             # Key-value pairs are delimited by ':' OR `=`, and pairs are separated by whitespace, comma, OR BOTH.
@@ -824,6 +840,7 @@ module Datadog
 
           # Overrides agentless telemetry URL. To be used internally for testing purposes only.
           #
+          # @default `DD_TELEMETRY_AGENTLESS_URL` environment variable, otherwise `nil`.
           # @return [String]
           # @!visibility private
           option :agentless_url_override do |o|
@@ -999,6 +1016,16 @@ module Datadog
           end
         end
 
+        # Enable experimental process tags propagation such that payloads like spans contain the process tag.
+        #
+        # @default `DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED` environment variable, otherwise `false`
+        # @return [Boolean]
+        option :experimental_propagate_process_tags_enabled do |o|
+          o.env 'DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED'
+          o.default false
+          o.type :bool
+        end
+
         # Tracer specific configuration starting with APM (e.g. DD_APM_TRACING_ENABLED).
         # @public_api
         settings :apm do
@@ -1026,6 +1053,8 @@ module Datadog
         # TODO: Tracing should manage its own settings.
         #       Keep this extension here for now to keep things working.
         extend Datadog::Tracing::Configuration::Settings
+
+        extend Datadog::OpenTelemetry::Configuration::Settings
       end
       # standard:enable Metrics/BlockLength
     end

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

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
+require_relative '../utils/only_once'
+
 module Datadog
   module Core
     module Configuration
       # Import config from config files (fleet automation)
       module StableConfig
+        LOG_ONLY_ONCE = Utils::OnlyOnce.new
+
         def self.extract_configuration
           if (libdatadog_api_failure = Datadog::Core::LIBDATADOG_API_FAILURE)
             Datadog.config_init_logger.debug("Cannot enable stable config: #{libdatadog_api_failure}")
@@ -16,6 +20,12 @@ module Datadog
         def self.configuration
           @configuration ||= StableConfig.extract_configuration
         end
+
+        def self.log_result(logger)
+          LOG_ONLY_ONCE.run do
+            logger.debug(configuration[:logs]) if configuration[:logs]
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,373 @@
+# frozen_string_literal: true
+
+require 'set'
+
+# This file is auto-generated from `supported-configurations.json` by `rake local_config_map:generate`.
+# Do not change manually! Please refer to `docs/AccessEnvironmentVariables.md` for more information.
+
+module Datadog
+  module Core
+    module Configuration
+      SUPPORTED_CONFIGURATION_NAMES =
+        Set["DD_AGENT_HOST",
+          "DD_AI_GUARD_ENABLED",
+          "DD_AI_GUARD_ENDPOINT",
+          "DD_AI_GUARD_MAX_CONTENT_SIZE",
+          "DD_AI_GUARD_MAX_MESSAGES_LENGTH",
+          "DD_AI_GUARD_TIMEOUT",
+          "DD_API_KEY",
+          "DD_API_SECURITY_ENABLED",
+          "DD_API_SECURITY_ENDPOINT_COLLECTION_ENABLED",
+          "DD_API_SECURITY_REQUEST_SAMPLE_RATE",
+          "DD_API_SECURITY_SAMPLE_DELAY",
+          "DD_APM_TRACING_ENABLED",
+          "DD_APPSEC_AUTOMATED_USER_EVENTS_TRACKING",
+          "DD_APPSEC_AUTO_USER_INSTRUMENTATION_MODE",
+          "DD_APPSEC_ENABLED",
+          "DD_APPSEC_HTTP_BLOCKED_TEMPLATE_HTML",
+          "DD_APPSEC_HTTP_BLOCKED_TEMPLATE_JSON",
+          "DD_APPSEC_HTTP_BLOCKED_TEMPLATE_TEXT",
+          "DD_APPSEC_MAX_STACK_TRACES",
+          "DD_APPSEC_MAX_STACK_TRACE_DEPTH",
+          "DD_APPSEC_MAX_STACK_TRACE_DEPTH_TOP_PERCENT",
+          "DD_APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP",
+          "DD_APPSEC_OBFUSCATION_PARAMETER_VALUE_REGEXP",
+          "DD_APPSEC_RASP_ENABLED",
+          "DD_APPSEC_RULES",
+          "DD_APPSEC_SCA_ENABLED",
+          "DD_APPSEC_STACK_TRACE_ENABLED",
+          "DD_APPSEC_TRACE_RATE_LIMIT",
+          "DD_APPSEC_WAF_DEBUG",
+          "DD_APPSEC_WAF_TIMEOUT",
+          "DD_APP_KEY",
+          "DD_CRASHTRACKING_ENABLED",
+          "DD_DATA_STREAMS_ENABLED",
+          "DD_DBM_PROPAGATION_MODE",
+          "DD_DISABLE_DATADOG_RAILS",
+          "DD_DYNAMIC_INSTRUMENTATION_ENABLED",
+          "DD_DYNAMIC_INSTRUMENTATION_PROBE_FILE",
+          "DD_DYNAMIC_INSTRUMENTATION_REDACTED_IDENTIFIERS",
+          "DD_DYNAMIC_INSTRUMENTATION_REDACTED_TYPES",
+          "DD_ENV",
+          "DD_ERROR_TRACKING_HANDLED_ERRORS",
+          "DD_ERROR_TRACKING_HANDLED_ERRORS_INCLUDE",
+          "DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED",
+          "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED",
+          "DD_EXTERNAL_ENV",
+          "DD_GIT_COMMIT_SHA",
+          "DD_GIT_REPOSITORY_URL",
+          "DD_HEALTH_METRICS_ENABLED",
+          "DD_INJECTION_ENABLED",
+          "DD_INJECT_FORCE",
+          "DD_INSTRUMENTATION_INSTALL_ID",
+          "DD_INSTRUMENTATION_INSTALL_TIME",
+          "DD_INSTRUMENTATION_INSTALL_TYPE",
+          "DD_INSTRUMENTATION_TELEMETRY_ENABLED",
+          "DD_LOGS_INJECTION",
+          "DD_METRICS_OTEL_ENABLED",
+          "DD_METRIC_AGENT_PORT",
+          "DD_PROFILING_ALLOCATION_ENABLED",
+          "DD_PROFILING_DIR_INTERRUPTION_WORKAROUND_ENABLED",
+          "DD_PROFILING_ENABLED",
+          "DD_PROFILING_ENDPOINT_COLLECTION_ENABLED",
+          "DD_PROFILING_EXPERIMENTAL_HEAP_ENABLED",
+          "DD_PROFILING_EXPERIMENTAL_HEAP_SAMPLE_RATE",
+          "DD_PROFILING_EXPERIMENTAL_HEAP_SIZE_ENABLED",
+          "DD_PROFILING_GC_ENABLED",
+          "DD_PROFILING_GVL_ENABLED",
+          "DD_PROFILING_HEAP_CLEAN_AFTER_GC_ENABLED",
+          "DD_PROFILING_MAX_FRAMES",
+          "DD_PROFILING_NATIVE_FILENAMES_ENABLED",
+          "DD_PROFILING_NO_SIGNALS_WORKAROUND_ENABLED",
+          "DD_PROFILING_OVERHEAD_TARGET_PERCENTAGE",
+          "DD_PROFILING_PREVIEW_OTEL_CONTEXT_ENABLED",
+          "DD_PROFILING_SIGHANDLER_SAMPLING_ENABLED",
+          "DD_PROFILING_SKIP_MYSQL2_CHECK",
+          "DD_PROFILING_TIMELINE_ENABLED",
+          "DD_PROFILING_UPLOAD_PERIOD",
+          "DD_PROFILING_UPLOAD_TIMEOUT",
+          "DD_REDIS_COMMAND_ARGS",
+          "DD_REMOTE_CONFIGURATION_ENABLED",
+          "DD_REMOTE_CONFIG_BOOT_TIMEOUT_SECONDS",
+          "DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS",
+          "DD_RODA_ANALYTICS_ENABLED",
+          "DD_RODA_ANALYTICS_SAMPLE_RATE",
+          "DD_RUNTIME_METRICS_ENABLED",
+          "DD_RUNTIME_METRICS_RUNTIME_ID_ENABLED",
+          "DD_SERVICE",
+          "DD_SITE",
+          "DD_SPAN_SAMPLING_RULES",
+          "DD_SPAN_SAMPLING_RULES_FILE",
+          "DD_TAGS",
+          "DD_TELEMETRY_AGENTLESS_URL",
+          "DD_TELEMETRY_DEPENDENCY_COLLECTION_ENABLED",
+          "DD_TELEMETRY_HEARTBEAT_INTERVAL",
+          "DD_TELEMETRY_LOG_COLLECTION_ENABLED",
+          "DD_TELEMETRY_METRICS_AGGREGATION_INTERVAL",
+          "DD_TELEMETRY_METRICS_ENABLED",
+          "DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED",
+          "DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED",
+          "DD_TRACE_ACTION_CABLE_ANALYTICS_ENABLED",
+          "DD_TRACE_ACTION_CABLE_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_ACTION_CABLE_ENABLED",
+          "DD_TRACE_ACTION_MAILER_ANALYTICS_ENABLED",
+          "DD_TRACE_ACTION_MAILER_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_ACTION_MAILER_ENABLED",
+          "DD_TRACE_ACTION_PACK_ANALYTICS_ENABLED",
+          "DD_TRACE_ACTION_PACK_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_ACTION_PACK_ENABLED",
+          "DD_TRACE_ACTION_VIEW_ANALYTICS_ENABLED",
+          "DD_TRACE_ACTION_VIEW_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_ACTION_VIEW_ENABLED",
+          "DD_TRACE_ACTIVE_JOB_ANALYTICS_ENABLED",
+          "DD_TRACE_ACTIVE_JOB_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_ACTIVE_JOB_ENABLED",
+          "DD_TRACE_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_ENABLED",
+          "DD_TRACE_ACTIVE_MODEL_SERIALIZERS_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_ACTIVE_MODEL_SERIALIZERS_ENABLED",
+          "DD_TRACE_ACTIVE_RECORD_ANALYTICS_ENABLED",
+          "DD_TRACE_ACTIVE_RECORD_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_ACTIVE_RECORD_ENABLED",
+          "DD_TRACE_ACTIVE_SUPPORT_ANALYTICS_ENABLED",
+          "DD_TRACE_ACTIVE_SUPPORT_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_ACTIVE_SUPPORT_ENABLED",
+          "DD_TRACE_AGENT_PORT",
+          "DD_TRACE_AGENT_TIMEOUT_SECONDS",
+          "DD_TRACE_AGENT_URL",
+          "DD_TRACE_ANALYTICS_ENABLED",
+          "DD_TRACE_AWS_ANALYTICS_ENABLED",
+          "DD_TRACE_AWS_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_AWS_ENABLED",
+          "DD_TRACE_AWS_PEER_SERVICE",
+          "DD_TRACE_AWS_SERVICE_NAME",
+          "DD_TRACE_BAGGAGE_TAG_KEYS",
+          "DD_TRACE_CLIENT_IP_ENABLED",
+          "DD_TRACE_CLIENT_IP_HEADER",
+          "DD_TRACE_CONCURRENT_RUBY_ENABLED",
+          "DD_TRACE_DALLI_ANALYTICS_ENABLED",
+          "DD_TRACE_DALLI_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_DALLI_ENABLED",
+          "DD_TRACE_DALLI_PEER_SERVICE",
+          "DD_TRACE_DALLI_SERVICE_NAME",
+          "DD_TRACE_DEBUG",
+          "DD_TRACE_DELAYED_JOB_ANALYTICS_ENABLED",
+          "DD_TRACE_DELAYED_JOB_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_DELAYED_JOB_ENABLED",
+          "DD_TRACE_ELASTICSEARCH_ANALYTICS_ENABLED",
+          "DD_TRACE_ELASTICSEARCH_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_ELASTICSEARCH_ENABLED",
+          "DD_TRACE_ELASTICSEARCH_PEER_SERVICE",
+          "DD_TRACE_ELASTICSEARCH_SERVICE_NAME",
+          "DD_TRACE_ENABLED",
+          "DD_TRACE_ETHON_ANALYTICS_ENABLED",
+          "DD_TRACE_ETHON_ANALYTICS_SAMPLE_RATE",
+          "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_ENABLED",
+          "DD_TRACE_EXCON_ERROR_STATUS_CODES",
+          "DD_TRACE_EXCON_PEER_SERVICE",
+          "DD_TRACE_EXCON_SERVICE_NAME",
+          "DD_TRACE_EXPERIMENTAL_RUNTIME_ID_ENABLED",
+          "DD_TRACE_FARADAY_ANALYTICS_ENABLED",
+          "DD_TRACE_FARADAY_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_FARADAY_ENABLED",
+          "DD_TRACE_FARADAY_ERROR_STATUS_CODES",
+          "DD_TRACE_FARADAY_PEER_SERVICE",
+          "DD_TRACE_FARADAY_SERVICE_NAME",
+          "DD_TRACE_GRAPE_ANALYTICS_ENABLED",
+          "DD_TRACE_GRAPE_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_GRAPE_ENABLED",
+          "DD_TRACE_GRAPE_ERROR_STATUS_CODES",
+          "DD_TRACE_GRAPHQL_ANALYTICS_ENABLED",
+          "DD_TRACE_GRAPHQL_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_GRAPHQL_ENABLED",
+          "DD_TRACE_GRAPHQL_ERROR_EXTENSIONS",
+          "DD_TRACE_GRAPHQL_ERROR_TRACKING",
+          "DD_TRACE_GRAPHQL_WITH_UNIFIED_TRACER",
+          "DD_TRACE_GRPC_ANALYTICS_ENABLED",
+          "DD_TRACE_GRPC_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_GRPC_ENABLED",
+          "DD_TRACE_GRPC_PEER_SERVICE",
+          "DD_TRACE_GRPC_SERVICE_NAME",
+          "DD_TRACE_HANAMI_ENABLED",
+          "DD_TRACE_HEADER_TAGS",
+          "DD_TRACE_HTTPCLIENT_ANALYTICS_ENABLED",
+          "DD_TRACE_HTTPCLIENT_ANALYTICS_SAMPLE_RATE",
+          "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_ENABLED",
+          "DD_TRACE_HTTPRB_ERROR_STATUS_CODES",
+          "DD_TRACE_HTTPRB_PEER_SERVICE",
+          "DD_TRACE_HTTPRB_SERVICE_NAME",
+          "DD_TRACE_HTTP_ANALYTICS_ENABLED",
+          "DD_TRACE_HTTP_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_HTTP_CLIENT_ERROR_STATUSES",
+          "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_ENABLED",
+          "DD_TRACE_LOGRAGE_ENABLED",
+          "DD_TRACE_MEMCACHED_COMMAND_ENABLED",
+          "DD_TRACE_MONGO_ANALYTICS_ENABLED",
+          "DD_TRACE_MONGO_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_MONGO_ENABLED",
+          "DD_TRACE_MONGO_JSON_COMMAND",
+          "DD_TRACE_MONGO_PEER_SERVICE",
+          "DD_TRACE_MONGO_SERVICE_NAME",
+          "DD_TRACE_MYSQL2_ANALYTICS_ENABLED",
+          "DD_TRACE_MYSQL2_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_MYSQL2_ENABLED",
+          "DD_TRACE_MYSQL2_PEER_SERVICE",
+          "DD_TRACE_MYSQL2_SERVICE_NAME",
+          "DD_TRACE_NATIVE_SPAN_EVENTS",
+          "DD_TRACE_NET_HTTP_PEER_SERVICE",
+          "DD_TRACE_NET_HTTP_SERVICE_NAME",
+          "DD_TRACE_OPENSEARCH_ANALYTICS_ENABLED",
+          "DD_TRACE_OPENSEARCH_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_OPENSEARCH_ENABLED",
+          "DD_TRACE_OPENSEARCH_PEER_SERVICE",
+          "DD_TRACE_OPENSEARCH_RESOURCE_PATTERN",
+          "DD_TRACE_OPENSEARCH_SERVICE_NAME",
+          "DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED",
+          "DD_TRACE_PEER_SERVICE_MAPPING",
+          "DD_TRACE_PG_ANALYTICS_ENABLED",
+          "DD_TRACE_PG_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_PG_ENABLED",
+          "DD_TRACE_PG_PEER_SERVICE",
+          "DD_TRACE_PG_SERVICE_NAME",
+          "DD_TRACE_PRESTO_ANALYTICS_ENABLED",
+          "DD_TRACE_PRESTO_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_PRESTO_ENABLED",
+          "DD_TRACE_PRESTO_PEER_SERVICE",
+          "DD_TRACE_PRESTO_SERVICE_NAME",
+          "DD_TRACE_PROPAGATION_EXTRACT_FIRST",
+          "DD_TRACE_PROPAGATION_STYLE",
+          "DD_TRACE_PROPAGATION_STYLE_EXTRACT",
+          "DD_TRACE_PROPAGATION_STYLE_INJECT",
+          "DD_TRACE_QUE_ANALYTICS_ENABLED",
+          "DD_TRACE_QUE_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_QUE_ENABLED",
+          "DD_TRACE_QUE_TAG_ARGS_ENABLED",
+          "DD_TRACE_QUE_TAG_DATA_ENABLED",
+          "DD_TRACE_RACECAR_ANALYTICS_ENABLED",
+          "DD_TRACE_RACECAR_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_RACECAR_ENABLED",
+          "DD_TRACE_RACK_ANALYTICS_ENABLED",
+          "DD_TRACE_RACK_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_RACK_ENABLED",
+          "DD_TRACE_RAILS_ANALYTICS_ENABLED",
+          "DD_TRACE_RAILS_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_RAILS_ENABLED",
+          "DD_TRACE_RAKE_ANALYTICS_ENABLED",
+          "DD_TRACE_RAKE_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_RAKE_ENABLED",
+          "DD_TRACE_RATE_LIMIT",
+          "DD_TRACE_REDIS_ANALYTICS_ENABLED",
+          "DD_TRACE_REDIS_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_REDIS_ENABLED",
+          "DD_TRACE_REDIS_PEER_SERVICE",
+          "DD_TRACE_REDIS_SERVICE_NAME",
+          "DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED",
+          "DD_TRACE_REPORT_HOSTNAME",
+          "DD_TRACE_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT",
+          "DD_TRACE_RESOURCE_RENAMING_ENABLED",
+          "DD_TRACE_RESQUE_ANALYTICS_ENABLED",
+          "DD_TRACE_RESQUE_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_RESQUE_ENABLED",
+          "DD_TRACE_REST_CLIENT_ANALYTICS_ENABLED",
+          "DD_TRACE_REST_CLIENT_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_REST_CLIENT_ENABLED",
+          "DD_TRACE_REST_CLIENT_PEER_SERVICE",
+          "DD_TRACE_REST_CLIENT_SERVICE_NAME",
+          "DD_TRACE_RODA_ENABLED",
+          "DD_TRACE_SAMPLE_RATE",
+          "DD_TRACE_SAMPLING_RULES",
+          "DD_TRACE_SEMANTIC_LOGGER_ENABLED",
+          "DD_TRACE_SEQUEL_ANALYTICS_ENABLED",
+          "DD_TRACE_SEQUEL_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_SEQUEL_ENABLED",
+          "DD_TRACE_SHORYUKEN_ANALYTICS_ENABLED",
+          "DD_TRACE_SHORYUKEN_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_SHORYUKEN_ENABLED",
+          "DD_TRACE_SIDEKIQ_ANALYTICS_ENABLED",
+          "DD_TRACE_SIDEKIQ_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_SIDEKIQ_ENABLED",
+          "DD_TRACE_SINATRA_ANALYTICS_ENABLED",
+          "DD_TRACE_SINATRA_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_SINATRA_ENABLED",
+          "DD_TRACE_SNEAKERS_ANALYTICS_ENABLED",
+          "DD_TRACE_SNEAKERS_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_SNEAKERS_ENABLED",
+          "DD_TRACE_STARTUP_LOGS",
+          "DD_TRACE_STRIPE_ANALYTICS_ENABLED",
+          "DD_TRACE_STRIPE_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_STRIPE_ENABLED",
+          "DD_TRACE_SUCKER_PUNCH_ANALYTICS_ENABLED",
+          "DD_TRACE_SUCKER_PUNCH_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_SUCKER_PUNCH_ENABLED",
+          "DD_TRACE_TEST_MODE_ENABLED",
+          "DD_TRACE_TRILOGY_ANALYTICS_ENABLED",
+          "DD_TRACE_TRILOGY_ANALYTICS_SAMPLE_RATE",
+          "DD_TRACE_TRILOGY_ENABLED",
+          "DD_TRACE_TRILOGY_PEER_SERVICE",
+          "DD_TRACE_TRILOGY_SERVICE_NAME",
+          "DD_TRACE_WATERDROP_ENABLED",
+          "DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH",
+          "DD_VERSION",
+          "OTEL_EXPORTER_OTLP_ENDPOINT",
+          "OTEL_EXPORTER_OTLP_HEADERS",
+          "OTEL_EXPORTER_OTLP_METRICS_ENDPOINT",
+          "OTEL_EXPORTER_OTLP_METRICS_HEADERS",
+          "OTEL_EXPORTER_OTLP_METRICS_PROTOCOL",
+          "OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE",
+          "OTEL_EXPORTER_OTLP_METRICS_TIMEOUT",
+          "OTEL_EXPORTER_OTLP_PROTOCOL",
+          "OTEL_EXPORTER_OTLP_TIMEOUT",
+          "OTEL_LOG_LEVEL",
+          "OTEL_METRICS_EXPORTER",
+          "OTEL_METRIC_EXPORT_INTERVAL",
+          "OTEL_METRIC_EXPORT_TIMEOUT",
+          "OTEL_PROPAGATORS",
+          "OTEL_RESOURCE_ATTRIBUTES",
+          "OTEL_SERVICE_NAME",
+          "OTEL_TRACES_EXPORTER",
+          "OTEL_TRACES_SAMPLER",
+          "OTEL_TRACES_SAMPLER_ARG"].freeze
+
+      ALIASES =
+        {"DD_DISABLE_DATADOG_RAILS" => ["DISABLE_DATADOG_RAILS"],
+         "DD_PROFILING_GVL_ENABLED" => ["DD_PROFILING_PREVIEW_GVL_ENABLED"],
+         "DD_RUNTIME_METRICS_RUNTIME_ID_ENABLED" => ["DD_TRACE_EXPERIMENTAL_RUNTIME_ID_ENABLED"],
+         "DD_SERVICE" => ["OTEL_SERVICE_NAME"],
+         "DD_TAGS" => ["OTEL_RESOURCE_ATTRIBUTES"],
+         "DD_TRACE_DEBUG" => ["OTEL_LOG_LEVEL"],
+         "DD_TRACE_ENABLED" => ["OTEL_TRACES_EXPORTER"],
+         "DD_TRACE_PROPAGATION_STYLE" => ["OTEL_PROPAGATORS"],
+         "DD_TRACE_SAMPLE_RATE" => ["OTEL_TRACES_SAMPLER"]}.freeze
+
+      DEPRECATIONS =
+        Set["DD_PROFILING_PREVIEW_GVL_ENABLED", "DISABLE_DATADOG_RAILS"]
+
+      ALIAS_TO_CANONICAL =
+        {"DD_PROFILING_PREVIEW_GVL_ENABLED" => "DD_PROFILING_GVL_ENABLED",
+         "DD_TRACE_EXPERIMENTAL_RUNTIME_ID_ENABLED" => "DD_RUNTIME_METRICS_RUNTIME_ID_ENABLED",
+         "DISABLE_DATADOG_RAILS" => "DD_DISABLE_DATADOG_RAILS",
+         "OTEL_LOG_LEVEL" => "DD_TRACE_DEBUG",
+         "OTEL_PROPAGATORS" => "DD_TRACE_PROPAGATION_STYLE",
+         "OTEL_RESOURCE_ATTRIBUTES" => "DD_TAGS",
+         "OTEL_SERVICE_NAME" => "DD_SERVICE",
+         "OTEL_TRACES_EXPORTER" => "DD_TRACE_ENABLED",
+         "OTEL_TRACES_SAMPLER" => "DD_TRACE_SAMPLE_RATE"}.freeze
+    end
+  end
+end

data/lib/datadog/core/configuration.rb

@@ -238,7 +238,7 @@ module Datadog
           yield write_components
         rescue ThreadError => e
           logger_without_components.error(
-            'Detected deadlock during datadog initialization. ' \
+            "Detected deadlock during datadog initialization: #{e.class}: #{e}. " \
             'Please report this at https://github.com/datadog/dd-trace-rb/blob/master/CONTRIBUTING.md#found-a-bug' \
             "\n\tSource:\n\t#{Array(e.backtrace).join("\n\t")}"
           )
@@ -295,7 +295,7 @@ module Datadog
         # such as reading stable config. In this case we cannot access configuration.
 
         @temp_config_logger ||= begin
-          debug_env_value = ENV[Ext::Diagnostics::ENV_DEBUG_ENABLED]&.strip&.downcase
+          debug_env_value = DATADOG_ENV[Ext::Diagnostics::ENV_DEBUG_ENABLED]&.strip&.downcase
           debug_value = debug_env_value == 'true' || debug_env_value == '1'
 
           logger = Core::Logger.new($stdout)

data/lib/datadog/core/ddsketch.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Core
+    # Used to access ddsketch APIs.
+    # APIs in this class are implemented as native code.
+    class DDSketch
+      def self.supported?
+        Datadog::Core::LIBDATADOG_API_FAILURE.nil?
+      end
+
+      def initialize
+        unless self.class.supported?
+          raise(ArgumentError, "DDSketch is not supported: #{Datadog::Core::LIBDATADOG_API_FAILURE}")
+        end
+      end
+    end
+  end
+end

data/lib/datadog/core/deprecations.rb

@@ -14,10 +14,10 @@ module Datadog
       # @yieldreturn [String] a String with the lazily evaluated deprecation message.
       # @param [Boolean] disallowed_next_major whether this deprecation will be enforced in the next major release.
       # @param [Object] key A unique key for the deprecation. Only the first message with the same key will be logged.
-      def log_deprecation(disallowed_next_major: true, key: nil)
+      def log_deprecation(disallowed_next_major: true, key: nil, logger: Datadog.logger)
         return unless log_deprecation?(key)
 
-        Datadog.logger.warn do
+        logger.warn do
           message = yield
           message += ' This will be enforced in the next major release.' if disallowed_next_major
           message

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

@@ -10,40 +10,67 @@ module Datadog
       # about the current Linux container identity.
       # @see https://man7.org/linux/man-pages/man7/cgroups.7.html
       module Cgroup
-        LINE_REGEX = /^(\d+):([^:]*):(.+)$/.freeze
-
-        Descriptor = Struct.new(
-          :id,
-          :groups,
+        # A parsed cgroup entry from /proc/<pid>/cgroup
+        Entry = Struct.new(
+          :hierarchy,
+          :controllers,
           :path,
-          :controllers
+          :inode
         )
 
         module_function
 
-        def descriptors(process = 'self')
-          [].tap do |descriptors|
-            filepath = "/proc/#{process}/cgroup"
-
-            if File.exist?(filepath)
-              File.foreach("/proc/#{process}/cgroup") do |line|
-                line = line.strip
-                descriptors << parse(line) unless line.empty?
-              end
-            end
-          rescue => e
-            Datadog.logger.error(
-              "Error while parsing cgroup. Cause: #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}"
-            )
+        # Parses the /proc/self/cgroup file,
+        # @return [Array<Entry>] one entry for each valid cgroup line
+        def entries
+          filepath = '/proc/self/cgroup'
+          return [] unless File.exist?(filepath)
+
+          ret = []
+          File.foreach(filepath) do |entry_line|
+            ret << parse(entry_line) unless entry_line.empty?
           end
+          ret
         end
 
-        def parse(line)
-          id, groups, path = line.scan(LINE_REGEX).first
+        # Parses a single cgroup entry from /proc/<pid>/cgroup.
+        #
+        # Files can have cgroup v1 and v2 entries mixed. Their format is the same.
+        #
+        # Each entry has 3 colon-separated fields:
+        #   hierarchy-ID:controllers:path
+        # Examples:
+        #   10:memory:/docker/1234567890abcdef (cgroup v1)
+        #   0::/docker/1234567890abcdef (cgroup v2)
+        #
+        # @see https://man7.org/linux/man-pages/man7/cgroups.7.html#:~:text=%2Fproc%2Fpid%2Fcgroup
+        # @return [Entry]
+        def parse(entry_line)
+          hierarchy, controllers, path = entry_line.split(':', 3)
 
-          Descriptor.new(id, groups, path).tap do |descriptor|
-            descriptor.controllers = groups.split(',') unless groups.nil?
-          end
+          Entry.new(
+            hierarchy,
+            controllers,
+            path,
+            inode_for(controllers, path)
+          )
+        end
+
+        # We can find the container inode by running a file stat on the cgroup filesystem path.
+        # Example:
+        #   For the entry `0:cpu:/docker/abc123`,
+        #   we read `stat -c '%i' /sys/fs/cgroup/cpu/docker/abc123`
+        def inode_for(controllers, path)
+          return if controllers.nil? || path.nil?
+
+          # In cgroup v1, when multiple controllers are co-mounted, the controllers
+          # becomes part of the directory name (with commas preserved).
+          # Example entry:
+          #   For the line "10:cpu,cpuacct:/docker/abc123", the path is
+          #   "/sys/fs/cgroup/cpu,cpuacct/docker/abc123"
+          inode_path = File.join('/sys/fs/cgroup', controllers, path)
+
+          File.stat(inode_path).ino if File.exist?(inode_path)
         end
       end
     end