Merge pull request rails#54447 from fatkodima/fix-retry_job-instrumentation

Fix `retry_job` instrumentation when using `:test` adapter for Active Job

Author: fatkodima

activejob/lib/active_job/exceptions.rb

@@ -157,7 +157,8 @@ def after_discard(&blk)
     #  end
     def retry_job(options = {})
       instrument :enqueue_retry, options.slice(:error, :wait) do
-        enqueue options
+        job = dup
+        job.enqueue options
       end
     end
 

activejob/test/cases/logging_test.rb

@@ -309,6 +309,16 @@ def test_enqueue_retry_logging
         assert_match(/Retrying RetryJob \(Job ID: .*?\) after \d+ attempts in 3 seconds, due to a DefaultsError.*\./, @logger.messages)
       end
     end
+
+    def test_retry_different_queue_logging
+      perform_enqueued_jobs do
+        perform_enqueued_jobs do
+          RetryJob.perform_later("HeavyError", 2)
+          assert_match(/Performed RetryJob \(Job ID: .*?\) from .+\(default\) in .*ms/, @logger.messages)
+        end
+        assert_match(/Performed RetryJob \(Job ID: .*?\) from .+\(low\) in .*ms/, @logger.messages)
+      end
+    end
   end
 
   def test_enqueue_retry_logging_on_retry_job

activejob/test/jobs/retry_job.rb

@@ -19,6 +19,7 @@ class SecondDiscardableErrorOfTwo < StandardError; end
 class CustomDiscardableError < StandardError; end
 class UnlimitedRetryError < StandardError; end
 class ReportedError < StandardError; end
+class HeavyError < StandardError; end
 
 class RetryJob < ActiveJob::Base
   retry_on DefaultsError
@@ -33,6 +34,7 @@ class RetryJob < ActiveJob::Base
   retry_on(ActiveJob::DeserializationError) { |job, error| JobBuffer.add("Raised #{error.class} for the #{job.executions} time") }
   retry_on UnlimitedRetryError, attempts: :unlimited
   retry_on ReportedError, report: true
+  retry_on HeavyError, queue: :low
 
   discard_on DiscardableError
   discard_on FirstDiscardableErrorOfTwo, SecondDiscardableErrorOfTwo