adds a few values to good_job logs when available

When active_jobs are enqueued, this will add current_attributes for jobid, request_id, and ip_address.

Author: jason-raitz

app/controllers/application_controller.rb

@@ -3,6 +3,8 @@ class ApplicationController < ActionController::Base
   include AuthSupport
   include ExceptionHandling
 
+  before_action :set_current_request_id_and_ip_address
+
   # @!group Class Attributes
   # @!attribute [rw]
   # Value of the "Questions?" mailto link in the footer
@@ -19,6 +21,11 @@ class ApplicationController < ActionController::Base
 
   private
 
+  def set_current_request_id_and_ip_address
+    Current.request_id = request.request_id
+    Current.ip_address = request.remote_ip
+  end
+
   helper_method :authenticated?
 
   # @return Regexp Pattern determining whether a request should be "hidden"

app/jobs/application_job.rb

@@ -1,8 +1,27 @@
 class ApplicationJob < ActiveJob::Base
+  before_enqueue do
+    self.arguments << { current_attributes: Current.attributes }
+  end
+
+  around_perform do |job, block|
+    current_attributes = job.arguments.pop[:current_attributes] || {}
+    Current.set(current_attributes) do
+      block.call
+    end
+  end
+
+  around_perform :log_activejob_id
+
   def today
     @today ||= Time.zone.now.strftime('%Y%m%d')
   end
 
+  # AP-186: Add the ActiveJob ID to job logs
+  def log_activejob_id
+    logger.with_fields = { activejob_id: job_id, request_id: Current.request_id, ip_address: Current.ip_address }
+    yield
+  end
+
   # Log an exception
   def log_error(error)
     # TODO: share code w/ApplicationController

app/models/current.rb

@@ -0,0 +1,4 @@
+class Current < ActiveSupport::CurrentAttributes
+  attribute :request_id, :ip_address
+
+end