Merge pull request rails#55151 from djmb/active-job-continuations-2

Follow up on Active Job Continuations PR feedback

Author: byroot

activejob/lib/active_job/continuation.rb

@@ -315,7 +315,7 @@ def instrument_job(event)
       end
 
       def instrument(event, payload = {})
-        job.send(:instrument, event, **payload)
+        job.instrument event, **payload
       end
   end
 end

activejob/lib/active_job/continuation/step.rb

@@ -48,8 +48,14 @@ def set!(cursor)
       # An UnadvanceableCursorError error will be raised if the cursor does not implement +succ+.
       def advance!(from: nil)
         from = cursor if from.nil?
-        raise UnadvanceableCursorError, "Cursor class '#{from.class}' does not implement succ, " unless from.respond_to?(:succ)
-        set! from.succ
+
+        begin
+          to = from.succ
+        rescue NoMethodError
+          raise UnadvanceableCursorError, "Cursor class '#{from.class}' does not implement 'succ'"
+        end
+
+        set! to
       end
 
       # Has this step been resumed from a previous job execution?

activejob/lib/active_job/instrumentation.rb

@@ -26,24 +26,24 @@ def perform_now
       instrument(:perform) { super }
     end
 
+    def instrument(operation, payload = {}, &block) # :nodoc:
+      payload[:job] = self
+      payload[:adapter] = queue_adapter
+
+      ActiveSupport::Notifications.instrument("#{operation}.active_job", payload) do
+        value = block.call if block
+        payload[:aborted] = @_halted_callback_hook_called if defined?(@_halted_callback_hook_called)
+        @_halted_callback_hook_called = nil
+        value
+      end
+    end
+
     private
       def _perform_job
         instrument(:perform_start)
         super
       end
 
-      def instrument(operation, payload = {}, &block)
-        payload[:job] = self
-        payload[:adapter] = queue_adapter
-
-        ActiveSupport::Notifications.instrument("#{operation}.active_job", payload) do
-          value = block.call if block
-          payload[:aborted] = @_halted_callback_hook_called if defined?(@_halted_callback_hook_called)
-          @_halted_callback_hook_called = nil
-          value
-        end
-      end
-
       def halted_callback_hook(*)
         super
         @_halted_callback_hook_called = true