fix(jobs): retain applied extension context

Co-Authored-By: Codex <noreply@example.com>

Author: solnic

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

@@ -13,6 +13,7 @@ module ActiveJobExtensions
 
       def self.prepended(base)
         base.attr_accessor :_sentry
+        base.attr_accessor :_sentry_extension_scope_contexts
         base.attr_reader :_sentry_job_data
       end
 
@@ -156,14 +157,15 @@ def log_producer_span_error(e)
 
           def record(job, trace_headers: nil, user: nil, payload: nil, &block)
             original_hub = Sentry.get_current_hub_internal
+            original_extension_scope_contexts = job._sentry_extension_scope_contexts
             Sentry.clone_hub_to_current_thread
 
             Sentry.with_scope do |scope|
               begin
                 extension = Sentry.job_extensions.for(job)
                 scope.set_user(user.transform_keys(&:to_sym)) if user && !user.empty?
 
-                apply_extension_scope_data(scope, extension, job)
+                job._sentry_extension_scope_contexts = apply_extension_scope_data(scope, extension, job)
 
                 scope.set_transaction_name(Sentry.job_extensions.call(extension, :transaction_name, job) || job.class.name, source: :task)
                 scope.set_tags(queue: job.queue_name)
@@ -216,6 +218,7 @@ def record(job, trace_headers: nil, user: nil, payload: nil, &block)
               end
             end
           ensure
+            job._sentry_extension_scope_contexts = original_extension_scope_contexts
             Sentry.set_current_hub_internal(original_hub)
           end
 
@@ -238,6 +241,7 @@ def apply_extension_scope_data(scope, extension, job)
             scope.set_tags(data[:tags]) if data[:tags]
             scope.set_extras(data[:extra]) if data[:extra]
             scope.set_user(data[:user]) if data[:user]
+            data.fetch(:contexts, {}).deep_dup
           end
 
           def set_extension_messaging_data(span, extension, job)
@@ -291,7 +295,7 @@ def compute_latency(job)
           def capture_exception(job, e, extension = Sentry.job_extensions.for(job))
             error_data = additive_error_data(
               Sentry.job_extensions.call(extension, :error_data, job, e),
-              Sentry.job_extensions.call(extension, :scope_data, job).fetch(:contexts, {})
+              job._sentry_extension_scope_contexts || {}
             )
 
             options = {

sentry-rails/spec/sentry/rails/active_job_job_extensions_spec.rb

@@ -103,6 +103,22 @@ def messaging_data(_job)
     end
   end
 
+  describe "error data from a changing job" do
+    it "updates extension context values from before execution when the job fails" do
+      register_extension do
+        def scope_data(job)
+          { contexts: { backend: { attempt: job.executions } } }
+        end
+
+        def error_data(job, _exception)
+          { contexts: { backend: { attempt: job.executions } } }
+        end
+      end
+
+      expect(perform_failing_job.contexts[:backend]).to eq(attempt: 1)
+    end
+  end
+
   describe "error data overlapping the job's scope" do
     it "does not let the extension's error data replace tags and extra already on the job's scope" do
       register_extension do