@@ -33,6 +33,12 @@ class Configuration
3333 end
3434 end
3535 end
36+
37+ after ( :configured ) do
38+ if enable_logs && rails . structured_logging . enabled != false
39+ rails . structured_logging . enabled = true
40+ end
41+ end
3642 end
3743
3844 module Rails
@@ -183,7 +189,7 @@ def initialize(parent_config = nil)
183189 @db_query_source_threshold_ms = 100
184190 @active_support_logger_subscription_items = Sentry ::Rails ::ACTIVE_SUPPORT_LOGGER_SUBSCRIPTION_ITEMS_DEFAULT . dup
185191 @active_job_report_on_retry_error = false
186- @structured_logging = StructuredLoggingConfiguration . new ( parent_config )
192+ @structured_logging = StructuredLoggingConfiguration . new
187193 end
188194 end
189195
@@ -192,30 +198,24 @@ class StructuredLoggingConfiguration
192198 # @return [Boolean]
193199 attr_accessor :enabled
194200
195- private :enabled
196-
197201 # Hash of components to subscriber classes for structured logging
198202 # @return [Hash<Symbol, Class>]
199203 attr_accessor :subscribers
200204
201- # @return [Sentry::Configuration]
202- attr_reader :parent_config
203-
204205 DEFAULT_SUBSCRIBERS = {
205206 active_record : Sentry ::Rails ::LogSubscribers ::ActiveRecordSubscriber ,
206207 action_controller : Sentry ::Rails ::LogSubscribers ::ActionControllerSubscriber
207208 } . freeze
208209
209- def initialize ( parent_config )
210- @enabled = nil
210+ def initialize
211+ @enabled = false
211212 @subscribers = DEFAULT_SUBSCRIBERS . dup
212- @parent_config = parent_config
213213 end
214214
215215 # Returns true if structured logging should be enabled.
216216 # @return [Boolean]
217217 def enabled?
218- enabled . nil? ? parent_config . enable_logs : enabled
218+ enabled
219219 end
220220 end
221221 end
0 commit comments