Remove the per-app override

Author: intrip

README.md

@@ -114,7 +114,7 @@ Besides `base_controller_class`, you can also set the following for `MissionCont
 - `scheduled_job_delay_threshold`: the time duration before a scheduled job is considered delayed. Defaults to `1.minute` (a job is considered delayed if it hasn't transitioned from the `scheduled` status 1 minute after the scheduled time).
 - `show_console_help`: whether to show the console help. If you don't want the console help message, set this to `false`—defaults to `true`.
 - `backtrace_cleaner`: a backtrace cleaner used for optionally filtering backtraces on the Failed Jobs detail page. Defaults to `Rails::BacktraceCleaner.new`. See the [Advanced configuration](#advanced-configuration) section for how to configure/override this setting on a per application/server basis.
-- `filter_arguments`: an array of job argument keys that you want to filter out in the UI. This is useful for hiding sensitive user data. You can also override this option for each application. Currently, only root-level hash keys are supported. See the [Advanced configuration](#advanced-configuration) section for an example.
+- `filter_arguments`: an array of job argument keys that you want to filter out in the UI. This is useful for hiding sensitive user data. Currently, only root-level hash keys are supported.
 
 This library extends Active Job with a querying interface and the following setting:
 - `config.active_job.default_page_size`: the internal batch size that Active Job will use when sending queries to the underlying adapter and the batch size for the bulk operations defined above—defaults to `1000`.
@@ -185,9 +185,7 @@ SERVERS_BY_APP.each do |app, servers|
     # [ server, [ queue_adapter, BacktraceCleaner.new ]]  # with optional backtrace cleaner
   end.to_h
 
-  filter_arguments = %i[ author ]
-
-  MissionControl::Jobs.applications.add(app, queue_adapters_by_name, filter_arguments)
+  MissionControl::Jobs.applications.add(app, queue_adapters_by_name)
 end
 ```
 

lib/active_job/job_argument_filter.rb

@@ -11,18 +11,13 @@ def filter_arguments(arguments)
     end
 
     def filter_argument_hash(argument)
-      return argument if filters.blank?
+      return argument if MissionControl::Jobs.filter_arguments.blank?
 
       argument.each do |key, value|
-        if filters.include?(key.to_s)
+        if MissionControl::Jobs.filter_arguments.include?(key.to_s)
           argument[key] = FILTERED
         end
       end
     end
-
-    private
-      def filters
-        MissionControl::Jobs::Current.application&.filter_arguments
-      end
   end
 end

lib/mission_control/jobs/application.rb

@@ -2,12 +2,11 @@
 class MissionControl::Jobs::Application
   include MissionControl::Jobs::IdentifiedByName
 
-  attr_reader :servers, :filter_arguments
+  attr_reader :servers
 
   def initialize(name:)
     super
     @servers = MissionControl::Jobs::IdentifiedElements.new
-    @filter_arguments = []
   end
 
   def add_servers(queue_adapters_by_name)
@@ -18,8 +17,4 @@ def add_servers(queue_adapters_by_name)
         backtrace_cleaner: cleaner, application: self)
     end
   end
-
-  def filter_arguments=(arguments)
-    @filter_arguments = Array(arguments).map(&:to_s)
-  end
 end

lib/mission_control/jobs/applications.rb

@@ -1,9 +1,8 @@
 # A container to register applications
 class MissionControl::Jobs::Applications < MissionControl::Jobs::IdentifiedElements
-  def add(name, queue_adapters_by_name = {}, filter_arguments = [])
+  def add(name, queue_adapters_by_name = {})
     self << MissionControl::Jobs::Application.new(name: name).tap do |application|
       application.add_servers(queue_adapters_by_name)
-      application.filter_arguments = filter_arguments.presence || MissionControl::Jobs.filter_arguments
     end
   end
 end

test/active_job/job_argument_filter_test.rb

@@ -1,11 +1,6 @@
 require "test_helper"
 
 class ActiveJob::JobArgumentFilterTest < ActiveSupport::TestCase
-  setup do
-    @application = MissionControl::Jobs::Application.new(name: "BC4")
-    MissionControl::Jobs::Current.application = @application
-  end
-
   test "filter_arguments" do
     arguments = [
       "deliver",
@@ -15,24 +10,27 @@ class ActiveJob::JobArgumentFilterTest < ActiveSupport::TestCase
         message: "Hello!"
       }
     ]
-    @application.filter_arguments = %i[ email_address message ]
+    @previous_filter_arguments, MissionControl::Jobs.filter_arguments = MissionControl::Jobs.filter_arguments, %w[ email_address message ]
 
     filtered = ActiveJob::JobArgumentFilter.filter_arguments(arguments)
 
     assert_equal "deliver", filtered[0]
     assert_equal({ email_address: "[FILTERED]", profile: { name: "Jorge Manrubia" }, message: "[FILTERED]" }, filtered[1])
+  ensure
+    MissionControl::Jobs.filter_arguments = @previous_filter_arguments
   end
 
   test "filter_argument_hash" do
     argument = {
       email_address: "jorge@37signals.com",
       message: "Hello!"
     }
-    filtered = ActiveJob::JobArgumentFilter.filter_argument_hash(argument)
-    assert_equal({ email_address: "jorge@37signals.com", message: "Hello!" }, filtered)
+    @previous_filter_arguments, MissionControl::Jobs.filter_arguments = MissionControl::Jobs.filter_arguments, %w[ message ]
 
-    @application.filter_arguments = %i[ message ]
     filtered = ActiveJob::JobArgumentFilter.filter_argument_hash(argument)
+
     assert_equal({ email_address: "jorge@37signals.com", message: "[FILTERED]" }, filtered)
+  ensure
+    MissionControl::Jobs.filter_arguments = @previous_filter_arguments
   end
 end

test/dummy/config/initializers/mission_control_jobs.rb

@@ -15,6 +15,9 @@ def redis_connection_for(app, server)
   Resque::DataStore.new redis_namespace
 end
 
+# Filter sensitive arguments from the UI.
+MissionControl::Jobs.filter_arguments = %w[ author ]
+
 SERVERS_BY_APP.each do |app, servers|
   queue_adapters_by_name = servers.collect do |server|
     queue_adapter = if server.start_with?("resque")
@@ -26,7 +29,5 @@ def redis_connection_for(app, server)
     [ server, queue_adapter ]
   end.to_h
 
-  filter_arguments = %i[ author ]
-
-  MissionControl::Jobs.applications.add(app, queue_adapters_by_name, filter_arguments)
+  MissionControl::Jobs.applications.add(app, queue_adapters_by_name)
 end

test/system/show_failed_job_test.rb

@@ -20,7 +20,7 @@ class ShowFailedJobsTest < ApplicationSystemTestCase
     ActiveJob.jobs.failed.discard_all
     FailingPostJob.perform_later(Post.create(title: "hello_world"), 1.year.ago, author: "Jorge")
     perform_enqueued_jobs
-    @previous_filter_arguments, MissionControl::Jobs.filter_arguments = MissionControl::Jobs.filter_arguments, %i[ author ]
+    @previous_filter_arguments, MissionControl::Jobs.filter_arguments = MissionControl::Jobs.filter_arguments, %w[ author ]
 
     visit jobs_path(:failed)
     click_on "FailingPostJob"