Fix initialization proccess of the query tags

The tags were being added in the wrong way, now it is always using the
configuration.

Author: rafaelfranca

actionpack/lib/action_controller/railtie.rb

@@ -92,19 +92,19 @@ class Railtie < Rails::Railtie # :nodoc:
     end
 
     initializer "action_controller.query_log_tags" do |app|
-      ActiveSupport.on_load(:active_record) do
-        if app.config.active_record.query_log_tags_enabled && app.config.action_controller.log_query_tags_around_actions != false
+      if app.config.active_record.query_log_tags_enabled && app.config.action_controller.log_query_tags_around_actions != false
+        app.config.active_record.query_log_tags += [:controller, :action]
+
+        ActiveSupport.on_load(:action_controller) do
+          include ActionController::QueryTags
+        end
+
+        ActiveSupport.on_load(:active_record) do
           ActiveRecord::QueryLogs.taggings.merge!(
             controller:            -> { context[:controller]&.controller_name },
             action:                -> { context[:controller]&.action_name },
             namespaced_controller: -> { context[:controller]&.class&.name }
           )
-
-          ActiveRecord::QueryLogs.tags + [:controller, :action]
-
-          ActiveSupport.on_load(:action_controller) do
-            include ActionController::QueryTags
-          end
         end
       end
     end

activejob/lib/active_job/railtie.rb

@@ -55,14 +55,15 @@ class Railtie < Rails::Railtie # :nodoc:
     end
 
     initializer "active_job.query_log_tags" do |app|
+      if app.config.active_record.query_log_tags_enabled && app.config.active_job.log_query_tags_around_perform != false
+        app.config.active_record.query_log_tags << :job
+
+      ActiveSupport.on_load(:active_job) do
+        include ActiveJob::QueryTags
+      end
+
       ActiveSupport.on_load(:active_record) do
-        if app.config.active_record.query_log_tags_enabled && app.config.active_job.log_query_tags_around_perform != false
           ActiveRecord::QueryLogs.taggings[:job] = -> { context[:job]&.class&.name }
-          ActiveRecord::QueryLogs.tags << :job
-
-          ActiveSupport.on_load(:active_job) do
-            include ActiveJob::QueryTags
-          end
         end
       end
     end