sentry-ruby 6.7.0 → 7.0.0

data/gemfiles/ruby-jruby-9.4.14.0_rack-3_redis-4.gemfile.lock

@@ -6,7 +6,7 @@ GIT
 PATH
   remote: ..
   specs:
-    sentry-ruby (6.6.2)
+    sentry-ruby (6.7.0)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
       logger
@@ -70,14 +70,14 @@ GEM
     faraday-net_http (3.4.4)
       net-http (~> 0.5)
     fiber-storage (1.0.1)
-    graphql (2.6.7)
+    graphql (2.6.9)
       base64
       fiber-storage
       logger
     hashdiff (1.2.1)
     i18n (1.15.2)
       concurrent-ruby (~> 1.0)
-    io-console (0.8.2-java)
+    io-console (0.9.2-java)
     irb (1.18.0)
       pp (>= 0.6.0)
       prism (>= 1.3.0)
@@ -97,20 +97,20 @@ GEM
       prettyprint
     prettyprint (0.2.0)
     prism (1.9.0)
-    psych (5.4.0-java)
+    psych (5.5.0-java)
       date
       jar-dependencies (>= 0.1.7)
     public_suffix (6.0.2)
     puma (8.0.2-java)
       nio4r (~> 2.0)
-    rack (3.2.6)
+    rack (3.2.7)
     rake (12.3.3)
     rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
     redis (4.8.1)
-    reline (0.6.3)
+    reline (0.7.0)
       io-console (~> 0.5)
     rexml (3.4.1)
     rspec (3.13.2)
@@ -146,7 +146,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uri (1.1.1)
-    webmock (3.26.2)
+    webmock (3.26.3)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -214,10 +214,10 @@ CHECKSUMS
   faraday (2.14.3) sha256=1882247e6766615c8220b4392bf1d27f6ebb63d8e28267587cef1fb0bf37f278
   faraday-net_http (3.4.4) sha256=0e78af151747ed1b00f33e25973b4bc220d7f16c00c39676817c8b12331eb588
   fiber-storage (1.0.1) sha256=f48e5b6d8b0be96dac486332b55cee82240057065dc761c1ea692b2e719240e1
-  graphql (2.6.7) sha256=759755ce5819c965b6459c5039605cf2e4d876bb8ba5e03451676870ea787c45
+  graphql (2.6.9) sha256=afe7bc03164f1a61abc66a415744ffd315c5aca116c9f3438c57391a431e4fe5
   hashdiff (1.2.1) sha256=9c079dbc513dfc8833ab59c0c2d8f230fa28499cc5efb4b8dd276cf931457cd1
   i18n (1.15.2) sha256=00f9eb62412fe593b2a65a97daa75300d37abb8f7202ec748e94b6d46a9dd1b5
-  io-console (0.8.2-java) sha256=837efefe96084c13ae91114917986ae6c6d1cf063b27b8419cc564a722a38af8
+  io-console (0.9.2-java) sha256=929c09163ad227cda17f5dc57861b995dbecf69c7ca2ce7b0c5f941f1f3da7d3
   irb (1.18.0) sha256=de9454a0703a54704b9811a5ef31a60c86949fbf4013fcf244fabc7c775248e3
   jar-dependencies (0.5.7) sha256=013ce5f4639414ac8cf1169cdbe763da164b81e2d2c983d11042b5ff7bfcce80
   jdbc-mysql (8.4.0.1) sha256=429cb7999d11c4f46a7153a382b6ac07935a4c10ddc52dd98e2d52b22c17fa13
@@ -231,14 +231,14 @@ CHECKSUMS
   pp (0.6.4) sha256=dfcb0fce700c41456265922884f9fe195d7fbb0674a3578e6c0f69588e82b570
   prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
   prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
-  psych (5.4.0-java) sha256=5f948b27c94be491e6ae3e19484700fe87b7bea75f91a5ab8cdf18bb215b1a3b
+  psych (5.5.0-java) sha256=3b7cf3684c44d049c3dee87ec4118ec9cd6ac714cbdcfba386997f96dbbd36ab
   public_suffix (6.0.2) sha256=bfa7cd5108066f8c9602e0d6d4114999a5df5839a63149d3e8b0f9c1d3558394
   puma (8.0.2-java) sha256=37392e0dbd01e2a157748b92b818bfacf801bb32628e41680e9ab1171dea2b3d
-  rack (3.2.6) sha256=5ed78e1f73b2e25679bec7d45ee2d4483cc4146eb1be0264fc4d94cb5ef212c2
+  rack (3.2.7) sha256=93e13e1c24f93556671d85d2d79fa228c3485815c50d7e2f265b5330c6528fb7
   rake (12.3.3) sha256=f7694adb4fe638da35452300cee6c545e9c377a0e3190018ac04d590b3c26ab3
   rdoc (7.2.0) sha256=8650f76cd4009c3b54955eb5d7e3a075c60a57276766ebf36f9085e8c9f23192
   redis (4.8.1) sha256=387ee086694fffc9632aaeb1efe4a7b1627ca783bf373320346a8a20cd93333a
-  reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835
+  reline (0.7.0) sha256=5b012d8e55dbf9d450f12bde2cf7d15ff546ae80b3f8f3b30e570d431815583d
   rexml (3.4.1) sha256=c74527a9a0a04b4ec31dbe0dc4ed6004b960af943d8db42e539edde3a871abca
   rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
   rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
@@ -247,7 +247,7 @@ CHECKSUMS
   rspec-retry (0.6.2) sha256=6101ba23a38809811ae3484acde4ab481c54d846ac66d5037ccb40131a60d858
   rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
   securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
-  sentry-ruby (6.6.2)
+  sentry-ruby (6.7.0)
   sequel (5.107.0) sha256=019629313205295b007f6df2c5eab19ddc40710d549fd445ac300f2853a370db
   simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5
   simplecov-cobertura (3.2.0) sha256=70d702658677fcb20e5aceb6915ccf8bc62ff2ccd38b62b3ad5c9db5c0888740
@@ -258,7 +258,7 @@ CHECKSUMS
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
   tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b
   uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
-  webmock (3.26.2) sha256=774556f2ea6371846cca68c01769b2eac0d134492d21f6d0ab5dd643965a4c90
+  webmock (3.26.3) sha256=77c612816bdcb2fc43db0e42fd98b19be7d4770fd708816fdde65a006664ddec
   webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131
   yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51
 

data/lib/sentry/client.rb

@@ -48,13 +48,9 @@ module Sentry
 
       @spotlight_transport = SpotlightTransport.new(configuration) if configuration.spotlight
 
-      if configuration.enable_logs
-        @log_event_buffer = LogEventBuffer.new(configuration, self)
-      end
+      @log_event_buffer = LogEventBuffer.new(configuration, self)
 
-      if configuration.enable_metrics
-        @metric_event_buffer = MetricEventBuffer.new(configuration, self)
-      end
+      @metric_event_buffer = MetricEventBuffer.new(configuration, self)
     end
 
     # Applies the given scope's data to the event and sends it to Sentry.

data/lib/sentry/configuration.rb

@@ -16,6 +16,7 @@ require "sentry/logger"
 require "sentry/structured_logger"
 require "sentry/log_event_buffer"
 require "sentry/metric_event_buffer"
+require "sentry/data_collection"
 
 module Sentry
   class Configuration
@@ -132,6 +133,7 @@ module Sentry
     attr_accessor :max_breadcrumbs
 
     # Number of lines of code context to capture, or nil for none
+    # @deprecated Use {#data_collection} and `frame_context_lines` instead.
     # @return [Integer, nil]
     attr_accessor :context_lines
 
@@ -167,8 +169,14 @@ module Sentry
     alias inspect_exception_causes_for_exclusion? inspect_exception_causes_for_exclusion
 
     # Whether to capture local variables from the raised exception's frame. Default is false.
+    # @deprecated Use {#data_collection} and `stack_frame_variables` instead.
     # @return [Boolean]
-    attr_accessor :include_local_variables
+    attr_reader :include_local_variables
+
+    def include_local_variables=(value)
+      @include_local_variables = value
+      @data_collection.backfill_stack_frame_variables(self)
+    end
 
     # Whether to capture events and traces into Spotlight. Default is false.
     # If you set this to true, Sentry will send events and traces to the local
@@ -209,6 +217,7 @@ module Sentry
     attr_accessor :propagate_traces
 
     # Array of rack env parameters to be included in the event sent to sentry.
+    # @deprecated Use `data_collection.http_headers.request` to control request data collection instead.
     # @return [Array<String>]
     attr_accessor :rack_env_whitelist
 
@@ -232,8 +241,14 @@ module Sentry
     # - request body
     # - query string
     # will not be sent to Sentry.
+    # @deprecated Use {#data_collection} instead.
     # @return [Boolean]
-    attr_accessor :send_default_pii
+    attr_reader :send_default_pii
+
+    # Controls which categories of data may be collected.
+    # Replacement for send_default_pii.
+    # @return [DataCollection]
+    attr_accessor :data_collection
 
     # Capture queue time from X-Request-Start header set by reverse proxies.
     # Works with any Rack app behind Nginx, HAProxy, Heroku router, etc.
@@ -273,10 +288,6 @@ module Sentry
     # @return [Proc]
     attr_accessor :traces_sampler
 
-    # Enable Structured Logging
-    # @return [Boolean]
-    attr_accessor :enable_logs
-
     # Structured logging configuration.
     # @return [StructuredLoggingConfiguration]
     attr_reader :structured_logging
@@ -345,10 +356,6 @@ module Sentry
     # @return [Integer]
     attr_accessor :max_log_events
 
-    # Enable metrics collection, defaults to true
-    # @return [Boolean]
-    attr_accessor :enable_metrics
-
     # Maximum number of metric events to buffer before sending
     # @return [Integer]
     attr_accessor :max_metric_events
@@ -527,6 +534,7 @@ module Sentry
     def initialize
       run_callbacks(:before, :initialize)
 
+      self.data_collection = DataCollection.new
       self.app_dirs_pattern = APP_DIRS_PATTERN
       self.debug = Sentry::Utils::EnvHelper.env_to_bool(ENV["SENTRY_DEBUG"])
       self.background_worker_threads = (processor_count / 2.0).ceil
@@ -537,6 +545,7 @@ module Sentry
       self.breadcrumbs_logger = []
       self.context_lines = 3
       self.include_local_variables = false
+
       self.environment = environment_from_env
       self.enabled_environments = nil
       self.exclude_loggers = []
@@ -578,8 +587,6 @@ module Sentry
       self.std_lib_logger_filter = nil
       self.rack_env_whitelist = RACK_ENV_WHITELIST_DEFAULT
       self.traces_sampler = nil
-      self.enable_logs = false
-      self.enable_metrics = true
 
       self.profiler_class = Sentry::Profiler
       self.profiles_sample_interval = DEFAULT_PROFILES_SAMPLE_INTERVAL
@@ -596,6 +603,8 @@ module Sentry
 
       yield(self) if block_given?
 
+      log_deprecations
+
       run_callbacks(:after, :configured)
     end
 
@@ -621,6 +630,11 @@ module Sentry
       @dsn = init_dsn(value)
     end
 
+    def send_default_pii=(value)
+      @send_default_pii = value
+      self.data_collection = DataCollection.backfill(self)
+    end
+
     alias server= dsn=
 
     def release=(value)
@@ -804,6 +818,14 @@ module Sentry
       end
     end
 
+    # @api private
+    def log_deprecations
+      log_warn("`send_default_pii` is deprecated; use `data_collection` instead.") if self.send_default_pii
+      log_warn("`include_local_variables` is deprecated; use `data_collection.stack_frame_variables` instead.") if include_local_variables
+      log_warn("`context_lines` is deprecated; use `data_collection.frame_context_lines` instead.") if context_lines != 3
+      log_warn("`rack_env_whitelist` is deprecated; use `data_collection.http_headers.request` to control request data collection instead.") if rack_env_whitelist != RACK_ENV_WHITELIST_DEFAULT
+    end
+
     # @api private
     def stacktrace_builder
       @stacktrace_builder ||= StacktraceBuilder.new(

data/lib/sentry/data_collection/key_value_collection.rb

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+module Sentry
+  class DataCollection
+    # Configuration for key-value data collection.
+    class KeyValueCollection
+      FILTERED_VALUE = "[Filtered]"
+
+      # Keys from this list are ALWAYS filtered, regardless of :mode
+      SENSITIVE_DENY_LIST = %w[
+        auth
+        token
+        secret
+        session
+        password
+        passwd
+        pwd
+        key
+        jwt
+        bearer
+        sso
+        saml
+        csrf
+        xsrf
+        credentials
+        sid
+        identity
+        cookie
+        set-cookie
+      ].freeze
+
+      # Additional terms applied to cookie names only. These cover common
+      # opaque session, identity-provider, and load-balancer cookies without
+      # making the general header denylist overly broad.
+      SENSITIVE_COOKIE_NAME_DENY_LIST = %w[
+        .sid
+        sessid
+        remember
+        oidc
+        pkce
+        nonce
+        __secure-
+        __host-
+        awsalb
+        awselb
+        akamai
+        __stripe
+        cognito
+        firebase
+        supabase
+        sb-
+        mfa
+        2fa
+      ].freeze
+
+      # `mode` controls whether values are collected:
+      # - `:off` disables collection.
+      # - `:deny_list` collects values except those matching `terms`.
+      # - `:allow_list` collects only values matching `terms`.
+      # Boolean values are accepted as shorthand for `:deny_list` and `:off`.
+      # @return [:off, :deny_list, :allow_list]
+      attr_reader :mode
+
+      # `terms` contains the keys or patterns used by the selected mode.
+      # @return [Array<String, Regexp>, nil]
+      attr_reader :terms
+
+      def initialize(mode:, terms:)
+        self.mode = mode
+        self.terms = terms
+      end
+
+      def mode=(mode)
+        @mode = case mode
+        when true then :deny_list
+        when false, nil then :off
+        else mode
+        end
+      end
+
+      # Converts the boolean shorthand into a collection configuration.
+      def self.from(value)
+        return new(mode: value, terms: nil) if value.equal?(true) || value.equal?(false) || value.nil?
+
+        value
+      end
+
+      def terms=(terms)
+        @terms = terms&.map { |term| term.is_a?(Regexp) ? term : term.to_s.downcase }
+          &.reject { |term| !term.is_a?(Regexp) && term.strip.empty? }
+      end
+
+      # Applies this collection configuration without changing the input hash.
+      # Keys are retained whenever the category is collected; values that are not
+      # safe to send are replaced with FILTERED_VALUE.
+      #
+      # @param values [Hash] key-value data to filter
+      # @return [Hash] a new filtered hash, or an empty hash when collection is off
+      def filter(values, cookie: false)
+        return {} if mode == :off
+
+        values.each_with_object({}) do |(key, value), filtered|
+          filtered[key] = safe_value?(key, cookie: cookie) ? value : FILTERED_VALUE
+        end
+      end
+
+      private
+
+      def safe_value?(key, cookie: false)
+        key_string = key.to_s
+        key_downcase = key_string.downcase
+        return false if sensitive?(key_downcase, cookie: cookie)
+
+        case mode
+        when :deny_list
+          !matches_any_term?(key_string, key_downcase)
+        when :allow_list
+          matches_any_term?(key_string, key_downcase)
+        else
+          false
+        end
+      end
+
+      def sensitive?(key, cookie: false)
+        SENSITIVE_DENY_LIST.any? { |term| key.include?(term) } ||
+          (cookie && SENSITIVE_COOKIE_NAME_DENY_LIST.any? { |term| key.include?(term) })
+      end
+
+      def matches_any_term?(key, key_downcase)
+        @terms&.any? do |term|
+          term.is_a?(Regexp) ? term.match?(key) : key_downcase.include?(term)
+        end
+      end
+    end
+  end
+end

data/lib/sentry/data_collection.rb

@@ -0,0 +1,203 @@
+# frozen_string_literal: true
+
+require "sentry/data_collection/key_value_collection"
+
+module Sentry
+  class DataCollection
+    # Configuration for the categories of data collected by the SDK.
+    # Replacement for send_default_pii.
+    # Spec: https://develop.sentry.dev/sdk/foundations/client/data-collection/
+    #
+    # @example Configure data collection
+    #   Sentry.init do |config|
+    #     data_collection = config.data_collection
+    #     data_collection.user_info = true
+    #     data_collection.cookies.mode = :deny_list
+    #     data_collection.cookies.terms = ["session", "token"]
+    #     data_collection.http_headers.request.mode = :deny_list
+    #     data_collection.http_headers.request.terms = nil
+    #     data_collection.http_headers.response.mode = :allow_list
+    #     data_collection.http_headers.response.terms = ["my_special_header"]
+    #     data_collection.http_bodies = [:incoming_request]
+    #     data_collection.url_query_params.mode = :allow_list
+    #     data_collection.url_query_params.terms = ["page", "limit"]
+    #     data_collection.graphql.document = true
+    #     data_collection.graphql.variables = true
+    #     data_collection.database_query_data = true
+    #     data_collection.queues = true
+    #     data_collection.stack_frame_variables = true
+    #     data_collection.frame_context_lines = 5
+    #   end
+
+    MODES = %i[off deny_list allow_list].freeze
+
+    PII_HEADER_SNIPPETS = %w[forwarded -ip _ip remote via _user -user].freeze
+
+    BODY_TYPES = %i[
+      incoming_request
+      outgoing_request
+      incoming_response
+      outgoing_response
+    ].freeze
+
+    class HttpHeaders
+      # @return [KeyValueCollection]
+      attr_reader :request
+
+      # @return [KeyValueCollection]
+      attr_reader :response
+
+      def initialize(request:, response:)
+        self.request = request
+        self.response = response
+      end
+
+      def request=(value)
+        @request = KeyValueCollection.from(value)
+      end
+
+      def response=(value)
+        @response = KeyValueCollection.from(value)
+      end
+    end
+
+    class GraphQL
+      # @return [Boolean]
+      attr_accessor :document
+
+      # @return [Boolean]
+      attr_accessor :variables
+
+      def initialize(document:, variables:)
+        @document = document
+        @variables = variables
+      end
+    end
+
+    # @return [Boolean]
+    # @default `true`
+    attr_accessor :user_info
+
+    # @return [Boolean, KeyValueCollection]
+    # A boolean is shorthand for `mode: :deny_list` (`true`) or `mode: :off` (`false`).
+    # @default `mode: :deny_list, terms: nil`
+    attr_reader :cookies
+
+    # @return [HttpHeaders]
+    # @default request and response use `mode: :deny_list, terms: nil`
+    attr_accessor :http_headers
+
+    # @return [Array<Symbol>] containing values from BODY_TYPES
+    # @default `nil` (all valid body types)
+    attr_accessor :http_bodies
+
+    # @return [Boolean, KeyValueCollection]
+    # A boolean is shorthand for `mode: :deny_list` (`true`) or `mode: :off` (`false`).
+    # @default `mode: :deny_list, terms: nil`
+    attr_reader :url_query_params
+
+    # @return [Boolean]
+    # @default `true`
+    attr_accessor :database_query_data
+
+    # @return [GraphQL]
+    # @default `document: true, variables: true`
+    attr_accessor :graphql
+
+    # @return [Boolean]
+    # @default `true`
+    attr_accessor :queues
+
+    # @return [Boolean, KeyValueCollection]
+    # A boolean is shorthand for `mode: :deny_list` (`true`) or `mode: :off` (`false`).
+    # @default `false` (Ruby-specific to avoid TracePoint overhead)
+    attr_reader :stack_frame_variables
+
+    # @return [Integer]
+    # @default `3`
+    attr_accessor :frame_context_lines
+
+    # Filters key-value data using the default sensitive denylist.
+    def self.filter(values)
+      default_filter.filter(values, cookie: false)
+    end
+
+    def self.default_filter
+      @default_filter ||= KeyValueCollection.new(mode: :deny_list, terms: nil)
+    end
+
+    # Builds data collection settings compatible with the legacy send_default_pii
+    # configuration.
+    def self.backfill(configuration)
+      data_collection = new
+      data_collection.backfill_stack_frame_variables(configuration)
+      return data_collection if configuration.send_default_pii
+
+      # TODO-neel-data map to exact ruby behaviour for backwards compat behavior
+      data_collection.user_info = false
+      data_collection.cookies.mode = :off
+      data_collection.http_headers.request.mode = :deny_list
+      data_collection.http_headers.request.terms = PII_HEADER_SNIPPETS
+      data_collection.http_headers.response.mode = :deny_list
+      data_collection.http_headers.response.terms = PII_HEADER_SNIPPETS
+      data_collection.http_bodies = []
+      data_collection.url_query_params.mode = :off
+      data_collection.graphql.document = false
+      data_collection.graphql.variables = false
+      data_collection.database_query_data = false
+      data_collection.queues = false
+      data_collection.frame_context_lines = configuration.context_lines
+      data_collection
+    end
+
+    def initialize
+      @user_info = true
+      self.cookies = KeyValueCollection.new(mode: :deny_list, terms: nil)
+      @http_headers = HttpHeaders.new(
+        request: KeyValueCollection.new(mode: :deny_list, terms: nil),
+        response: KeyValueCollection.new(mode: :deny_list, terms: nil)
+      )
+      @http_bodies = BODY_TYPES.dup
+      self.url_query_params = KeyValueCollection.new(mode: :deny_list, terms: nil)
+      @database_query_data = true
+      @graphql = GraphQL.new(document: true, variables: true)
+      @queues = true
+      self.stack_frame_variables = false
+      @frame_context_lines = 3
+    end
+
+    # Copies the legacy stack frame variable configuration.
+    def backfill_stack_frame_variables(configuration)
+      self.stack_frame_variables = configuration.include_local_variables
+    end
+
+    # Returns whether stack frame local variables should be captured.
+    def collect_stack_frame_variables?
+      stack_frame_variables.mode != :off
+    end
+
+    def stack_frame_variables=(value)
+      @stack_frame_variables = KeyValueCollection.from(value)
+    end
+
+    def cookies=(value)
+      @cookies = KeyValueCollection.from(value)
+    end
+
+    def url_query_params=(value)
+      @url_query_params = KeyValueCollection.from(value)
+    end
+
+    # Returns whether incoming HTTP request bodies should be collected.
+    # nil implies all BODY_TYPES according to spec
+    def collect_incoming_http_body?
+      http_bodies.nil? || http_bodies.include?(:incoming_request)
+    end
+
+    # Returns whether outgoing HTTP request bodies should be collected.
+    # nil implies all BODY_TYPES according to spec
+    def collect_outgoing_http_body?
+      http_bodies.nil? || http_bodies.include?(:outgoing_request)
+    end
+  end
+end

data/lib/sentry/debug_structured_logger.rb

@@ -8,8 +8,7 @@ require "delegate"
 module Sentry
   # DebugStructuredLogger is a logger that captures structured log events to a file for debugging purposes.
   #
-  # It can optionally also send log events to Sentry via the normal structured logger if logging
-  # is enabled.
+  # It also sends log events to Sentry via the normal structured logger.
   class DebugStructuredLogger < SimpleDelegator
     DEFAULT_LOG_FILE_PATH = File.join("log", "sentry_debug_logs.log")
 
@@ -68,12 +67,7 @@ module Sentry
     private
 
     def initialize_backend(configuration)
-      if configuration.enable_logs
-        StructuredLogger.new(configuration)
-      else
-        # Create a no-op logger if logging is disabled
-        NoOpLogger.new
-      end
+      StructuredLogger.new(configuration)
     end
 
     def initialize_log_file(log_file_path)
@@ -83,12 +77,5 @@ module Sentry
 
       log_file
     end
-
-    # No-op logger for when structured logging is disabled
-    class NoOpLogger
-      %i[trace debug info warn error fatal log].each do |method|
-        define_method(method) { |*args, **kwargs| nil }
-      end
-    end
   end
 end

data/lib/sentry/error_event.rb

@@ -32,7 +32,12 @@ module Sentry
         @extra.merge!(exception.sentry_context)
       end
 
-      @exception = Sentry::ExceptionInterface.build(exception: exception, stacktrace_builder: @stacktrace_builder, mechanism: mechanism)
+      @exception = Sentry::ExceptionInterface.build(
+        exception: exception,
+        stacktrace_builder: @stacktrace_builder,
+        mechanism: mechanism,
+        data_collection: @data_collection
+      )
     end
   end
 end

data/lib/sentry/event.rb

@@ -28,7 +28,7 @@ module Sentry
 
     MAX_MESSAGE_SIZE_IN_BYTES = 1024 * 8
 
-    SKIP_INSPECTION_ATTRIBUTES = [:@modules, :@stacktrace_builder, :@send_default_pii, :@trusted_proxies, :@rack_env_whitelist]
+    SKIP_INSPECTION_ATTRIBUTES = [:@modules, :@stacktrace_builder, :@data_collection, :@trusted_proxies, :@rack_env_whitelist]
 
     include CustomInspection
 
@@ -73,7 +73,7 @@ module Sentry
       @modules = configuration.gem_specs if configuration.send_modules
 
       # configuration options to help events process data
-      @send_default_pii = configuration.send_default_pii
+      @data_collection = configuration.data_collection
       @trusted_proxies = configuration.trusted_proxies
       @stacktrace_builder = configuration.stacktrace_builder
       @rack_env_whitelist = configuration.rack_env_whitelist
@@ -103,7 +103,7 @@ module Sentry
       unless request || env.empty?
         add_request_interface(env)
 
-        user[:ip_address] ||= calculate_real_ip_from_rack(env) if @send_default_pii
+        user[:ip_address] ||= calculate_real_ip_from_rack(env) if @data_collection.user_info
 
         if request_id = Utils::RequestId.read_from(env)
           tags[:request_id] = request_id
@@ -127,7 +127,11 @@ module Sentry
     private
 
     def add_request_interface(env)
-      @request = Sentry::RequestInterface.new(env: env, send_default_pii: @send_default_pii, rack_env_whitelist: @rack_env_whitelist)
+      @request = Sentry::RequestInterface.new(
+        env: env,
+        data_collection: @data_collection,
+        rack_env_whitelist: @rack_env_whitelist
+      )
     end
 
     def serialize_attributes