Apply sagittarius context to all ActiveJob classes

Author: Taucher2003

app/jobs/application_job.rb

@@ -8,26 +8,29 @@ class ApplicationJob < ActiveJob::Base
   # Most jobs are safe to ignore if the underlying records are no longer available
   # discard_on ActiveJob::DeserializationError
 
-  retry_on StandardError, wait: :polynomially_longer, attempts: 10
+  ActiveJob::Base.instance_eval do
+    retry_on StandardError, wait: :polynomially_longer, attempts: 10
 
-  before_enqueue do |job|
-    next if job.arguments.first&.try(:key?, :sagittarius_context)
+    before_enqueue do |job|
+      possible_context = job.arguments.last
+      next if possible_context.is_a?(Hash) && possible_context&.try(:key?, :sagittarius_context)
 
-    job.arguments.unshift Code0::ZeroTrack::Context.current.to_h.merge(sagittarius_context: true)
-  end
+      job.arguments << Code0::ZeroTrack::Context.current.to_h.merge(sagittarius_context: true)
+    end
 
-  around_perform do |job, block|
-    context = job.arguments.shift
-    context.delete(:sagittarius_context)
-    source_application = context.fetch(Code0::ZeroTrack::Context.log_key(:application), nil)
-    Code0::ZeroTrack::Context.with_context(
-      **context,
-      application: 'good_job',
-      source_application: source_application,
-      job_id: job.job_id,
-      job_class: self.class.name
-    ) do
-      block.call
+    around_perform do |job, block|
+      context = job.arguments.pop
+      context.delete(:sagittarius_context)
+      source_application = context.fetch(Code0::ZeroTrack::Context.log_key(:application), nil)
+      Code0::ZeroTrack::Context.with_context(
+        **context,
+        application: 'good_job',
+        source_application: source_application,
+        job_id: job.job_id,
+        job_class: self.class.name
+      ) do
+        block.call
+      end
     end
   end
 end