Skip to content

Commit 9cf4ce6

Browse files
committed
refactor(rails): resolve ActiveJob extensions in Sentry::Rails
Sentry::Rails.active_job_extension_for returns the extension registered for a job's queue adapter, or the generic ActiveJobExtension otherwise, so the reporter no longer keeps its own fallback.
1 parent 1ffffdd commit 9cf4ce6

2 files changed

Lines changed: 12 additions & 13 deletions

File tree

‎sentry-rails/lib/sentry/rails.rb‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ module Rails
1616
extend Integrable
1717
register_integration name: "rails", version: Sentry::Rails::VERSION
1818

19+
DEFAULT_ACTIVE_JOB_EXTENSION = ActiveJobExtension.new
20+
private_constant :DEFAULT_ACTIVE_JOB_EXTENSION
21+
1922
# Returns whether sentry-rails' ActiveJob integration reports jobs run
2023
# through the given queue adapter.
2124
#
@@ -56,6 +59,10 @@ def self.register_active_job_extension(adapter, extension)
5659
active_job_extensions[adapter.to_sym] = extension
5760
end
5861

62+
def self.active_job_extension_for(job_class)
63+
active_job_extensions.fetch(ActiveJobExtension.adapter_name(job_class), DEFAULT_ACTIVE_JOB_EXTENSION)
64+
end
65+
5966
# @return [Hash{Symbol => ActiveJobExtension}] the registered extensions,
6067
# keyed by adapter name
6168
def self.active_job_extensions

‎sentry-rails/lib/sentry/rails/active_job.rb‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,8 @@ class SentryReporter
5757
}
5858

5959
class << self
60-
def default_extension
61-
@default_extension ||= ActiveJobExtension.new
62-
end
63-
64-
def extension_for(job)
65-
Sentry::Rails.active_job_extensions.fetch(ActiveJobExtension.adapter_name(job.class), default_extension)
66-
end
67-
6860
def prepare_payload(job, payload)
69-
extension = extension_for(job)
61+
extension = Sentry::Rails.active_job_extension_for(job.class)
7062
extension.safely("inject _sentry payload", fallback: payload) { extension.prepare_payload(job: job, payload: payload) }
7163
end
7264

@@ -81,7 +73,7 @@ def producer_callback_registered!
8173
def record_producer_span(job, &enqueue)
8274
return yield if !Sentry.initialized? || job.already_supported_by_sentry_integration?
8375

84-
extension_for(job).instrument_enqueue(job: job, &enqueue)
76+
Sentry::Rails.active_job_extension_for(job.class).instrument_enqueue(job: job, &enqueue)
8577
end
8678

8779
def record(job, &block)
@@ -91,7 +83,7 @@ def record(job, &block)
9183
end
9284

9385
def record_in_scope(scope, job)
94-
extension = extension_for(job)
86+
extension = Sentry::Rails.active_job_extension_for(job.class)
9587
transaction = nil
9688

9789
begin
@@ -112,7 +104,7 @@ def record_in_scope(scope, job)
112104
end
113105

114106
def capture_exception(job, e)
115-
extension_for(job).capture_exception(job: job, exception: e)
107+
Sentry::Rails.active_job_extension_for(job.class).capture_exception(job: job, exception: e)
116108
end
117109

118110
def register_event_handlers
@@ -136,7 +128,7 @@ def retry_handler(*args)
136128
return if error.nil?
137129
return if !Sentry.initialized? || job.already_supported_by_sentry_integration?
138130

139-
extension = extension_for(job)
131+
extension = Sentry::Rails.active_job_extension_for(job.class)
140132
report = extension.safely("decide whether to report the retried exception", fallback: Sentry.configuration.rails.active_job_report_on_retry_error) do
141133
extension.report_retried_exception?(job: job, exception: error)
142134
end

0 commit comments

Comments
 (0)