@@ -59,20 +59,20 @@ def default_extension
5959 @default_extension ||= ActiveJobExtension . new
6060 end
6161
62- def consumer
63- @consumer ||= ActiveJobExtension :: Consumer . new ( registry : job_extensions )
62+ def consumer ( job )
63+ extension_for ( job ) . consumer
6464 end
6565
6666 def producer ( job )
67- job_extensions . for ( job ) . producer ( job : job )
67+ extension_for ( job ) . producer ( job : job )
6868 end
6969
7070 def prepare_payload ( job , payload )
7171 safely ( job , "inject _sentry payload" , fallback : payload ) { producer ( job ) . prepare_payload ( job , payload ) }
7272 end
7373
74- def job_extensions
75- default_extension . registry
74+ def extension_for ( job )
75+ Sentry :: Rails . active_job_extensions . fetch ( ActiveJobExtension . adapter_name ( job . class ) , default_extension )
7676 end
7777
7878 def producer_callback_registered?
@@ -111,29 +111,30 @@ def record(job, user: nil, payload: nil, &block)
111111
112112 def record_in_scope ( scope , job , user : nil , payload : nil )
113113 transaction = nil
114- extension = job_extensions . for ( job )
114+ job_consumer = consumer ( job )
115+ extension = job_consumer . extension
115116
116117 begin
117118 scope . set_user ( user . transform_keys ( &:to_sym ) ) if user && !user . empty?
118119
119- safely ( job , "apply scope data" ) { consumer . apply_scope_data ( scope , job ) }
120+ safely ( job , "apply scope data" ) { job_consumer . apply_scope_data ( scope , job ) }
120121 apply_active_job_context ( scope , job )
121122
122123 name = safely ( job , "name the transaction" , fallback : job . class . name ) { extension . transaction_name ( job : job ) }
123124 scope . set_transaction_name ( name , source : :task )
124125
125126 transaction = safely ( job , "start the transaction" ) do
126127 trace_headers = extension . extract_trace_headers ( job : job , payload : payload )
127- consumer . start_transaction ( scope , job , trace_headers : trace_headers )
128+ job_consumer . start_transaction ( scope , job , trace_headers : trace_headers )
128129 end
129130
130131 yield . tap do
131- consumer . finish_transaction ( transaction , 200 )
132+ job_consumer . finish_transaction ( transaction , 200 )
132133 end
133134 rescue Exception => e # rubocop:disable Lint/RescueException
134- consumer . finish_transaction ( transaction , 500 )
135+ job_consumer . finish_transaction ( transaction , 500 )
135136
136- if safely ( job , "decide whether to report the job exception" , fallback : true ) { consumer . report_exception? ( job , e ) }
137+ if safely ( job , "decide whether to report the job exception" , fallback : true ) { job_consumer . report_exception? ( job , e ) }
137138 capture_exception ( job , e )
138139 end
139140
@@ -144,7 +145,7 @@ def record_in_scope(scope, job, user: nil, payload: nil)
144145 def capture_exception ( job , e )
145146 error_data = active_job_error_data ( job )
146147 captured = safely ( job , "capture the job exception" , fallback : false ) do
147- consumer . capture_exception ( job , e , **error_data )
148+ consumer ( job ) . capture_exception ( job , e , **error_data )
148149 true
149150 end
150151 return if captured
@@ -174,7 +175,7 @@ def retry_handler(*args)
174175 return if error . nil?
175176 return if !Sentry . initialized? || job . already_supported_by_sentry_integration?
176177 report = safely ( job , "decide whether to report the retried exception" , fallback : Sentry . configuration . rails . active_job_report_on_retry_error ) do
177- consumer . report_retried_exception? ( job , error )
178+ consumer ( job ) . report_retried_exception? ( job , error )
178179 end
179180 return unless report
180181
@@ -192,7 +193,7 @@ def handle_error_event(*args)
192193 private
193194
194195 def safely ( job , context , fallback : nil , &block )
195- consumer . safely ( job_extensions . for ( job ) , context , fallback : fallback , &block )
196+ consumer ( job ) . safely ( context , fallback : fallback , &block )
196197 end
197198
198199 def active_job_error_data ( job )
0 commit comments