ddtrace 1.0.0 → 1.10.1

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

@@ -1,21 +1,20 @@
-# typed: false
-
 require 'logger'
 
-require 'datadog/core/configuration/base'
-require 'datadog/core/environment/ext'
-require 'datadog/core/runtime/ext'
-require 'datadog/profiling/ext'
-require 'datadog/tracing/configuration/ext'
+require_relative 'base'
+require_relative 'ext'
+require_relative '../environment/ext'
+require_relative '../runtime/ext'
+require_relative '../telemetry/ext'
+require_relative '../../profiling/ext'
+
+require_relative '../../tracing/configuration/settings'
 
 module Datadog
   module Core
     module Configuration
-      # Global configuration settings for the trace library.
+      # Global configuration settings for the Datadog library.
       # @public_api
       # rubocop:disable Metrics/BlockLength
-      # rubocop:disable Metrics/ClassLength
-      # rubocop:disable Layout/LineLength
       class Settings
         include Base
 
@@ -99,7 +98,7 @@ module Datadog
           # @default `DD_TRACE_DEBUG` environment variable, otherwise `false`
           # @return [Boolean]
           option :debug do |o|
-            o.default { env_to_bool(Datadog::Core::Diagnostics::Ext::DD_TRACE_DEBUG, false) }
+            o.default { env_to_bool(Datadog::Core::Configuration::Ext::Diagnostics::ENV_DEBUG_ENABLED, false) }
             o.lazy
             o.on_set do |enabled|
               # Enable rich debug print statements.
@@ -110,7 +109,6 @@ module Datadog
 
           # Internal {Datadog::Statsd} metrics collection.
           #
-          # The list of metrics collected can be found in {Datadog::Core::Diagnostics::Ext::Health::Metrics}.
           # @public_api
           settings :health_metrics do
             # Enable health metrics collection.
@@ -118,7 +116,7 @@ module Datadog
             # @default `DD_HEALTH_METRICS_ENABLED` environment variable, otherwise `false`
             # @return [Boolean]
             option :enabled do |o|
-              o.default { env_to_bool(Datadog::Core::Diagnostics::Ext::Health::Metrics::ENV_ENABLED, false) }
+              o.default { env_to_bool(Datadog::Core::Configuration::Ext::Diagnostics::ENV_HEALTH_METRICS_ENABLED, false) }
               o.lazy
             end
 
@@ -144,7 +142,7 @@ module Datadog
             # @return [Boolean,nil]
             option :enabled do |o|
               # Defaults to nil as we want to know when the default value is being used
-              o.default { env_to_bool(Datadog::Core::Diagnostics::Ext::DD_TRACE_STARTUP_LOGS, nil) }
+              o.default { env_to_bool(Datadog::Core::Configuration::Ext::Diagnostics::ENV_STARTUP_LOGS_ENABLED, nil) }
               o.lazy
             end
           end
@@ -206,10 +204,13 @@ module Datadog
             # This should never be reduced, as it can cause the resulting profiles to become biased.
             # The current default should be enough for most services, allowing 16 threads to be sampled around 30 times
             # per second for a 60 second period.
+            # This setting is ignored when CPU Profiling 2.0 is in use.
             option :max_events, default: 32768
 
             # Controls the maximum number of frames for each thread sampled. Can be tuned to avoid omitted frames in the
             # produced profiles. Increasing this may increase the overhead of profiling.
+            #
+            # @default `DD_PROFILING_MAX_FRAMES` environment variable, otherwise 400
             option :max_frames do |o|
               o.default { env_to_int(Profiling::Ext::ENV_MAX_FRAMES, 400) }
               o.lazy
@@ -230,9 +231,63 @@ module Datadog
               end
             end
 
-            # Disable gathering of names and versions of gems in use by the service, used to power grouping and
-            # categorization of stack traces.
+            # Can be used to disable the gathering of names and versions of gems in use by the service, used to power
+            # grouping and categorization of stack traces.
             option :code_provenance_enabled, default: true
+
+            # No longer does anything, and will be removed on dd-trace-rb 2.0.
+            #
+            # This was added as a temporary support option in case of issues with the new `Profiling::HttpTransport` class
+            # but we're now confident it's working nicely so we've removed the old code path.
+            option :legacy_transport_enabled do |o|
+              o.on_set do
+                Datadog.logger.warn(
+                  'The profiling.advanced.legacy_transport_enabled setting has been deprecated for removal and no ' \
+                  'longer does anything. Please remove it from your Datadog.configure block.'
+                )
+              end
+            end
+
+            # Forces enabling the new CPU Profiling 2.0 profiler (see ddtrace release notes for more details).
+            #
+            # Note that setting this to "false" (or not setting it) will not prevent the new profiler from
+            # being automatically used in the future.
+            # This option will be deprecated for removal once the new profiler gets enabled by default for all customers.
+            option :force_enable_new_profiler do |o|
+              o.default { env_to_bool('DD_PROFILING_FORCE_ENABLE_NEW', false) }
+              o.lazy
+            end
+
+            # Forces enabling of profiling of time/resources spent in Garbage Collection.
+            #
+            # Note that setting this to "false" (or not setting it) will not prevent the feature from being
+            # being automatically enabled in the future.
+            #
+            # This toggle was added because, although this feature is safe and enabled by default on Ruby 2.x,
+            # on Ruby 3.x it can break in applications that make use of Ractors due to two Ruby VM bugs:
+            # https://bugs.ruby-lang.org/issues/19112 AND https://bugs.ruby-lang.org/issues/18464.
+            #
+            # If you use Ruby 3.x and your application does not use Ractors (or if your Ruby has been patched), the
+            # feature is fully safe to enable and this toggle can be used to do so.
+            #
+            # Furthermore, currently this feature can add a lot of overhead for GC-heavy workloads.
+            #
+            # We expect the once the above issues are overcome, we'll automatically enable the feature on fixed Ruby
+            # versions.
+            option :force_enable_gc_profiling do |o|
+              o.default { env_to_bool('DD_PROFILING_FORCE_ENABLE_GC', false) }
+              o.lazy
+            end
+
+            # Can be used to enable/disable the Datadog::Profiling.allocation_count feature.
+            #
+            # This feature is safe and enabled by default on Ruby 2.x, but
+            # on Ruby 3.x it can break in applications that make use of Ractors due to two Ruby VM bugs:
+            # https://bugs.ruby-lang.org/issues/19112 AND https://bugs.ruby-lang.org/issues/18464.
+            #
+            # If you use Ruby 3.x and your application does not use Ractors (or if your Ruby has been patched), the
+            # feature is fully safe to enable and this toggle can be used to do so.
+            option :allocation_counting_enabled, default: RUBY_VERSION.start_with?('2.')
           end
 
           # @public_api
@@ -305,9 +360,9 @@ module Datadog
             tags = {}
 
             # Parse tags from environment
-            env_to_list(Core::Environment::Ext::ENV_TAGS).each do |tag|
-              pair = tag.split(':')
-              tags[pair.first] = pair.last if pair.length == 2
+            env_to_list(Core::Environment::Ext::ENV_TAGS, comma_separated_only: false).each do |tag|
+              key, value = tag.split(':', 2)
+              tags[key] = value if value && !value.empty?
             end
 
             # Override tags if defined
@@ -366,240 +421,6 @@ module Datadog
           end
         end
 
-        # Tracer specific configurations.
-        # @public_api
-        settings :tracing do
-          # Legacy [App Analytics](https://docs.datadoghq.com/tracing/legacy_app_analytics/) configuration.
-          #
-          # @configure_with {Datadog::Tracing}
-          # @deprecated Use [Trace Retention and Ingestion](https://docs.datadoghq.com/tracing/trace_retention_and_ingestion/)
-          #   controls.
-          # @public_api
-          settings :analytics do
-            # @default `DD_TRACE_ANALYTICS_ENABLED` environment variable, otherwise `nil`
-            # @return [Boolean,nil]
-            option :enabled do |o|
-              o.default { env_to_bool(Tracing::Configuration::Ext::Analytics::ENV_TRACE_ANALYTICS_ENABLED, nil) }
-              o.lazy
-            end
-          end
-
-          # [Distributed Tracing](https://docs.datadoghq.com/tracing/setup_overview/setup/ruby/#distributed-tracing) propagation
-          # style configuration.
-          #
-          # The supported formats are:
-          # * `Datadog`: Datadog propagation format, described by [Distributed Tracing](https://docs.datadoghq.com/tracing/setup_overview/setup/ruby/#distributed-tracing).
-          # * `B3`: B3 Propagation using multiple headers, described by [openzipkin/b3-propagation](https://github.com/openzipkin/b3-propagation#multiple-headers).
-          # * `B3 single header`: B3 Propagation using a single header, described by [openzipkin/b3-propagation](https://github.com/openzipkin/b3-propagation#single-header).
-          #
-          # @public_api
-          settings :distributed_tracing do
-            # An ordered list of what data propagation styles the tracer will use to extract distributed tracing propagation
-            # data from incoming requests and messages.
-            #
-            # The tracer will try to find distributed headers in the order they are present in the list provided to this option.
-            # The first format to have valid data present will be used.
-            #
-            # @default `DD_PROPAGATION_STYLE_EXTRACT` environment variable (comma-separated list),
-            #   otherwise `['Datadog','B3','B3 single header']`.
-            # @return [Array<String>]
-            option :propagation_extract_style do |o|
-              o.default do
-                # Look for all headers by default
-                env_to_list(
-                  Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_EXTRACT,
-                  [
-                    Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG,
-                    Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3,
-                    Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_SINGLE_HEADER
-                  ]
-                )
-              end
-
-              o.lazy
-            end
-
-            # The data propagation styles the tracer will use to inject distributed tracing propagation
-            # data into outgoing requests and messages.
-            #
-            # The tracer will inject data from all styles specified in this option.
-            #
-            # @default `DD_PROPAGATION_STYLE_INJECT` environment variable (comma-separated list), otherwise `['Datadog']`.
-            # @return [Array<String>]
-            option :propagation_inject_style do |o|
-              o.default do
-                env_to_list(
-                  Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_INJECT,
-                  [Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG] # Only inject Datadog headers by default
-                )
-              end
-
-              o.lazy
-            end
-          end
-
-          # Enable trace collection and span generation.
-          #
-          # You can use this option to disable tracing without having to
-          # remove the library as a whole.
-          #
-          # @default `DD_TRACE_ENABLED` environment variable, otherwise `true`
-          # @return [Boolean]
-          option :enabled do |o|
-            o.default { env_to_bool(Datadog::Core::Diagnostics::Ext::DD_TRACE_ENABLED, true) }
-            o.lazy
-          end
-
-          # A custom tracer instance.
-          #
-          # It must respect the contract of {Datadog::Tracing::Tracer}.
-          # It's recommended to delegate methods to {Datadog::Tracing::Tracer} to ease the implementation
-          # of a custom tracer.
-          #
-          # This option will not return the live tracer instance: it only holds a custom tracing instance, if any.
-          #
-          # For internal use only.
-          #
-          # @default `nil`
-          # @return [Object,nil]
-          option :instance
-
-          # Automatic correlation between tracing and logging.
-          # @see https://docs.datadoghq.com/tracing/setup_overview/setup/ruby/#trace-correlation
-          # @return [Boolean]
-          option :log_injection do |o|
-            o.default { env_to_bool(Tracing::Configuration::Ext::Correlation::ENV_LOGS_INJECTION_ENABLED, true) }
-            o.lazy
-          end
-
-          # Configures an alternative trace transport behavior, where
-          # traces can be sent to the agent and backend before all spans
-          # have finished.
-          #
-          # This is useful for long-running jobs or very large traces.
-          #
-          # The trace flame graph will display the partial trace as it is received and constantly
-          # update with new spans as they are flushed.
-          # @public_api
-          settings :partial_flush do
-            # Enable partial trace flushing.
-            #
-            # @default `false`
-            # @return [Boolean]
-            option :enabled, default: false
-
-            # Minimum number of finished spans required in a single unfinished trace before
-            # the tracer will consider that trace for partial flushing.
-            #
-            # This option helps preserve a minimum amount of batching in the
-            # flushing process, reducing network overhead.
-            #
-            # This threshold only applies to unfinished traces. Traces that have finished
-            # are always flushed immediately.
-            #
-            # @default 500
-            # @return [Boolean]
-            option :min_spans_threshold, default: 500
-          end
-
-          # Enables {https://docs.datadoghq.com/tracing/trace_retention_and_ingestion/#datadog-intelligent-retention-filter
-          # Datadog intelligent retention filter}.
-          # @default `true`
-          # @return [Boolean,nil]
-          option :priority_sampling
-
-          option :report_hostname do |o|
-            o.default { env_to_bool(Tracing::Configuration::Ext::NET::ENV_REPORT_HOSTNAME, false) }
-            o.lazy
-          end
-
-          # A custom sampler instance.
-          # The object must respect the {Datadog::Tracing::Sampling::Sampler} interface.
-          # @default `nil`
-          # @return [Object,nil]
-          option :sampler
-
-          # Client-side sampling configuration.
-          # @public_api
-          settings :sampling do
-            # Default sampling rate for the tracer.
-            #
-            # If `nil`, the trace uses an automatic sampling strategy that tries to ensure
-            # the collection of traces that are considered important (e.g. traces with an error, traces
-            # for resources not seen recently).
-            #
-            # @default `DD_TRACE_SAMPLE_RATE` environment variable, otherwise `nil`.
-            # @return [Float,nil]
-            option :default_rate do |o|
-              o.default { env_to_float(Tracing::Configuration::Ext::Sampling::ENV_SAMPLE_RATE, nil) }
-              o.lazy
-            end
-
-            # Rate limit for number of spans per second.
-            #
-            # Spans created above the limit will contribute to service metrics, but won't
-            # have their payload stored.
-            #
-            # @default `DD_TRACE_RATE_LIMIT` environment variable, otherwise 100.
-            # @return [Numeric,nil]
-            option :rate_limit do |o|
-              o.default { env_to_float(Tracing::Configuration::Ext::Sampling::ENV_RATE_LIMIT, 100) }
-              o.lazy
-            end
-          end
-
-          # [Continuous Integration Visibility](https://docs.datadoghq.com/continuous_integration/) configuration.
-          # @public_api
-          settings :test_mode do
-            # Enable test mode. This allows the tracer to collect spans from test runs.
-            #
-            # It also prevents the tracer from collecting spans in a production environment. Only use in a test environment.
-            #
-            # @default `DD_TRACE_TEST_MODE_ENABLED` environment variable, otherwise `false`
-            # @return [Boolean]
-            option :enabled do |o|
-              o.default { env_to_bool(Tracing::Configuration::Ext::Test::ENV_MODE_ENABLED, false) }
-              o.lazy
-            end
-
-            option :trace_flush do |o|
-              o.default { nil }
-              o.lazy
-            end
-
-            option :writer_options do |o|
-              o.default { {} }
-              o.lazy
-            end
-          end
-
-          # @see file:docs/GettingStarted.md#configuring-the-transport-layer Configuring the transport layer
-          #
-          # A {Proc} that configures a custom tracer transport.
-          # @yield Receives a {Datadog::Transport::HTTP} that can be modified with custom adapters and settings.
-          # @yieldparam [Datadog::Transport::HTTP] t transport to be configured.
-          # @default `nil`
-          # @return [Proc,nil]
-          option :transport_options, default: nil
-
-          # A custom writer instance.
-          # The object must respect the {Datadog::Tracing::Writer} interface.
-          #
-          # This option is recommended for internal use only.
-          #
-          # @default `nil`
-          # @return [Object,nil]
-          option :writer
-
-          # A custom {Hash} with keyword options to be passed to {Datadog::Tracing::Writer#initialize}.
-          #
-          # This option is recommended for internal use only.
-          #
-          # @default `{}`
-          # @return [Hash,nil]
-          option :writer_options, default: ->(_i) { {} }, lazy: true
-        end
-
         # The `version` tag in Datadog. Use it to enable [Deployment Tracking](https://docs.datadoghq.com/tracing/deployment_tracking/).
         # @see https://docs.datadoghq.com/getting_started/tagging/unified_service_tagging
         # @default `DD_VERSION` environment variable, otherwise `nils`
@@ -609,10 +430,26 @@ module Datadog
           o.default { ENV.fetch(Core::Environment::Ext::ENV_VERSION, nil) }
           o.lazy
         end
+
+        # Client-side telemetry configuration
+        # @public_api
+        settings :telemetry do
+          # Enable telemetry collection. This allows telemetry events to be emitted to the telemetry API.
+          #
+          # @default `DD_INSTRUMENTATION_TELEMETRY_ENABLED` environment variable, otherwise `false`. In a future release,
+          #   this value will be changed to `true` by default as documented [here](https://docs.datadoghq.com/tracing/configure_data_security/#telemetry-collection).
+          # @return [Boolean]
+          option :enabled do |o|
+            o.default { env_to_bool(Core::Telemetry::Ext::ENV_ENABLED, false) }
+            o.lazy
+          end
+        end
+
+        # TODO: Tracing should manage its own settings.
+        #       Keep this extension here for now to keep things working.
+        extend Datadog::Tracing::Configuration::Settings
       end
       # rubocop:enable Metrics/BlockLength
-      # rubocop:enable Metrics/ClassLength
-      # rubocop:enable Layout/LineLength
     end
   end
 end

data/lib/datadog/core/configuration.rb

@@ -1,18 +1,13 @@
-# typed: true
-
-require 'forwardable'
-require 'datadog/core/configuration/components'
-require 'datadog/core/configuration/settings'
-require 'datadog/core/logger'
-require 'datadog/core/pin'
+require_relative 'configuration/components'
+require_relative 'configuration/settings'
+require_relative 'telemetry/emitter'
+require_relative 'logger'
+require_relative 'pin'
 
 module Datadog
   module Core
     # Configuration provides a unique access point for configurations
-    module Configuration # rubocop:disable Metrics/ModuleLength
-      include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
-      extend Forwardable
-
+    module Configuration
       # Used to ensure that @components initialization/reconfiguration is performed one-at-a-time, by a single thread.
       #
       # This is important because components can end up being accessed from multiple application threads (for instance on
@@ -91,7 +86,9 @@ module Datadog
             if components?
               replace_components!(configuration, @components)
             else
-              build_components(configuration)
+              components = build_components(configuration)
+              components.telemetry.started!
+              components
             end
           )
         end
@@ -154,9 +151,13 @@ module Datadog
         pin[option] if pin
       end
 
-      def_delegators \
-        :components,
-        :health_metrics
+      # Internal {Datadog::Statsd} metrics collection.
+      #
+      # The list of metrics collected can be found in {Datadog::Core::Diagnostics::Ext::Health::Metrics}.
+      # @public_api
+      def health_metrics
+        components.health_metrics
+      end
 
       def logger
         # avoid initializing components if they didn't already exist

data/lib/datadog/core/diagnostics/environment_logger.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require 'date'
 require 'json'
 require 'rbconfig'
@@ -106,10 +104,14 @@ module Datadog
           Datadog.configuration.version
         end
 
-        # @return [String] target agent URL for trace flushing
+        # @return [String, nil] target agent URL for trace flushing
         def agent_url
           # Retrieve the effect agent URL, regardless of how it was configured
           transport = Tracing.send(:tracer).writer.transport
+
+          # return `nil` with IO transport
+          return unless transport.respond_to?(:client)
+
           adapter = transport.client.api.adapter
           adapter.url
         end
@@ -151,7 +153,7 @@ module Datadog
         def sampling_rules
           sampler = Datadog.configuration.tracing.sampler
           return nil unless sampler.is_a?(Tracing::Sampling::PrioritySampler) &&
-                            sampler.priority_sampler.is_a?(Tracing::Sampling::RuleSampler)
+            sampler.priority_sampler.is_a?(Tracing::Sampling::RuleSampler)
 
           sampler.priority_sampler.rules.map do |rule|
             next unless rule.is_a?(Tracing::Sampling::SimpleRule)
@@ -217,9 +219,9 @@ module Datadog
           !!Datadog.configuration.diagnostics.health_metrics.enabled
         end
 
-        # TODO: Populate when profiling is implemented
-        # def profiling_enabled
-        # end
+        def profiling_enabled
+          !!Datadog.configuration.profiling.enabled
+        end
 
         # TODO: Populate when automatic log correlation is implemented
         # def logs_correlation_enabled
@@ -250,6 +252,7 @@ module Datadog
             partial_flushing_enabled: partial_flushing_enabled,
             priority_sampling_enabled: priority_sampling_enabled,
             health_metrics_enabled: health_metrics_enabled,
+            profiling_enabled: profiling_enabled,
             **instrumented_integrations_settings
           }
         end

data/lib/datadog/core/diagnostics/health.rb

@@ -1,7 +1,5 @@
-# typed: strict
-
-require 'datadog/core/diagnostics/ext'
-require 'datadog/core/metrics/client'
+require_relative '../metrics/client'
+require_relative '../../tracing/diagnostics/health'
 
 module Datadog
   module Core
@@ -10,26 +8,8 @@ module Datadog
       module Health
         # Health metrics for diagnostics
         class Metrics < Core::Metrics::Client
-          count :api_errors, Ext::Health::Metrics::METRIC_API_ERRORS
-          count :api_requests, Ext::Health::Metrics::METRIC_API_REQUESTS
-          count :api_responses, Ext::Health::Metrics::METRIC_API_RESPONSES
-          count :error_context_overflow, Ext::Health::Metrics::METRIC_ERROR_CONTEXT_OVERFLOW
-          count :error_instrumentation_patch, Ext::Health::Metrics::METRIC_ERROR_INSTRUMENTATION_PATCH
-          count :error_span_finish, Ext::Health::Metrics::METRIC_ERROR_SPAN_FINISH
-          count :error_unfinished_spans, Ext::Health::Metrics::METRIC_ERROR_UNFINISHED_SPANS
-          count :instrumentation_patched, Ext::Health::Metrics::METRIC_INSTRUMENTATION_PATCHED
-          count :queue_accepted, Ext::Health::Metrics::METRIC_QUEUE_ACCEPTED
-          count :queue_accepted_lengths, Ext::Health::Metrics::METRIC_QUEUE_ACCEPTED_LENGTHS
-          count :queue_dropped, Ext::Health::Metrics::METRIC_QUEUE_DROPPED
-          count :traces_filtered, Ext::Health::Metrics::METRIC_TRACES_FILTERED
-          count :transport_trace_too_large, Ext::Health::Metrics::METRIC_TRANSPORT_TRACE_TOO_LARGE
-          count :transport_chunked, Ext::Health::Metrics::METRIC_TRANSPORT_CHUNKED
-          count :writer_cpu_time, Ext::Health::Metrics::METRIC_WRITER_CPU_TIME
-
-          gauge :queue_length, Ext::Health::Metrics::METRIC_QUEUE_LENGTH
-          gauge :queue_max_length, Ext::Health::Metrics::METRIC_QUEUE_MAX_LENGTH
-          gauge :queue_spans, Ext::Health::Metrics::METRIC_QUEUE_SPANS
-          gauge :sampling_service_cache_length, Ext::Health::Metrics::METRIC_SAMPLING_SERVICE_CACHE_LENGTH
+          # TODO: Don't reference this. Have tracing add its metrics behavior.
+          extend Tracing::Diagnostics::Health::Metrics
         end
       end
     end

data/lib/datadog/core/encoding.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require 'json'
 require 'msgpack'
 
@@ -10,8 +8,6 @@ module Datadog
       # Encoder interface that provides the logic to encode traces and service
       # @abstract
       module Encoder
-        include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
-
         def content_type
           raise NotImplementedError
         end

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

@@ -1,6 +1,4 @@
-# typed: true
-
-require 'datadog/core/environment/ext'
+require_relative 'ext'
 
 module Datadog
   module Core
@@ -10,8 +8,6 @@ module Datadog
       # about the current Linux container identity.
       # @see https://man7.org/linux/man-pages/man7/cgroups.7.html
       module Cgroup
-        include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
-
         LINE_REGEX = /^(\d+):([^:]*):(.+)$/.freeze
 
         Descriptor = Struct.new(
@@ -35,7 +31,9 @@ module Datadog
                 end
               end
             rescue StandardError => e
-              Datadog.logger.error("Error while parsing cgroup. Cause: #{e.message} Location: #{Array(e.backtrace).first}")
+              Datadog.logger.error(
+                "Error while parsing cgroup. Cause: #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}"
+              )
             end
           end
         end

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Core
     module Environment

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

@@ -1,14 +1,10 @@
-# typed: true
-
-require 'datadog/core/environment/cgroup'
+require_relative 'cgroup'
 
 module Datadog
   module Core
     module Environment
       # For container environments
       module Container
-        include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
-
         UUID_PATTERN = '[0-9a-f]{8}[-_]?[0-9a-f]{4}[-_]?[0-9a-f]{4}[-_]?[0-9a-f]{4}[-_]?[0-9a-f]{12}'.freeze
         CONTAINER_PATTERN = '[0-9a-f]{64}'.freeze
 
@@ -81,7 +77,8 @@ module Datadog
               end
             rescue StandardError => e
               Datadog.logger.error(
-                "Error while parsing container info. Cause: #{e.message} Location: #{Array(e.backtrace).first}"
+                "Error while parsing container info. Cause: #{e.class.name} #{e.message} " \
+                "Location: #{Array(e.backtrace).first}"
               )
             end
           end

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

@@ -1,6 +1,4 @@
-# typed: true
-
-require 'ddtrace/version'
+require_relative '../../../ddtrace/version'
 
 module Datadog
   module Core

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Core
     module Environment

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

@@ -1,9 +1,7 @@
-# typed: false
-
 require 'securerandom'
 
-require 'datadog/core/environment/ext'
-require 'datadog/core/utils/forking'
+require_relative 'ext'
+require_relative '../utils/forking'
 
 module Datadog
   module Core