refa(active_job): store our stuff under single _sentry ivar

Author: solnic

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

@@ -9,14 +9,19 @@ module ActiveJobExtensions
 
       USER_FIELDS_ALLOWLIST = %w[id email username].freeze
 
+      def self.prepended(base)
+        base.attr_accessor :_sentry
+      end
+
       def perform_now
         if !Sentry.initialized? || already_supported_by_sentry_integration?
           super
         else
+          data = _sentry || {}
           SentryReporter.record(
             self,
-            trace_headers: @_sentry_trace_headers,
-            user: @_sentry_user
+            trace_headers: data["trace_propagation_headers"],
+            user: data["user"]
           ) { super }
         end
       end
@@ -53,11 +58,7 @@ def deserialize(job_data)
         return if !Sentry.initialized? || already_supported_by_sentry_integration?
 
         begin
-          sentry_data = job_data[SENTRY_PAYLOAD_KEY]
-          return unless sentry_data
-
-          @_sentry_trace_headers = sentry_data["trace_propagation_headers"]
-          @_sentry_user = sentry_data["user"]
+          self._sentry = job_data[SENTRY_PAYLOAD_KEY]
         rescue StandardError => e
           Sentry.sdk_logger&.error("sentry-rails: failed to extract _sentry payload: #{e.class}: #{e.message}\n  #{Array(e.backtrace).first(5).join("\n  ")}")
         end

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

@@ -64,8 +64,8 @@ def drain(at: nil)
         # On 5.2 with Rails52FullPayloadTestAdapter, each payload also
         # carries a +:_sentry_full_payload+ key with the complete
         # serialize output. Drive those jobs through +Base.execute+ so
-        # our deserialize override runs and populates
-        # +@_sentry_trace_headers+ / +@_sentry_user+ before +perform_now+.
+        # our deserialize override runs and populates +_sentry+
+        # before +perform_now+.
         jobs = queue_adapter.enqueued_jobs.dup
         queue_adapter.enqueued_jobs.clear
         jobs.each do |payload|