ddtrace 1.10.0 → 1.11.0.beta1

data/lib/datadog/profiling/component.rb

@@ -2,9 +2,12 @@
 
 module Datadog
   module Profiling
-    # Profiling component
+    # Responsible for wiring up the Profiler for execution
     module Component
-      def build_profiler(settings, agent_settings, tracer)
+      # Passing in a `nil` tracer is supported and will disable the following profiling features:
+      # * Code Hotspots panel in the trace viewer, as well as scoping a profile down to a span
+      # * Endpoint aggregation in the profiler UX, including normalization (resource per endpoint call)
+      def self.build_profiler_component(settings:, agent_settings:, optional_tracer:)
         return unless settings.profiling.enabled
 
         # Workaround for weird dependency direction: the Core::Configuration::Components class currently has a
@@ -61,7 +64,7 @@ module Datadog
 
         # NOTE: Please update the Initialization section of ProfilingDevelopment.md with any changes to this method
 
-        if settings.profiling.advanced.force_enable_new_profiler
+        if enable_new_profiler?(settings)
           print_new_profiler_warnings
 
           recorder = Datadog::Profiling::StackRecorder.new(
@@ -71,18 +74,14 @@ module Datadog
           collector = Datadog::Profiling::Collectors::CpuAndWallTimeWorker.new(
             recorder: recorder,
             max_frames: settings.profiling.advanced.max_frames,
-            tracer: tracer,
-            gc_profiling_enabled: should_enable_gc_profiling?(settings),
+            tracer: optional_tracer,
+            endpoint_collection_enabled: settings.profiling.advanced.endpoint.collection.enabled,
+            gc_profiling_enabled: enable_gc_profiling?(settings),
             allocation_counting_enabled: settings.profiling.advanced.allocation_counting_enabled,
           )
         else
-          trace_identifiers_helper = Profiling::TraceIdentifiers::Helper.new(
-            tracer: tracer,
-            endpoint_collection_enabled: settings.profiling.advanced.endpoint.collection.enabled
-          )
-
           recorder = build_profiler_old_recorder(settings)
-          collector = build_profiler_oldstack_collector(settings, recorder, trace_identifiers_helper)
+          collector = build_profiler_oldstack_collector(settings, recorder, optional_tracer)
         end
 
         exporter = build_profiler_exporter(settings, recorder)
@@ -92,20 +91,23 @@ module Datadog
         Profiling::Profiler.new([collector], scheduler)
       end
 
-      private
-
-      def build_profiler_old_recorder(settings)
+      private_class_method def self.build_profiler_old_recorder(settings)
         Profiling::OldRecorder.new([Profiling::Events::StackSample], settings.profiling.advanced.max_events)
       end
 
-      def build_profiler_exporter(settings, recorder)
+      private_class_method def self.build_profiler_exporter(settings, recorder)
         code_provenance_collector =
           (Profiling::Collectors::CodeProvenance.new if settings.profiling.advanced.code_provenance_enabled)
 
         Profiling::Exporter.new(pprof_recorder: recorder, code_provenance_collector: code_provenance_collector)
       end
 
-      def build_profiler_oldstack_collector(settings, old_recorder, trace_identifiers_helper)
+      private_class_method def self.build_profiler_oldstack_collector(settings, old_recorder, tracer)
+        trace_identifiers_helper = Profiling::TraceIdentifiers::Helper.new(
+          tracer: tracer,
+          endpoint_collection_enabled: settings.profiling.advanced.endpoint.collection.enabled
+        )
+
         Profiling::Collectors::OldStack.new(
           old_recorder,
           trace_identifiers_helper: trace_identifiers_helper,
@@ -113,7 +115,7 @@ module Datadog
         )
       end
 
-      def build_profiler_transport(settings, agent_settings)
+      private_class_method def self.build_profiler_transport(settings, agent_settings)
         settings.profiling.exporter.transport ||
           Profiling::HttpTransport.new(
             agent_settings: agent_settings,
@@ -123,7 +125,7 @@ module Datadog
           )
       end
 
-      def should_enable_gc_profiling?(settings)
+      private_class_method def self.enable_gc_profiling?(settings)
         # See comments on the setting definition for more context on why it exists.
         if settings.profiling.advanced.force_enable_gc_profiling
           if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3')
@@ -139,21 +141,93 @@ module Datadog
         end
       end
 
-      def print_new_profiler_warnings
-        if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6')
+      private_class_method def self.print_new_profiler_warnings
+        return if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6')
+
+        # For more details on the issue, see the "BIG Issue" comment on `gvl_owner` function in
+        # `private_vm_api_access.c`.
+        Datadog.logger.warn(
+          'The new CPU Profiling 2.0 profiler has been force-enabled on a legacy Ruby version (< 2.6). This is not ' \
+          'recommended in production environments, as due to limitations in Ruby APIs, we suspect it may lead to crashes ' \
+          'in very rare situations. Please report any issues you run into to Datadog support or ' \
+          'via <https://github.com/datadog/dd-trace-rb/issues/new>!'
+        )
+      end
+
+      private_class_method def self.enable_new_profiler?(settings)
+        if settings.profiling.advanced.force_enable_legacy_profiler
           Datadog.logger.warn(
-            'New Ruby profiler has been force-enabled. This is a beta feature. Please report any issues ' \
-            'you run into to Datadog support or via <https://github.com/datadog/dd-trace-rb/issues/new>!'
+            'Legacy profiler has been force-enabled via configuration. Do not use unless instructed to by support.'
           )
-        else
-          # For more details on the issue, see the "BIG Issue" comment on `gvl_owner` function in
-          # `private_vm_api_access.c`.
+          return false
+        end
+
+        return true if settings.profiling.advanced.force_enable_new_profiler
+
+        return false if RUBY_VERSION.start_with?('2.3.', '2.4.', '2.5.')
+
+        if Gem.loaded_specs['mysql2'] && incompatible_libmysqlclient_version?(settings)
+          Datadog.logger.warn(
+            'Falling back to legacy profiler because an incompatible version of the mysql2 gem is installed. ' \
+            'Older versions of libmysqlclient (the C ' \
+            'library used by the mysql2 gem) have a bug in their signal handling code that the new profiler can trigger. ' \
+            'This bug (https://bugs.mysql.com/bug.php?id=83109) is fixed in libmysqlclient versions 8.0.0 and above. '
+          )
+          return false
+        end
+
+        if Gem.loaded_specs['rugged']
           Datadog.logger.warn(
-            'New Ruby profiler has been force-enabled on a legacy Ruby version (< 2.6). This is not recommended in ' \
-            'production environments, as due to limitations in Ruby APIs, we suspect it may lead to crashes in very ' \
-            'rare situations. Please report any issues you run into to Datadog support or ' \
-            'via <https://github.com/datadog/dd-trace-rb/issues/new>!'
+            'Falling back to legacy profiler because rugged gem is installed. Some operations on this gem are ' \
+            'currently incompatible with the new CPU Profiling 2.0 profiler, as detailed in ' \
+            '<https://github.com/datadog/dd-trace-rb/issues/2721>. If you still want to try out the new profiler, you ' \
+            'can force-enable it by using the `DD_PROFILING_FORCE_ENABLE_NEW` environment variable or the ' \
+            '`c.profiling.advanced.force_enable_new_profiler` setting.'
           )
+          return false
+        end
+
+        true
+      end
+
+      # Versions of libmysqlclient prior to 8.0.0 are known to have buggy handling of system call interruptions.
+      # The profiler can sometimes cause system call interruptions, and so this combination can cause queries to fail.
+      #
+      # See https://bugs.mysql.com/bug.php?id=83109 and
+      # https://docs.datadoghq.com/profiler/profiler_troubleshooting/ruby/#unexpected-run-time-failures-and-errors-from-ruby-gems-that-use-native-extensions-in-dd-trace-rb-1110
+      # for details.
+      #
+      # The `mysql2` gem's `info` method can be used to determine which `libmysqlclient` version is in use, and thus to
+      # detect if it's safe for the profiler to use signals or if we need to employ a fallback.
+      private_class_method def self.incompatible_libmysqlclient_version?(settings)
+        return true if settings.profiling.advanced.skip_mysql2_check
+
+        Datadog.logger.debug(
+          'Requiring `mysql2` to check if the `libmysqlclient` version it uses is compatible with profiling'
+        )
+
+        begin
+          require 'mysql2'
+
+          return true unless defined?(Mysql2::Client) && Mysql2::Client.respond_to?(:info)
+
+          libmysqlclient_version = Gem::Version.new(Mysql2::Client.info[:version])
+
+          compatible = libmysqlclient_version >= Gem::Version.new('8.0.0')
+
+          Datadog.logger.debug(
+            "The `mysql2` gem is using #{compatible ? 'a compatible' : 'an incompatible'} version of " \
+            "the `libmysqlclient` library (#{libmysqlclient_version})"
+          )
+
+          !compatible
+        rescue StandardError, LoadError => e
+          Datadog.logger.warn(
+            'Failed to probe `mysql2` gem information. ' \
+            "Cause: #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}"
+          )
+
+          true
         end
       end
     end

data/lib/datadog/profiling/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Profiling
     # Describes a sample of some data obtained from the runtime.

data/lib/datadog/profiling/events/stack.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../event'
 
 module Datadog

data/lib/datadog/profiling/ext.rb

@@ -1,41 +1,43 @@
+# frozen_string_literal: true
+
 module Datadog
   module Profiling
     module Ext
-      ENV_ENABLED = 'DD_PROFILING_ENABLED'.freeze
-      ENV_UPLOAD_TIMEOUT = 'DD_PROFILING_UPLOAD_TIMEOUT'.freeze
-      ENV_MAX_FRAMES = 'DD_PROFILING_MAX_FRAMES'.freeze
-      ENV_AGENTLESS = 'DD_PROFILING_AGENTLESS'.freeze
-      ENV_ENDPOINT_COLLECTION_ENABLED = 'DD_PROFILING_ENDPOINT_COLLECTION_ENABLED'.freeze
+      ENV_ENABLED = 'DD_PROFILING_ENABLED'
+      ENV_UPLOAD_TIMEOUT = 'DD_PROFILING_UPLOAD_TIMEOUT'
+      ENV_MAX_FRAMES = 'DD_PROFILING_MAX_FRAMES'
+      ENV_AGENTLESS = 'DD_PROFILING_AGENTLESS'
+      ENV_ENDPOINT_COLLECTION_ENABLED = 'DD_PROFILING_ENDPOINT_COLLECTION_ENABLED'
 
       # TODO: Consider removing this once the Ruby-based pprof encoding is removed and replaced by libdatadog
       module Pprof
-        LABEL_KEY_LOCAL_ROOT_SPAN_ID = 'local root span id'.freeze
-        LABEL_KEY_SPAN_ID = 'span id'.freeze
-        LABEL_KEY_THREAD_ID = 'thread id'.freeze
-        LABEL_KEY_TRACE_ENDPOINT = 'trace endpoint'.freeze
+        LABEL_KEY_LOCAL_ROOT_SPAN_ID = 'local root span id'
+        LABEL_KEY_SPAN_ID = 'span id'
+        LABEL_KEY_THREAD_ID = 'thread id'
+        LABEL_KEY_TRACE_ENDPOINT = 'trace endpoint'
         SAMPLE_VALUE_NO_VALUE = 0
-        VALUE_TYPE_CPU = 'cpu-time'.freeze
-        VALUE_TYPE_WALL = 'wall-time'.freeze
-        VALUE_UNIT_NANOSECONDS = 'nanoseconds'.freeze
+        VALUE_TYPE_CPU = 'cpu-time'
+        VALUE_TYPE_WALL = 'wall-time'
+        VALUE_UNIT_NANOSECONDS = 'nanoseconds'
       end
 
       module Transport
         module HTTP
-          FORM_FIELD_TAG_ENV = 'env'.freeze
-          FORM_FIELD_TAG_HOST = 'host'.freeze
-          FORM_FIELD_TAG_LANGUAGE = 'language'.freeze
-          FORM_FIELD_TAG_PID = 'process_id'.freeze
-          FORM_FIELD_TAG_PROFILER_VERSION = 'profiler_version'.freeze
-          FORM_FIELD_TAG_RUNTIME = 'runtime'.freeze
-          FORM_FIELD_TAG_RUNTIME_ENGINE = 'runtime_engine'.freeze
-          FORM_FIELD_TAG_RUNTIME_ID = 'runtime-id'.freeze
-          FORM_FIELD_TAG_RUNTIME_PLATFORM = 'runtime_platform'.freeze
-          FORM_FIELD_TAG_RUNTIME_VERSION = 'runtime_version'.freeze
-          FORM_FIELD_TAG_SERVICE = 'service'.freeze
-          FORM_FIELD_TAG_VERSION = 'version'.freeze
+          FORM_FIELD_TAG_ENV = 'env'
+          FORM_FIELD_TAG_HOST = 'host'
+          FORM_FIELD_TAG_LANGUAGE = 'language'
+          FORM_FIELD_TAG_PID = 'process_id'
+          FORM_FIELD_TAG_PROFILER_VERSION = 'profiler_version'
+          FORM_FIELD_TAG_RUNTIME = 'runtime'
+          FORM_FIELD_TAG_RUNTIME_ENGINE = 'runtime_engine'
+          FORM_FIELD_TAG_RUNTIME_ID = 'runtime-id'
+          FORM_FIELD_TAG_RUNTIME_PLATFORM = 'runtime_platform'
+          FORM_FIELD_TAG_RUNTIME_VERSION = 'runtime_version'
+          FORM_FIELD_TAG_SERVICE = 'service'
+          FORM_FIELD_TAG_VERSION = 'version'
 
-          PPROF_DEFAULT_FILENAME = 'rubyprofile.pprof'.freeze
-          CODE_PROVENANCE_FILENAME = 'code-provenance.json'.freeze
+          PPROF_DEFAULT_FILENAME = 'rubyprofile.pprof'
+          CODE_PROVENANCE_FILENAME = 'code-provenance.json'
         end
       end
     end

data/lib/datadog/profiling/flush.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Profiling
     # Represents a collection of events of a specific type being flushed.

data/lib/datadog/profiling/native_extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Profiling
     # This module contains classes and methods which are implemented using native code in the

data/lib/datadog/profiling/pprof/message_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../core/utils/object_set'
 
 module Datadog

data/lib/datadog/profiling/pprof/payload.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Profiling
     module Pprof

data/lib/datadog/profiling/pprof/string_table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../core/utils/string_table'
 
 module Datadog

data/lib/datadog/profiling/preload.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../ddtrace'
 
 Datadog::Profiling.start_if_enabled

data/lib/datadog/profiling/scheduler.rb

@@ -118,7 +118,9 @@ module Datadog
         begin
           transport.export(flush)
         rescue StandardError => e
-          Datadog.logger.error("Unable to report profile. Cause: #{e} Location: #{Array(e.backtrace).first}")
+          Datadog.logger.error(
+            "Unable to report profile. Cause: #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}"
+          )
         end
 
         true

data/lib/datadog/profiling/stack_recorder.rb

@@ -48,24 +48,6 @@ module Datadog
         end
       end
 
-      def clear
-        status, result = @no_concurrent_synchronize_mutex.synchronize { self.class._native_clear(self) }
-
-        if status == :ok
-          finish_timestamp = result
-
-          Datadog.logger.debug { "Cleared profile at #{finish_timestamp}" }
-
-          finish_timestamp
-        else
-          error_message = result
-
-          Datadog.logger.error("Failed to clear profiling data: #{error_message}")
-
-          nil
-        end
-      end
-
       def reset_after_fork
         self.class._native_reset_after_fork(self)
       end

data/lib/datadog/profiling/tag_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../core/utils'
 
 module Datadog

data/lib/datadog/profiling/tasks/setup.rb

@@ -11,7 +11,6 @@ module Datadog
         def run
           ACTIVATE_EXTENSIONS_ONLY_ONCE.run do
             begin
-              check_if_cpu_time_profiling_is_supported
               activate_forking_extensions
               setup_at_fork_hooks
             rescue StandardError, ScriptError => e
@@ -38,17 +37,6 @@ module Datadog
           end
         end
 
-        def check_if_cpu_time_profiling_is_supported
-          unsupported = cpu_time_profiling_unsupported_reason
-
-          if unsupported
-            Datadog.logger.info do
-              'CPU time profiling skipped because native CPU time is not supported: ' \
-              "#{unsupported}. Profiles containing 'Wall time' data will still be reported."
-            end
-          end
-        end
-
         def setup_at_fork_hooks
           if Process.respond_to?(:at_fork)
             Process.at_fork(:child) do
@@ -64,20 +52,6 @@ module Datadog
             end
           end
         end
-
-        def cpu_time_profiling_unsupported_reason
-          # NOTE: Only the first matching reason is returned, so try to keep a nice order on reasons
-
-          if RUBY_ENGINE == 'jruby'
-            'JRuby is not supported'
-          elsif RUBY_PLATFORM.include?('darwin')
-            'Feature requires Linux; macOS is not supported'
-          elsif RUBY_PLATFORM =~ /(mswin|mingw)/
-            'Feature requires Linux; Windows is not supported'
-          elsif !RUBY_PLATFORM.include?('linux')
-            "Feature requires Linux; #{RUBY_PLATFORM} is not supported"
-          end
-        end
       end
     end
   end

data/lib/datadog/profiling.rb

@@ -113,6 +113,7 @@ module Datadog
 
     private_class_method def self.protobuf_already_loaded?
       defined?(::Google::Protobuf) && !defined?(::Protobuf)
+      !!(defined?(::Google::Protobuf) && !defined?(::Protobuf))
     end
 
     private_class_method def self.protobuf_failed_to_load?
@@ -157,7 +158,7 @@ module Datadog
       unless success
         if exception
           'There was an error loading the profiling native extension due to ' \
-          "'#{exception.class.name} #{exception.message}' at '#{exception.backtrace.first}'"
+          "'#{exception.class.name} #{exception.message}' at '#{Array(exception.backtrace).first}'"
         else
           'The profiling native extension did not load correctly. ' \
           'For help solving this issue, please contact Datadog support at <https://docs.datadoghq.com/help/>.' \

data/lib/datadog/tracing/analytics.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'metadata/ext'
 
 module Datadog

data/lib/datadog/tracing/client_ip.rb

@@ -1,162 +1,61 @@
+# frozen_string_literal: true
+
 require_relative '../core/configuration'
+require_relative '../core/utils/network'
 require_relative 'metadata/ext'
 require_relative 'span'
 
-require 'ipaddr'
-
 module Datadog
   module Tracing
     # Common functions for supporting the `http.client_ip` span attribute.
     module ClientIp
-      DEFAULT_IP_HEADERS_NAMES = %w[
-        x-forwarded-for
-        x-real-ip
-        x-client-ip
-        x-forwarded
-        x-cluster-client-ip
-        forwarded-for
-        forwarded
-        via
-        true-client-ip
-      ].freeze
-
-      TAG_MULTIPLE_IP_HEADERS = '_dd.multiple-ip-headers'.freeze
-
-      # Sets the `http.client_ip` tag on the given span.
-      #
-      # This function respects the user's settings: if they disable the client IP tagging,
-      #   or provide a different IP header name.
-      #
-      # If multiple IP headers are present in the request, this function will instead set
-      #   the `_dd.multiple-ip-headers` tag with the names of the present headers,
-      #   and **NOT** set the `http.client_ip` tag.
-      #
-      # @param [Span] span The span that's associated with the request.
-      # @param [HeaderCollection, #get, nil] headers A collection with the request headers.
-      # @param [String, nil] remote_ip The remote IP the request associated with the span is sent to.
-      def self.set_client_ip_tag(span, headers: nil, remote_ip: nil)
-        return unless configuration.enabled
-
-        set_client_ip_tag!(span, headers: headers, remote_ip: remote_ip)
-      end
-
-      # Forcefully sets the `http.client_ip` tag on the given span.
-      #
-      # This function ignores the user's `enabled` setting.
-      #
-      # @param [Span] span The span that's associated with the request.
-      # @param [HeaderCollection, #get, nil] headers A collection with the request headers.
-      # @param [String, nil] remote_ip The remote IP the request associated with the span is sent to.
-      def self.set_client_ip_tag!(span, headers: nil, remote_ip: nil)
-        result = raw_ip_from_request(headers, remote_ip)
-
-        if result.raw_ip
-          ip = strip_decorations(result.raw_ip)
-          return unless valid_ip?(ip)
-
-          span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_CLIENT_IP, ip)
-        elsif result.multiple_ip_headers
-          span.set_tag(TAG_MULTIPLE_IP_HEADERS, result.multiple_ip_headers.keys.join(','))
+      class << self
+        # Sets the `http.client_ip` tag on the given span.
+        #
+        # This function respects the user's settings: if they disable the client IP tagging,
+        #   or provide a different IP header name.
+        #
+        # @param [Span] span The span that's associated with the request.
+        # @param [HeaderCollection, #get, nil] headers A collection with the request headers.
+        # @param [String, nil] remote_ip The remote IP the request associated with the span is sent to.
+        def set_client_ip_tag(span, headers: nil, remote_ip: nil)
+          return unless configuration.enabled
+
+          set_client_ip_tag!(span, headers: headers, remote_ip: remote_ip)
         end
-      end
-
-      IpExtractionResult = Struct.new(:raw_ip, :multiple_ip_headers)
-
-      # Returns a result struct that holds the raw client IP associated with the request if it was
-      #   retrieved successfully.
-      #
-      # The client IP is looked up by the following logic:
-      # * If the user has configured a header name, return that header's value.
-      # * If exactly one of the known IP headers is present, return that header's value.
-      # * If none of the known IP headers are present, return the remote IP from the request.
-      #
-      # If more than one of the known IP headers is present, the result will have a `multiple_ip_headers`
-      #   field with the name of the present IP headers.
-      #
-      # @param [Datadog::Core::HeaderCollection, #get, nil] headers The request headers
-      # @param [String] remote_ip The remote IP of the request.
-      # @return [IpExtractionResult] A struct that holds the unprocessed IP value,
-      #   or `nil` if it wasn't found. Additionally, the `multiple_ip_headers` fields will hold the
-      #   name of known IP headers present in the request if more than one of these were found.
-      def self.raw_ip_from_request(headers, remote_ip)
-        return IpExtractionResult.new(headers && headers.get(configuration.header_name), nil) if configuration.header_name
 
-        headers_present = ip_headers(headers)
-
-        case headers_present.size
-        when 0
-          IpExtractionResult.new(remote_ip, nil)
-        when 1
-          IpExtractionResult.new(headers_present.values.first, nil)
-        else
-          IpExtractionResult.new(nil, headers_present)
+        # Forcefully sets the `http.client_ip` tag on the given span.
+        #
+        # This function ignores the user's `enabled` setting.
+        #
+        # @param [Span] span The span that's associated with the request.
+        # @param [HeaderCollection, #get, nil] headers A collection with the request headers.
+        # @param [String, nil] remote_ip The remote IP the request associated with the span is sent to.
+        def set_client_ip_tag!(span, headers: nil, remote_ip: nil)
+          ip = extract_client_ip(headers, remote_ip)
+
+          span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_CLIENT_IP, ip) if ip
         end
-      end
 
-      # Removes any port notations or zone specifiers from the IP address without
-      #   verifying its validity.
-      def self.strip_decorations(address)
-        return strip_ipv4_port(address) if likely_ipv4?(address)
+        def extract_client_ip(headers, remote_ip)
+          if headers && configuration.header_name
+            return Datadog::Core::Utils::Network.stripped_ip_from_request_headers(
+              headers,
+              ip_headers_to_check: Array(configuration.header_name)
+            )
+          end
 
-        address = strip_ipv6_port(address)
-
-        strip_zone_specifier(address)
-      end
+          ip_from_headers = Datadog::Core::Utils::Network.stripped_ip_from_request_headers(headers) if headers
 
-      def self.strip_zone_specifier(ipv6)
-        ipv6.gsub(/%.*/, '')
-      end
-
-      def self.strip_ipv4_port(ip)
-        ip.gsub(/:\d+\z/, '')
-      end
-
-      def self.strip_ipv6_port(ip)
-        if /\[(.*)\](?::\d+)?/ =~ ip
-          Regexp.last_match(1)
-        else
-          ip
+          ip_from_headers || Datadog::Core::Utils::Network.stripped_ip(remote_ip)
         end
-      end
-
-      # Returns whether the given value is more likely to be an IPv4 than an IPv6 address.
-      #
-      # This is done by checking if a dot (`'.'`) character appears before a colon (`':'`) in the value.
-      # The rationale is that in valid IPv6 addresses, colons will always preced dots,
-      #   and in valid IPv4 addresses dots will always preced colons.
-      def self.likely_ipv4?(value)
-        dot_index = value.index('.') || value.size
-        colon_index = value.index(':') || value.size
-
-        dot_index < colon_index
-      end
 
-      # Determines whether the given string is a valid IPv4 or IPv6 address.
-      def self.valid_ip?(ip)
-        # Client IPs should not have subnet masks even though IPAddr can parse them.
-        return false if ip.include?('/')
+        private
 
-        begin
-          IPAddr.new(ip)
-
-          true
-        rescue IPAddr::Error
-          false
+        def configuration
+          Datadog.configuration.tracing.client_ip
         end
       end
-
-      def self.ip_headers(headers)
-        return {} unless headers
-
-        DEFAULT_IP_HEADERS_NAMES.each_with_object({}) do |name, result|
-          value = headers.get(name)
-          result[name] = value unless value.nil?
-        end
-      end
-
-      def self.configuration
-        Datadog.configuration.tracing.client_ip
-      end
     end
   end
 end

data/lib/datadog/tracing/configuration/ext.rb

@@ -7,6 +7,13 @@ module Datadog
         ENV_ENABLED = 'DD_TRACE_ENABLED'.freeze
         ENV_TRACE_ID_128_BIT_GENERATION_ENABLED = 'DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED'.freeze
 
+        # @public_api
+        module SpanAttributeSchema
+          ENV_SPAN_ATTRIBUTE_SCHEMA = 'DD_TRACE_SPAN_ATTRIBUTE_SCHEMA'.freeze
+          DEFAULT_VERSION = 'v0'.freeze
+          VERSION_ONE = 'v1'.freeze
+        end
+
         # @public_api
         module Analytics
           ENV_TRACE_ANALYTICS_ENABLED = 'DD_TRACE_ANALYTICS_ENABLED'.freeze