Extract ActiveJob::Instrumentation

Author: georgeclaghorn

activejob/lib/active_job/base.rb

@@ -10,6 +10,7 @@
 require "active_job/exceptions"
 require "active_job/log_subscriber"
 require "active_job/logging"
+require "active_job/instrumentation"
 require "active_job/timezones"
 require "active_job/translation"
 
@@ -69,6 +70,7 @@ class Base
     include Callbacks
     include Exceptions
     include Logging
+    include Instrumentation
     include Timezones
     include Translation
 

activejob/lib/active_job/instrumentation.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ActiveJob
+  module Instrumentation #:nodoc:
+    extend ActiveSupport::Concern
+
+    included do
+      around_enqueue do |job, block|
+        if job.scheduled_at
+          ActiveSupport::Notifications.instrument("enqueue_at.active_job",
+            adapter: job.class.queue_adapter, job: job, &block)
+        else
+          ActiveSupport::Notifications.instrument("enqueue.active_job",
+            adapter: job.class.queue_adapter, job: job, &block)
+        end
+      end
+
+      around_perform do |job, block|
+        payload = { adapter: job.class.queue_adapter, job: job }
+        ActiveSupport::Notifications.instrument("perform_start.active_job", payload.dup)
+        ActiveSupport::Notifications.instrument("perform.active_job", payload) do
+          block.call
+        end
+      end
+    end
+  end
+end

activejob/lib/active_job/logging.rb

@@ -11,31 +11,8 @@ module Logging #:nodoc:
     included do
       cattr_accessor :logger, default: ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT))
 
-      around_enqueue do |_, block|
-        tag_logger do
-          block.call
-        end
-      end
-
-      around_perform do |job, block|
-        tag_logger(job.class.name, job.job_id) do
-          payload = { adapter: job.class.queue_adapter, job: job }
-          ActiveSupport::Notifications.instrument("perform_start.active_job", payload.dup)
-          ActiveSupport::Notifications.instrument("perform.active_job", payload) do
-            block.call
-          end
-        end
-      end
-
-      around_enqueue do |job, block|
-        if job.scheduled_at
-          ActiveSupport::Notifications.instrument("enqueue_at.active_job",
-            adapter: job.class.queue_adapter, job: job, &block)
-        else
-          ActiveSupport::Notifications.instrument("enqueue.active_job",
-            adapter: job.class.queue_adapter, job: job, &block)
-        end
-      end
+      around_enqueue { |_, block| tag_logger(&block) }
+      around_perform { |job, block| tag_logger(job.class.name, job.job_id, &block) }
     end
 
     private