Make job.instrument public with nodoc

Author: djmb

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/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

activerecord/lib/active_record/railties/job_runtime.rb

@@ -5,19 +5,18 @@
 module ActiveRecord
   module Railties # :nodoc:
     module JobRuntime # :nodoc:
-      private
-        def instrument(operation, payload = {}, &block)
-          if operation == :perform && block
-            super(operation, payload) do
-              db_runtime_before_perform = ActiveRecord::RuntimeRegistry.sql_runtime
-              result = block.call
-              payload[:db_runtime] = ActiveRecord::RuntimeRegistry.sql_runtime - db_runtime_before_perform
-              result
-            end
-          else
-            super
+      def instrument(operation, payload = {}, &block) # :nodoc:
+        if operation == :perform && block
+          super(operation, payload) do
+            db_runtime_before_perform = ActiveRecord::RuntimeRegistry.sql_runtime
+            result = block.call
+            payload[:db_runtime] = ActiveRecord::RuntimeRegistry.sql_runtime - db_runtime_before_perform
+            result
           end
+        else
+          super
         end
+      end
     end
   end
 end