Merge branch 'perf/request-interface-optimizations' into perf/reduce-memory-allocations

# Conflicts:
#	sentry-ruby/lib/sentry/interfaces/request.rb

Author: HazAT

sentry-ruby/lib/sentry/interfaces/request.rb

@@ -11,8 +11,13 @@ class RequestInterface < Interface
       "HTTP_X_FORWARDED_FOR"
     ].freeze
 
-    # Regex to detect lowercase chars — match? is allocation-free (no MatchData/String)
-    LOWERCASE_PATTERN = /[a-z]/.freeze
+    # Cache for Rack env key → HTTP header name transformations
+    # e.g. "HTTP_ACCEPT_LANGUAGE" → "Accept-Language", "CONTENT_TYPE" → "Content-Type"
+    @header_name_cache = {}
+
+    class << self
+      attr_reader :header_name_cache
+    end
 
     # See Sentry server default limits at
     # https://github.com/getsentry/sentry/blob/master/src/sentry/conf/server.py
@@ -45,15 +50,6 @@ class RequestInterface < Interface
     # @see Configuration#send_default_pii
     # @see Configuration#rack_env_whitelist
     def initialize(env:, send_default_pii:, rack_env_whitelist:)
-      env = env.dup
-
-      unless send_default_pii
-        # need to completely wipe out ip addresses
-        RequestInterface::IP_HEADERS.each do |header|
-          env.delete(header)
-        end
-      end
-
       request = ::Rack::Request.new(env)
 
       if send_default_pii
@@ -66,7 +62,7 @@ def initialize(env:, send_default_pii:, rack_env_whitelist:)
       self.method = request.request_method
 
       self.headers = filter_and_format_headers(env, send_default_pii)
-      self.env     = filter_and_format_env(env, rack_env_whitelist)
+      self.env     = filter_and_format_env(env, rack_env_whitelist, send_default_pii)
     end
 
     private
@@ -94,12 +90,22 @@ def filter_and_format_headers(env, send_default_pii)
           next if is_server_protocol?(key, value, env["SERVER_PROTOCOL"])
           next if is_skippable_header?(key)
           next if key == "HTTP_AUTHORIZATION" && !send_default_pii
+          # Filter IP headers inline instead of env.dup + delete
+          next if !send_default_pii && IP_HEADERS.include?(key)
 
           # Rack stores headers as HTTP_WHAT_EVER, we need What-Ever
-          key = key.delete_prefix("HTTP_")
-          key = key.split("_").map(&:capitalize).join("-")
-
-          memo[key] = Utils::EncodingHelper.encode_to_utf_8(value.to_s)
+          key = self.class.header_name_cache[key] ||= begin
+            k = key.delete_prefix("HTTP_")
+            k.split("_").map(&:capitalize).join("-").freeze
+          end
+
+          # Fast path: ASCII strings are valid UTF-8, skip dup+force_encoding
+          str = value.to_s
+          memo[key] = if str.ascii_only?
+            str
+          else
+            Utils::EncodingHelper.encode_to_utf_8(str)
+          end
         rescue StandardError => e
           # Rails adds objects to the Rack env that can sometimes raise exceptions
           # when `to_s` is called.
@@ -110,6 +116,9 @@ def filter_and_format_headers(env, send_default_pii)
       end
     end
 
+    # Regex to detect lowercase chars — match? is allocation-free (no MatchData/String)
+    LOWERCASE_PATTERN = /[a-z]/.freeze
+
     def is_skippable_header?(key)
       key.match?(LOWERCASE_PATTERN) || # lower-case envs aren't real http headers
         key == "HTTP_COOKIE" || # Cookies don't go here, they go somewhere else
@@ -134,11 +143,13 @@ def self.rack_3_or_above?
         Gem::Version.new(::Rack.release) >= Gem::Version.new("3.0")
     end
 
-    def filter_and_format_env(env, rack_env_whitelist)
+    def filter_and_format_env(env, rack_env_whitelist, send_default_pii)
       return env if rack_env_whitelist.empty?
 
       env.select do |k, _v|
-        rack_env_whitelist.include? k.to_s
+        key = k.to_s
+        next false if !send_default_pii && IP_HEADERS.include?(key)
+        rack_env_whitelist.include?(key)
       end
     end
   end