Skip to content

Commit fa83fbb

Browse files
committed
feat!: Remove enable_logs
1 parent 040fb0d commit fa83fbb

35 files changed

Lines changed: 32 additions & 176 deletions

sentry-rails/lib/sentry/rails/configuration.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ class Configuration
3535
end
3636

3737
after(:configured) do
38-
rails.structured_logging.enabled = enable_logs if rails.structured_logging.enabled.nil?
39-
4038
collection = data_collection.url_query_params
4139
if collection.mode == :deny_list
4240
filter_parameters = ::Rails.application.config.filter_parameters.select do |filter|
@@ -226,7 +224,7 @@ class StructuredLoggingConfiguration
226224
}.freeze
227225

228226
def initialize
229-
@enabled = nil
227+
@enabled = true
230228
@subscribers = DEFAULT_SUBSCRIBERS.dup
231229
end
232230

sentry-rails/lib/sentry/rails/log_subscribers/action_controller_subscriber.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ module LogSubscribers
1515
# @example Usage
1616
# # Enable structured logging for ActionController
1717
# Sentry.init do |config|
18-
# config.enable_logs = true
1918
# config.rails.structured_logging = true
2019
# config.rails.structured_logging.subscribers = { action_controller: Sentry::Rails::LogSubscribers::ActionControllerSubscriber }
2120
# end

sentry-rails/lib/sentry/rails/log_subscribers/action_mailer_subscriber.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ module LogSubscribers
1414
# @example Usage
1515
# # Enable structured logging for ActionMailer
1616
# Sentry.init do |config|
17-
# config.enable_logs = true
1817
# config.rails.structured_logging = true
1918
# config.rails.structured_logging.subscribers = { action_mailer: Sentry::Rails::LogSubscribers::ActionMailerSubscriber }
2019
# end

sentry-rails/lib/sentry/rails/log_subscribers/active_job_subscriber.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ module LogSubscribers
1414
# @example Usage
1515
# # Enable structured logging for ActiveJob
1616
# Sentry.init do |config|
17-
# config.enable_logs = true
1817
# config.rails.structured_logging = true
1918
# config.rails.structured_logging.subscribers = { active_job: Sentry::Rails::LogSubscribers::ActiveJobSubscriber }
2019
# end

sentry-rails/lib/sentry/rails/log_subscribers/active_record_subscriber.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ module LogSubscribers
1515
# @example Usage
1616
# # Automatically attached when structured logging is enabled for :active_record
1717
# Sentry.init do |config|
18-
# config.enable_logs = true
1918
# config.rails.structured_logging = true
2019
# config.rails.structured_logging.subscribers = { active_record: Sentry::Rails::LogSubscribers::ActiveRecordSubscriber }
2120
# end

sentry-rails/lib/sentry/rails/railtie.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def activate_tracing
142142
end
143143

144144
def activate_structured_logging
145-
if Sentry.configuration.rails.structured_logging.enabled? && Sentry.configuration.enable_logs
145+
if Sentry.configuration.rails.structured_logging.enabled?
146146
Sentry::Rails::StructuredLogging.attach(Sentry.configuration.rails.structured_logging)
147147
end
148148
end

sentry-rails/spec/active_job/shared_examples/structured_logging.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
RSpec.shared_examples "an ActiveJob backend that produces structured logs" do
44
let(:configure_sentry) do
55
proc do |config, _app|
6-
config.enable_logs = true
76
config.rails.structured_logging.enabled = true
87
config.rails.structured_logging.subscribers = {
98
active_job: Sentry::Rails::LogSubscribers::ActiveJobSubscriber

sentry-rails/spec/active_job/shared_examples/tracing/user_propagation.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
proc do |config|
6464
config.traces_sample_rate = 1.0
6565
config.send_default_pii = true
66-
config.enable_logs = true
6766
end
6867
end
6968

sentry-rails/spec/active_job/support/harness.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def perform(*_args, **_kwargs)
7373
Sentry::Rails::Tracing.patch_active_support_notifications
7474
end
7575

76-
if Sentry.configuration.rails.structured_logging.enabled? && Sentry.configuration.enable_logs
76+
if Sentry.configuration.rails.structured_logging.enabled?
7777
Sentry::Rails::StructuredLogging.attach(Sentry.configuration.rails.structured_logging)
7878
end
7979

sentry-rails/spec/isolated/rails_logger_patch_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
context "when :logger patch is enabled" do
1111
before do
1212
make_basic_app do |config, app|
13-
config.enable_logs = true
1413
config.enabled_patches = [:logger]
1514
config.max_log_events = 10
1615
config.sdk_logger = Logger.new(nil)
@@ -202,7 +201,6 @@
202201
let(:broadcast_logger) { ActiveSupport::BroadcastLogger.new(logger1, logger2) }
203202
let(:broadcast_app) do
204203
make_basic_app do |config|
205-
config.enable_logs = true
206204
config.enabled_patches = [:logger]
207205
config.max_log_events = 10
208206
config.sdk_logger = Logger.new(nil)

0 commit comments

Comments
 (0)