better request_id removal from args

- replaces the positional removal with a destructuring and reassignment.

Author: jason-raitz

app/jobs/application_job.rb

@@ -1,18 +1,18 @@
 class ApplicationJob < ActiveJob::Base
+  # This is a little unorthodox, but we want the request_id to be available as an instance variable on the job,
+  # so we add it to the arguments before the job is enqueued and then pull it out in a before_perform callback.
+  # Admittedly, the request_id method mutates the arguments as a side effect of pulling the request_id out.
+
   before_enqueue do
     arguments << { request_id: Current.request_id } if Current.request_id
   end
 
   before_perform :log_job_metadata
 
   def request_id
-    if !defined? @request_id
-      if arguments.last.is_a?(Hash) && arguments.last.key?(:request_id)
-        @request_id = arguments.pop[:request_id]
-      else
-        @request_id = nil
-      end
-    end
+    r_id_hash, rest = arguments.partition { |arg| arg.is_a?(Hash) && arg.key?(:request_id) } unless defined? @request_id
+    self.arguments = rest if rest.any?
+    @request_id = r_id_hash.first[:request_id] if r_id_hash.any?
     @request_id
   end