feat(jobs): support backend instrumentation defaults

Author: solnic

sentry-ruby/lib/sentry/job_extensions/consumer.rb

@@ -14,12 +14,10 @@ def initialize(integration:, origin:, registry: Sentry.job_extensions)
         @origin = origin
       end
 
-      def apply_scope_data(scope, job)
+      def apply_scope_data(scope, job, default_scope_data: {})
+        apply_scope_values(scope, default_scope_data)
         data = registry.call(registry.for(job), :scope_data, job: job)
-        scope.set_contexts(data[:contexts]) if data[:contexts]
-        scope.set_tags(data[:tags]) if data[:tags]
-        scope.set_extras(data[:extra]) if data[:extra]
-        scope.set_user(data[:user]) if data[:user]
+        apply_scope_values(scope, data)
       end
 
       def transaction_name(job)
@@ -102,6 +100,13 @@ def capture_exception(job, exception, contexts: {}, tags: {}, extra: {})
 
       private
 
+      def apply_scope_values(scope, data)
+        scope.set_contexts(data[:contexts]) if data[:contexts]
+        scope.set_tags(data[:tags]) if data[:tags]
+        scope.set_extras(data[:extra]) if data[:extra]
+        scope.set_user(data[:user]) if data[:user]
+      end
+
       def additive_error_data(data)
         scope = Sentry.get_current_scope
 

sentry-ruby/lib/sentry/job_extensions/producer.rb

@@ -42,7 +42,7 @@ def inject_trace_headers(job, payload, headers)
 
       private
 
-      def with_span(job, description:, messaging_data: {}, extension_messaging_keys: nil, retry_count: true, default_retry_count: nil)
+      def with_span(job, description:, messaging_data: {}, default_messaging_data: {}, extension_messaging_keys: nil, retry_count: true, default_retry_count: nil)
         extension = registry.for(job)
         span_description = registry.call(extension, :publish_description, job: job) || description
 
@@ -51,6 +51,7 @@ def with_span(job, description:, messaging_data: {}, extension_messaging_keys: n
             span_origin = registry.call(extension, :span_origin, job: job) || origin
             span.set_origin(span_origin) if span_origin
 
+            set_messaging_data(span, resolve(default_messaging_data))
             extension_data = registry.call(extension, :messaging_data, job: job)
             extension_data = extension_data.slice(*extension_messaging_keys) if extension_messaging_keys
             set_messaging_data(span, extension_data)