fix(jobs): preserve serialized context precedence

Author: solnic

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

@@ -310,7 +310,7 @@ def capture_exception(job, e, extension = Sentry.job_extensions.for(job))
             }
 
             contexts = error_data[:contexts]
-            contexts = contexts.merge(execution_context) if Sentry.configuration.data_collection.queues
+            contexts = contexts.merge(matching_keys(execution_context, contexts)) if Sentry.configuration.data_collection.queues
             options[:contexts] = contexts if Sentry.configuration.data_collection.queues || !contexts.empty?
 
             integration = Sentry.job_extensions.call(extension, :integration, job) || Sentry::Rails
@@ -319,17 +319,25 @@ def capture_exception(job, e, extension = Sentry.job_extensions.for(job))
 
           def additive_error_data(data, extension_scope_contexts)
             scope = Sentry.get_current_scope
+            extension_scope_contexts = matching_keys(extension_scope_contexts, scope.contexts)
 
             {
-              contexts: data.fetch(:contexts, {}).to_h do |name, context|
+              contexts: matching_keys(data.fetch(:contexts, {}), scope.contexts).to_h do |name, context|
                 scope_context = scope.contexts.fetch(name, {})
-                [name, scope_context.merge(context).merge(values_not_supplied_by(scope_context, extension_scope_contexts.fetch(name, {})))]
+                context = matching_keys(context, scope_context)
+                extension_context = matching_keys(extension_scope_contexts.fetch(name, {}), scope_context)
+                [name, scope_context.merge(context).merge(values_not_supplied_by(scope_context, extension_context))]
               end,
-              tags: data.fetch(:tags, {}).reject { |key, _value| scope.tags.key?(key) },
-              extra: data.fetch(:extra, {}).reject { |key, _value| scope.extra.key?(key) }
+              tags: matching_keys(data.fetch(:tags, {}), scope.tags).reject { |key, _value| scope.tags.key?(key) },
+              extra: matching_keys(data.fetch(:extra, {}), scope.extra).reject { |key, _value| scope.extra.key?(key) }
             }
           end
 
+          def matching_keys(data, reference)
+            keys = reference.keys.to_h { |key| [key.to_s, key] }
+            data.transform_keys { |key| keys.fetch(key.to_s, key) }
+          end
+
           def values_not_supplied_by(scope_context, extension_context)
             scope_context.reject { |key, value| extension_context.key?(key) && extension_context[key] == value }
           end

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

@@ -119,6 +119,26 @@ def error_data(job, _exception)
     end
   end
 
+  describe "string-keyed error context" do
+    it "preserves serialized ActiveJob metadata while adding backend fields" do
+      register_extension do
+        def error_data(_job, _exception)
+          { contexts: { "active_job" => { "job_id" => "backend-id", "attempt" => 3 } } }
+        end
+      end
+
+      event = JSON.parse(JSON.generate(perform_failing_job.to_h))
+
+      expect(event.dig("contexts", "active_job")).to include(
+        "job_id" => event.dig("extra", "job_id"),
+        "job_class" => failing_job.name,
+        "queue" => "default",
+        "provider_job_id" => event.dig("extra", "provider_job_id"),
+        "attempt" => 3
+      )
+    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