better request_id passing

 - removes remote_ip from log message

Author: jason-raitz

app/controllers/application_controller.rb

@@ -3,7 +3,7 @@ class ApplicationController < ActionController::Base
   include AuthSupport
   include ExceptionHandling
 
-  before_action :set_current_request_id_and_ip_address
+  before_action :set_current_request_id
 
   # @!group Class Attributes
   # @!attribute [rw]
@@ -21,9 +21,8 @@ class ApplicationController < ActionController::Base
 
   private
 
-  def set_current_request_id_and_ip_address
+  def set_current_request_id
     Current.request_id = request.request_id
-    Current.ip_address = request.remote_ip
   end
 
   helper_method :authenticated?

app/jobs/application_job.rb

@@ -1,13 +1,13 @@
 class ApplicationJob < ActiveJob::Base
+  attr_reader :request_id
+
   before_enqueue do
-    self.arguments << { current_attributes: Current.attributes }
+    self.arguments << { request_id: Current.request_id }
   end
 
   around_perform do |job, block|
-    current_attributes = job.arguments.pop[:current_attributes] || {}
-    Current.set(current_attributes) do
-      block.call
-    end
+    @request_id = job.arguments.pop[:request_id] || ''
+    block.call
   end
 
   around_perform :log_activejob_id
@@ -18,7 +18,7 @@ def today
 
   # 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 }
+    logger.with_fields = { activejob_id: job_id, request_id: @request_id }
     yield
   end
 

app/models/current.rb

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