Make sure job instrumentation keep return value

The implementaiton of `instrument` in `ActiveJob::Instrumentation` was
not keeping the API of `ActiveSupport::Notification.instrument` and
returning the value of the block.

Fixes rails#40931.

Author: rafaelfranca

activejob/lib/active_job/instrumentation.rb

@@ -18,11 +18,14 @@ module Instrumentation #:nodoc:
     private
       def instrument(operation, payload = {}, &block)
         enhanced_block = ->(event_payload) do
-          block.call if block
+          value = block.call if block
+
           if defined?(@_halted_callback_hook_called) && @_halted_callback_hook_called
             event_payload[:aborted] = true
             @_halted_callback_hook_called = nil
           end
+
+          value
         end
 
         ActiveSupport::Notifications.instrument \

activejob/test/cases/rescue_test.rb

@@ -12,7 +12,7 @@ class RescueTest < ActiveSupport::TestCase
   test "rescue perform exception with retry" do
     job = RescueJob.new("david")
     job.perform_now
-    assert_equal [ "rescued from ArgumentError", "performed beautifully" ], JobBuffer.values
+    assert_equal [ "rescued from ArgumentError", "performed beautifully", "Retried job DIFFERENT!" ], JobBuffer.values
   end
 
   test "let through unhandled perform exception" do

activejob/test/jobs/rescue_job.rb

@@ -8,7 +8,9 @@ class OtherError < StandardError; end
   rescue_from(ArgumentError) do
     JobBuffer.add("rescued from ArgumentError")
     arguments[0] = "DIFFERENT!"
-    retry_job
+    job = retry_job
+    JobBuffer.add("Retried job #{job.arguments[0]}")
+    job
   end
 
   rescue_from(ActiveJob::DeserializationError) do |e|