Merge pull request #21518 from codebaker95/activejob_logging_fix

Properly log nested parameters to Active Job

2 files changed, 23 insertions, 1 deletions

diff --git a/activejob/lib/active_job/logging.rb b/activejob/lib/active_job/logging.rb
index 54774db601..d72e1bdfce 100644
--- a/activejob/lib/active_job/logging.rb
+++ b/activejob/lib/active_job/logging.rb
@@ -1,3 +1,4 @@
+require 'active_support/core_ext/hash/transform_values'
 require 'active_support/core_ext/string/filters'
 require 'active_support/tagged_logging'
 require 'active_support/logger'
@@ -87,12 +88,25 @@ module ActiveJob
         def args_info(job)
           if job.arguments.any?
             ' with arguments: ' +
-              job.arguments.map { |arg| arg.try(:to_global_id).try(:to_s) || arg.inspect }.join(', ')
+              job.arguments.map { |arg| format(arg).inspect }.join(', ')
           else
             ''
           end
         end
 
+        def format(arg)
+          case arg
+          when Hash
+            arg.transform_values { |value| format(value) }
+          when Array
+            arg.map { |value| format(value) }
+          when GlobalID::Identification
+            arg.to_global_id rescue arg
+          else
+            arg
+          end
+        end
+
         def scheduled_at(event)
           Time.at(event.payload[:job].scheduled_at).utc
         end
diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb
index b18be553ec..820e9112de 100644
--- a/activejob/test/cases/logging_test.rb
+++ b/activejob/test/cases/logging_test.rb
@@ -74,6 +74,14 @@ class LoggingTest < ActiveSupport::TestCase
     assert_match(%r{Performing.*gid://aj/Person/123}, @logger.messages)
   end
 
+  def test_globalid_nested_parameter_logging
+    person = Person.new(123)
+    LoggingJob.perform_later(person: person)
+    assert_match(%r{Enqueued.*gid://aj/Person/123}, @logger.messages)
+    assert_match(%r{Dummy, here is it: .*#<Person:.*>}, @logger.messages)
+    assert_match(%r{Performing.*gid://aj/Person/123}, @logger.messages)
+  end
+
   def test_enqueue_job_logging
     HelloJob.perform_later "Cristian"
     assert_match(/Enqueued HelloJob \(Job ID: .*?\) to .*?:.*Cristian/, @logger.messages)