From af87199a803df258609f6bcff96b110537279fca Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Tue, 24 Aug 2021 15:07:20 +0200
Subject: [PATCH] Handle NullObject instances in Active Job query tag

---
 activejob/lib/active_job/railtie.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activejob/lib/active_job/railtie.rb b/activejob/lib/active_job/railtie.rb
index 16021d951c..489e32aea6 100644
--- a/activejob/lib/active_job/railtie.rb
+++ b/activejob/lib/active_job/railtie.rb
@@ -70,7 +70,7 @@ module ActiveJob
         end
 
         ActiveSupport.on_load(:active_record) do
-          ActiveRecord::QueryLogs.taggings[:job] = ->(context) { context[:job].class.name }
+          ActiveRecord::QueryLogs.taggings[:job] = ->(context) { context[:job].class.name unless context[:job].nil? }
         end
       end
     end