good_job 4.22.1 → 4.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ce4bd5cfbb7e4fcc44f90099bc1aa892ef59e1294c69eac5d4279c3968db9c0
-  data.tar.gz: '093ba2cc69d8d51f38bbf4cd93d9bf97aa65d995768f00a6b0d27dbe1aacdd08'
+  metadata.gz: 50f42b2481a308af99413d1a89c0b7d3d4c2e07cc48cc29a323c3c42a528e610
+  data.tar.gz: a55f5f59b5758614fa38c79b603d4f6298b6e79de40931e05fc4cc4fa0e68f56
 SHA512:
-  metadata.gz: bcbcad67274883a3cb3d4405d7d43015c5c154241dab9c1d136ccbcae7ea53bf9e6606d4713761b7c565826487f042c0e869ecc14eafacfa46ce3bfb9de6dc26
-  data.tar.gz: 56b86db61ba722ebbe770f0f0be2f20eaea6a132af9a3d9e5f688a2c2138d3782d92a3a425ff47b0e1881539c7bfe8135c18444b887665105edc385d3f3aa3a7
+  metadata.gz: adacf056f5e11131e0bb704e5b830a11a4a64b0d0a06339c0edaa13b1d8c94bf8b7e734e0df79d3ccf0230e7ceba3da4f220d66aa4eece5dd4dd5e961af294e1
+  data.tar.gz: 7b954a6a98b208038575c4d05e6f6e18d219125daf42f66ca8d1e0223f5e18eb1250fd3c608eddeb4f8b78d94ba84f3f141805ccf24f81dedeec0a37bac808ff

data/CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## [v4.23.0](https://github.com/bensheldon/good_job/tree/v4.23.0) (2026-10-27)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v4.22.1...v4.23.0)
+
+**Implemented enhancements:**
+
+- Filter sensitive job arguments in the Dashboard [\#1881](https://github.com/bensheldon/good_job/pull/1881) ([bogdan](https://github.com/bogdan))
+
+**Fixed bugs:**
+
+- Respect enable\_listen\_notify when promoting concurrency claims [\#1892](https://github.com/bensheldon/good_job/pull/1892) ([eidam](https://github.com/eidam))
+- Downgrade lock\_type before releasing advisory lock [\#1883](https://github.com/bensheldon/good_job/pull/1883) ([jmsanders](https://github.com/jmsanders))
+
+**Closed issues:**
+
+- ConcurrencyClaim sends NOTIFY even when enable\_listen\_notify is false [\#1891](https://github.com/bensheldon/good_job/issues/1891)
+
+**Merged pull requests:**
+
+- Keep JRuby platform in Gemfile.lock when Bundler re-resolves [\#1893](https://github.com/bensheldon/good_job/pull/1893) ([bensheldon](https://github.com/bensheldon))
+- Make integration specs robust under database load; fix mixed lock strategy specs [\#1890](https://github.com/bensheldon/good_job/pull/1890) ([bensheldon](https://github.com/bensheldon))
+- Pin CI test runners to ubuntu-24.04 [\#1888](https://github.com/bensheldon/good_job/pull/1888) ([bensheldon](https://github.com/bensheldon))
+- Require the concurrent-ruby classes GoodJob uses [\#1885](https://github.com/bensheldon/good_job/pull/1885) ([czj](https://github.com/czj))
+- Add index\_good\_job\_executions\_on\_created\_at [\#1884](https://github.com/bensheldon/good_job/pull/1884) ([clinejj](https://github.com/clinejj))
+- Demo: cap YJIT memory and shrink the Rack::Attack store [\#1880](https://github.com/bensheldon/good_job/pull/1880) ([bensheldon](https://github.com/bensheldon))
+- Demo: enable rbtrace in Puma workers for heap dumps; add sheap [\#1879](https://github.com/bensheldon/good_job/pull/1879) ([bensheldon](https://github.com/bensheldon))
+- Demo: warm up Puma before forking, add Thruster, raise DB pool [\#1878](https://github.com/bensheldon/good_job/pull/1878) ([bensheldon](https://github.com/bensheldon))
+- Return 404 for GET /jobs/mass\_update instead of redirecting [\#1877](https://github.com/bensheldon/good_job/pull/1877) ([bensheldon](https://github.com/bensheldon))
+- Load execution full traces and serialized params on demand [\#1876](https://github.com/bensheldon/good_job/pull/1876) ([bensheldon](https://github.com/bensheldon))
+- Add specs for the demo's Rack::Attack rules [\#1875](https://github.com/bensheldon/good_job/pull/1875) ([bensheldon](https://github.com/bensheldon))
+- Fix demo boot: don't require rails/all in bin/rails [\#1874](https://github.com/bensheldon/good_job/pull/1874) ([bensheldon](https://github.com/bensheldon))
+- Reduce demo app memory and crawler load [\#1873](https://github.com/bensheldon/good_job/pull/1873) ([bensheldon](https://github.com/bensheldon))
+- Fix JRuby flake from inspect in wait\_until predicate expectations [\#1872](https://github.com/bensheldon/good_job/pull/1872) ([bensheldon](https://github.com/bensheldon))
+- Remove Adapter::RUNTIMES so adapters can be garbage collected [\#1870](https://github.com/bensheldon/good_job/pull/1870) ([bensheldon](https://github.com/bensheldon))
+- Add GoodJob.prune to release shut down capsules, schedulers, and notifiers [\#1869](https://github.com/bensheldon/good_job/pull/1869) ([bensheldon](https://github.com/bensheldon))
+- Use resolve\_\[property\] naming for CronEntry configuration resolvers [\#1868](https://github.com/bensheldon/good_job/pull/1868) ([bensheldon](https://github.com/bensheldon))
+- Fix inconsistencies in the Brazilian Portuguese locale [\#1867](https://github.com/bensheldon/good_job/pull/1867) ([tiagoamaro](https://github.com/tiagoamaro))
+
 ## [v4.22.1](https://github.com/bensheldon/good_job/tree/v4.22.1) (2026-10-13)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v4.22.0...v4.22.1)

data/README.md

@@ -44,6 +44,7 @@ For more of the story of GoodJob, read the [introductory blog post](https://isla
     - [Dashboard](#dashboard)
         - [API-only Rails applications](#api-only-rails-applications)
         - [Live polling](#live-polling)
+        - [Filtering sensitive arguments](#filtering-sensitive-arguments)
         - [Extending dashboard views](#extending-dashboard-views)
     - [Job priority](#job-priority)
     - [Concurrency controls](#concurrency-controls)
@@ -479,6 +480,15 @@ end
 
 The Dashboard can be set to automatically refresh by checking "Live Poll" in the Dashboard header, or by setting `?poll=10` with the interval in seconds (default 30 seconds).
 
+#### Filtering sensitive arguments
+
+The Dashboard hides job arguments the same way Rails hides them from logs:
+
+- Hash values whose keys match `Rails.application.config.filter_parameters` (e.g. `password:`) are displayed as `[FILTERED]`.
+- All arguments are displayed as `[FILTERED]` for jobs with `log_arguments` disabled, either for every job with `config.active_job.log_arguments = false` or per job class with `self.log_arguments = false`.
+
+Filtering only applies to how arguments are displayed; arguments are still stored unfiltered in the database and are used when the job is performed or retried.
+
 #### Extending dashboard views
 
 GoodJob exposes some views that are intended to be overridden by placing views in your application:
@@ -1644,7 +1654,7 @@ end
 GOOD_JOB_LOCK_STRATEGY=skiplocked
 ```
 
-All three strategies (`:advisory`, `:skiplocked`, `:hybrid`) can coexist safely during a rolling deploy — each strategy excludes jobs that are already locked by another worker regardless of which strategy that worker uses.
+During a rolling deploy, `:hybrid` workers can safely run alongside either `:advisory` or `:skiplocked` workers. But `:advisory` and `:skiplocked` workers must not run at the same time, because neither sees the other's locks and the same job may be performed twice. To move from `:advisory` to `:skiplocked`, deploy `:hybrid` first, wait until no `:advisory` workers remain, and then deploy `:skiplocked`.
 
 #### PgBouncer configuration
 

data/app/controllers/good_job/executions_controller.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module GoodJob
+  # Renders an execution's heavier details on demand so they aren't included in every job page.
+  class ExecutionsController < GoodJob::ApplicationController
+    def show
+      @execution = Execution.find_by!(id: params[:id], active_job_id: params[:job_id])
+      render layout: false
+    end
+  end
+end

data/app/models/concerns/good_job/filtered_arguments.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module GoodJob
+  # Hides sensitive Active Job arguments when displaying Job/Execution records in the Dashboard.
+  module FilteredArguments
+    # Active Job arguments with sensitive values replaced by +[FILTERED]+.
+    # Every argument is filtered when the job class has +log_arguments+ disabled
+    # (e.g. +config.active_job.log_arguments = false+); otherwise hash values whose
+    # keys match +Rails.application.config.filter_parameters+ are filtered.
+    # @return [Array]
+    def display_arguments
+      arguments = serialized_params.fetch("arguments", [])
+      return arguments.map { ActiveSupport::ParameterFilter::FILTERED } unless log_arguments?
+
+      parameter_filter = ActiveSupport::ParameterFilter.new(Rails.application.config.filter_parameters)
+      parameter_filter.filter("arguments" => arguments)["arguments"]
+    end
+
+    private
+
+    def log_arguments?
+      active_job_class = job_class&.safe_constantize
+      active_job_class = ActiveJob::Base unless active_job_class.respond_to?(:log_arguments?)
+      active_job_class.log_arguments?
+    end
+  end
+end

data/app/models/good_job/concurrency_claim.rb

@@ -172,6 +172,8 @@ module GoodJob
       end
 
       def notify(job_id)
+        return unless GoodJob.configuration.enable_listen_notify
+
         queue_name = GoodJob::Job.where(id: job_id).pick(:queue_name)
         GoodJob::Notifier.notify({ queue_name: queue_name }) if queue_name
       end

data/app/models/good_job/cron_entry.rb

@@ -139,8 +139,10 @@ module GoodJob # :nodoc:
           job_klass = resolve_job_class
           next unless job_klass.is_a?(Class)
 
-          configured_job = job_klass.set(set_value)
-          kwargs_value.present? ? configured_job.perform_later(*args_value, **kwargs_value) : configured_job.perform_later(*args_value)
+          configured_job = job_klass.set(resolve_set)
+          job_args = resolve_args
+          job_kwargs = resolve_kwargs
+          job_kwargs.present? ? configured_job.perform_later(*job_args, **job_kwargs) : configured_job.perform_later(*job_args)
         end
       end
     end
@@ -213,7 +215,8 @@ module GoodJob # :nodoc:
     end
 
     def resolve_job_class
-      value = job_class_value
+      value = job_class
+      value = value.call if value.respond_to?(:call)
       value.is_a?(String) ? value.constantize : value
     end
 
@@ -236,22 +239,17 @@ module GoodJob # :nodoc:
       schedule if schedule.instance_of?(Fugit::Cron)
     end
 
-    def job_class_value
-      value = job_class || nil
-      value.respond_to?(:call) ? value.call : value
-    end
-
-    def set_value
+    def resolve_set
       value = set || {}
       value.respond_to?(:call) ? value.call : value
     end
 
-    def args_value
+    def resolve_args
       value = args || []
       value.respond_to?(:call) ? value.call : value
     end
 
-    def kwargs_value
+    def resolve_kwargs
       value = kwargs || nil
       value.respond_to?(:call) ? value.call : value
     end

data/app/models/good_job/execution.rb

@@ -3,6 +3,7 @@
 module GoodJob # :nodoc:
   class Execution < BaseRecord
     include ErrorEvents
+    include FilteredArguments
 
     self.table_name = 'good_job_executions'
     self.implicit_order_column = 'created_at'
@@ -63,6 +64,7 @@ module GoodJob # :nodoc:
 
     def display_serialized_params
       serialized_params.merge({
+                                "arguments" => display_arguments,
                                 _good_job_execution: attributes.except('serialized_params'),
                               })
     end

data/app/models/good_job/job.rb

@@ -6,6 +6,7 @@ module GoodJob
     include AdvisoryLockable
     include Job::Lockable
     include ErrorEvents
+    include FilteredArguments
     include Filterable
     include Reportable
 
@@ -622,6 +623,7 @@ module GoodJob
     # @return [Hash]
     def display_serialized_params
       serialized_params.merge({
+                                "arguments" => display_arguments,
                                 _good_job: attributes.except('serialized_params', 'locktype', 'owns_advisory_lock'),
                               })
     end

data/app/views/good_job/executions/show.html.erb

@@ -0,0 +1,11 @@
+<%= content_tag "turbo-frame", id: dom_id(@execution, :full_trace) do %>
+  <div class="small">
+    <code class="text-wrap text-break m-0 text-secondary-emphasis">
+      <%= safe_join(@execution.error_backtrace || [], tag.br) %>
+    </code>
+  </div>
+<% end %>
+
+<%= content_tag "turbo-frame", id: dom_id(@execution, :serialized_params) do %>
+  <%= tag.pre JSON.pretty_generate(truncate_display_value(@execution.display_serialized_params)) %>
+<% end %>

data/app/views/good_job/jobs/_executions.erb

@@ -58,11 +58,7 @@
                 </div>
               <% end %>
               <%= tag.div class: "tab-pane fade", id: dom_id(execution, :full_pane), role: "tabpane", aria: { labelledby: dom_id(execution, :full) }, tabindex: 0 do %>
-                <div class="small">
-                  <code class="text-wrap text-break m-0 text-secondary-emphasis">
-                    <%= safe_join(execution.error_backtrace, tag.br) %>
-                  </code>
-                </div>
+                <%= content_tag "turbo-frame", "", id: dom_id(execution, :full_trace), src: job_execution_path(@job.id, execution.id), loading: "lazy" %>
               <% end %>
             <% end %>
           <% end %>
@@ -70,7 +66,7 @@
       <% end %>
       <%= render 'good_job/custom_execution_details', execution: execution, job: @job %>
       <%= tag.div id: dom_id(execution, "params"), class: "list-group-item collapse small bg-dark text-light" do %>
-        <%= tag.pre JSON.pretty_generate(truncate_display_value(execution.display_serialized_params)) %>
+        <%= content_tag "turbo-frame", "", id: dom_id(execution, :serialized_params), src: job_execution_path(@job.id, execution.id), loading: "lazy" %>
       <% end %>
     <% end %>
   </div>

data/app/views/good_job/jobs/show.html.erb

@@ -85,7 +85,7 @@
     <% end %>
   </h5>
 </div>
-<%= tag.pre @job.serialized_params["arguments"].map { |argument| truncate_display_value(argument).inspect }.join(', '), class: 'text-wrap text-break' %>
+<%= tag.pre @job.display_arguments.map { |argument| truncate_display_value(argument).inspect }.join(', '), class: 'text-wrap text-break' %>
 
 <%= tag.div id: dom_id(@job, "params"), class: "list-group-item collapse small bg-dark text-light" do %>
   <%= tag.pre JSON.pretty_generate(truncate_display_value(@job.display_serialized_params)) %>

data/config/locales/pt-BR.yml

@@ -37,17 +37,17 @@ pt-BR:
         no_batches_found: Nenhum lote encontrado.
     cleaner:
       index:
-        all: All
-        class: Class
-        exception: Exception
-        grouped_by_class: Discards grouped by Class
-        grouped_by_exception: Discards grouped by Exception
-        last_1_hour: Last 1 hour
-        last_24_hours: Last 24 hours
-        last_3_days: Last 3 days
-        last_3_hours: Last 3 hours
-        last_7_days: Last 7 days
-        title: Discard Cleaner
+        all: Tudo
+        class: Classe
+        exception: Exceção
+        grouped_by_class: Descartes agrupados por Classe
+        grouped_by_exception: Descartes agrupados por Exceção
+        last_1_hour: Última hora
+        last_24_hours: Últimas 24 horas
+        last_3_days: Últimos 3 dias
+        last_3_hours: Últimas 3 horas
+        last_7_days: Últimos 7 dias
+        title: Limpeza de Descartes
         total: Total
     concurrency_claims:
       states:
@@ -142,12 +142,12 @@ pt-BR:
         reschedule: Reagendar tarefa
         retry: Tentar tarefa novamente
       destroy:
-        notice: A tarefa foi excluida.
+        notice: A tarefa foi excluída.
       discard:
         notice: A tarefa foi descartada.
       executions:
-        application_trace: Application Trace
-        full_trace: Full Trace
+        application_trace: Trace da aplicação
+        full_trace: Trace completo
         in_queue: na fila
         recovery: recuperação
         runtime: tempo de execução
@@ -175,7 +175,7 @@ pt-BR:
           destroy_all: Excluir tudo
           discard_all: Descartar tudo
           reschedule_all: Reagendar tudo
-          retry_all: Tentar novamente tudo
+          retry_all: Tentar tudo novamente
           title: Ações
         no_jobs_found: Nenhuma tarefa encontrada.
         toggle_actions: Alternar Ações
@@ -204,7 +204,7 @@ pt-BR:
       job:
         arguments: Argumentos
         attempts: Tentativas
-        concurrency_claims: Reivindicações de concorrência
+        concurrency_claims: Reservas de concorrência
         labels: Rótulos
         priority: Prioridade
         queue: Fila
@@ -230,7 +230,7 @@ pt-BR:
         confirm_pause: Tem certeza que deseja pausar %{value}?
         confirm_unpause: Tem certeza que deseja retomar %{value}?
         disabled: O recurso experimental de Pausas do GoodJob está desativado por padrão porque pode degradar o desempenho. Configure para ativar
-        job_class: Classe do trabalho
+        job_class: Classe da tarefa
         label: Rótulo
         pause: Pausar
         queue: Fila
@@ -245,8 +245,8 @@ pt-BR:
         chart_title_total: Latência total média em segundos
         execution_latency: Latência de execução
         executions: Execuções
-        job_class: Classe do trabalho
-        jobs: Trabalhos
+        job_class: Classe da tarefa
+        jobs: Tarefas
         no_executions: Nenhuma execução neste intervalo de tempo.
         queue_latency: Latência na fila
         queue_name: Nome da fila
@@ -267,7 +267,9 @@ pt-BR:
           days: "%{count}d"
           hours: "%{count}h"
           minutes: "%{count}m"
-          months: "~%{count} mês"
+          months:
+            one: "~%{count} mês"
+            other: "~%{count} meses"
           seconds: "%{count}s"
           years: "~%{count}a"
         chart_bucket_size: 'Granularidade temporal do gráfico: %{size}'
@@ -317,8 +319,8 @@ pt-BR:
         search: Pesquisar
       navbar:
         batches: Lotes
-        cleaner: Discard Cleaner
-        cron_schedules: Agendamentos
+        cleaner: Limpeza de Descartes
+        cron_schedules: Tarefas Programadas
         jobs: Tarefas
         live_poll: Acompanhamento ao Vivo
         name: "GoodJob 👍"
@@ -332,7 +334,7 @@ pt-BR:
           theme: Tema
       pending_migrations: O GoodJob tem migrações pendentes no banco de dados.
       secondary_navbar:
-        inspiration: Lembre-se, você também está fazendo uma Boa Tarefa!
+        inspiration: Lembre-se, você também está fazendo um Bom Trabalho!
         last_updated: Última atualização
     status:
       discarded: Descartado

data/config/routes.rb

@@ -5,7 +5,7 @@ GoodJob::Engine.routes.draw do
 
   resources :jobs, only: %i[index show destroy] do
     collection do
-      get :mass_update, to: redirect(path: 'jobs')
+      get :mass_update, to: ->(_env) { raise ActionController::RoutingError, 'Not Found' }
       put :mass_update
     end
 
@@ -15,6 +15,8 @@ GoodJob::Engine.routes.draw do
       put :reschedule
       put :retry
     end
+
+    resources :executions, only: %i[show]
   end
   get 'jobs/metrics/primary_nav', to: 'metrics#primary_nav', as: :metrics_primary_nav
   get 'jobs/metrics/job_status', to: 'metrics#job_status', as: :metrics_job_status

data/lib/generators/good_job/templates/install/migrations/create_good_jobs.rb.erb

@@ -114,6 +114,7 @@ class CreateGoodJobs < ActiveRecord::Migration<%= migration_version %>
 
     add_index :good_job_executions, [:active_job_id, :created_at], name: :index_good_job_executions_on_active_job_id_and_created_at
     add_index :good_job_executions, :scheduled_at, name: :index_good_job_executions_on_scheduled_at
+    add_index :good_job_executions, :created_at, name: :index_good_job_executions_on_created_at
     add_index :good_jobs, [:priority, :scheduled_at, :id],
                                                       where: "finished_at IS NULL", name: "index_good_jobs_on_priority_scheduled_at_unfinished"
     add_index :good_jobs, [:queue_name, :scheduled_at, :id],

data/lib/generators/good_job/templates/update/migrations/01_create_good_jobs.rb.erb

@@ -97,6 +97,7 @@ class CreateGoodJobs < ActiveRecord::Migration<%= migration_version %>
 
     add_index :good_job_executions, [:active_job_id, :created_at], name: :index_good_job_executions_on_active_job_id_and_created_at
     add_index :good_job_executions, :scheduled_at, name: :index_good_job_executions_on_scheduled_at
+    add_index :good_job_executions, :created_at, name: :index_good_job_executions_on_created_at
     add_index :good_jobs, :locked_by_id,
       where: "locked_by_id IS NOT NULL", name: "index_good_jobs_on_locked_by_id"
     add_index :good_jobs, [:priority, :scheduled_at, :id],

data/lib/generators/good_job/templates/update/migrations/22_add_index_good_job_executions_on_created_at.rb.erb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddIndexGoodJobExecutionsOnCreatedAt < ActiveRecord::Migration<%= migration_version %>
+  disable_ddl_transaction!
+
+  def change
+    add_index :good_job_executions, :created_at,
+      name: :index_good_job_executions_on_created_at,
+      algorithm: :concurrently,
+      if_not_exists: true
+  end
+end

data/lib/good_job/adapter.rb

@@ -5,18 +5,7 @@ module GoodJob
   # ActiveJob Adapter.
   #
   class Adapter
-    # @!attribute [r] instances
-    #   @!scope class
-    #   List of all instantiated Adapters in the current process.
-    #   @return [Array<GoodJob::Adapter>, nil]
-    cattr_reader :instances, default: Concurrent::Array.new, instance_reader: false
-
-    # Mutable per-adapter state (the capsule and whether it was started), kept
-    # off the adapter instance so that the adapter itself can be made
-    # Ractor-shareable. Only accessed from the main Ractor.
-    Runtime = Struct.new(:capsule, :async_started)
-    RUNTIMES = Concurrent::Map.new
-    private_constant :Runtime, :RUNTIMES
+    include InstanceRegistry
 
     # @param execution_mode [Symbol, nil] specifies how and where jobs should be executed. You can also set this with the environment variable +GOOD_JOB_EXECUTION_MODE+.
     #
@@ -32,13 +21,15 @@ module GoodJob
     #   -+test+: +:inline+
     #  - +production+ and all other environments: +:external+
     #
-    def initialize(execution_mode: nil, _capsule: GoodJob.capsule) # rubocop:disable Lint/UnderscorePrefixedVariableName
+    # @param _capsule [GoodJob::Capsule, nil] Capsule to use instead of {GoodJob.capsule}. An adapter with
+    #   its own capsule cannot be made Ractor-shareable.
+    def initialize(execution_mode: nil, _capsule: nil) # rubocop:disable Lint/UnderscorePrefixedVariableName
       @_execution_mode_override = execution_mode
       GoodJob::Configuration.validate_execution_mode(@_execution_mode_override) if @_execution_mode_override
-      RUNTIMES[self] = Runtime.new(_capsule, false)
+      @_capsule = _capsule
 
       start_async if GoodJob.async_ready?
-      self.class.instances << self
+      register_instance
     end
 
     # Enqueues the ActiveJob job to be performed.
@@ -255,9 +246,7 @@ module GoodJob
     #   * A positive number will wait that many seconds before stopping any remaining active threads.
     # @return [void]
     def shutdown(timeout: NONE)
-      runtime = RUNTIMES[self]
-      runtime.capsule&.shutdown(timeout: timeout)
-      runtime.async_started = false
+      capsule.shutdown(timeout: timeout)
     end
 
     # This adapter's execution mode
@@ -292,40 +281,51 @@ module GoodJob
     def start_async
       return unless execute_async?
 
-      runtime = RUNTIMES[self]
-      runtime.capsule.start
-      runtime.capsule.lower_thread_priority = true if GoodJob.configuration.lower_thread_priority.in?([true, nil])
-      runtime.async_started = true
+      capsule.start
+      capsule.lower_thread_priority = true if GoodJob.configuration.lower_thread_priority.in?([true, nil])
     end
 
     # Whether the async executors are running
     # @return [Boolean]
     def async_started?
-      GoodJob::Ractors.on_main(self) { RUNTIMES[self].async_started }
+      GoodJob::Ractors.on_main(self) { capsule.running? }
+    end
+
+    # Adapters are retained until Rails has initialized so that async adapters can be started.
+    # @return [Boolean]
+    def prunable?
+      GoodJob.async_ready?
     end
 
     private
 
+    # The capsule is resolved on each use (rather than stored) so the adapter
+    # remains Ractor-shareable. Only call from the main Ractor.
+    # @return [GoodJob::Capsule]
+    def capsule
+      @_capsule || GoodJob.capsule
+    end
+
     # The capsule is not Ractor-shareable, so it is always used on the main Ractor.
     def create_capsule_thread(state)
       job_state = GoodJob::Ractors.main? ? state : GoodJob::Ractors.make_shareable(state.dup)
-      GoodJob::Ractors.on_main(self) { RUNTIMES[self].capsule&.create_thread(job_state) }
+      GoodJob::Ractors.on_main(self) { capsule&.create_thread(job_state) }
     end
 
     def register_tracker
       GoodJob::Ractors.on_main(self) do
-        tracker = RUNTIMES[self].capsule.tracker
+        tracker = capsule.tracker
         tracker.register
         tracker.id_for_lock
       end
     end
 
     def unregister_tracker
-      GoodJob::Ractors.on_main(self) { RUNTIMES[self].capsule.tracker.unregister }
+      GoodJob::Ractors.on_main(self) { capsule.tracker.unregister }
     end
 
     def tracker_id_for_lock
-      GoodJob::Ractors.on_main(self) { RUNTIMES[self].capsule.tracker.id_for_lock }
+      GoodJob::Ractors.on_main(self) { capsule.tracker.id_for_lock }
     end
 
     # Active Record does not support +insert_all+ outside of the main Ractor.

data/lib/good_job/capsule.rb

@@ -5,11 +5,7 @@ module GoodJob
   # a {GoodJob::Scheduler}, {GoodJob::Poller}, {GoodJob::Notifier}, and {GoodJob::CronManager}.
   # GoodJob creates a default capsule on initialization.
   class Capsule
-    # @!attribute [r] instances
-    #   @!scope class
-    #   List of all instantiated Capsules in the current process.
-    #   @return [Array<GoodJob::Capsule>, nil]
-    cattr_reader :instances, default: Concurrent::Array.new, instance_reader: false
+    include InstanceRegistry
 
     delegate :register, :renew, :unregister, :id_for_lock, to: :@tracker, prefix: :_tracker
 
@@ -26,7 +22,7 @@ module GoodJob
       @tracker = GoodJob::CapsuleTracker.new(executor: @shared_executor)
       @lower_thread_priority = nil
 
-      self.class.instances << self
+      register_instance
     end
 
     # Start the capsule once. After a shutdown, {#restart} must be used to start again.
@@ -37,6 +33,8 @@ module GoodJob
       @mutex.synchronize do
         return unless startable?(force: force)
 
+        register_instance
+
         @notifier = GoodJob::Notifier.new(enable_listening: configuration.enable_listen_notify, capsule: self, executor: @shared_executor)
         @poller = GoodJob::Poller.new(poll_interval: configuration.poll_interval)
         @multi_scheduler = GoodJob::MultiScheduler.from_configuration(configuration, capsule: self, warm_cache_on_initialize: true).tap do |multischeduler|
@@ -116,12 +114,14 @@ module GoodJob
       @multi_scheduler&.lower_thread_priority = value
     end
 
-    private
-
+    # Configuration for this capsule, falling back to the global configuration.
+    # @return [GoodJob::Configuration]
     def configuration
       @configuration || GoodJob.configuration
     end
 
+    private
+
     def startable?(force: false)
       !@started_at && (@startable || force)
     end

data/lib/good_job/capsule_tracker.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "concurrent/errors"
+require "concurrent/scheduled_task"
+
 module GoodJob # :nodoc:
   # CapsuleTracker save a record in the database and periodically refreshes it. The intention is to
   # create a heartbeat that can be used to determine whether a capsule/process is still active
@@ -16,11 +19,7 @@ module GoodJob # :nodoc:
     # @return [Integer]
     attr_reader :advisory_locks
 
-    # @!attribute [r] instances
-    #   @!scope class
-    #   List of all instantiated CapsuleTrackers in the current process.
-    #   @return [Array<GoodJob::CapsuleTracker>, nil]
-    cattr_reader :instances, default: Concurrent::Array.new, instance_reader: false
+    include InstanceRegistry
 
     # @param executor [Concurrent::AbstractExecutorService] The executor to use for refreshing the process record.
     def initialize(executor: Concurrent.global_io_executor)
@@ -32,10 +31,9 @@ module GoodJob # :nodoc:
       @record_id = SecureRandom.uuid
       @record = nil
       @refresh_task = nil
+      @pid = ::Process.pid
 
-      ActiveSupport::ForkTracker.after_fork { reset }
-
-      self.class.instances << self
+      register_instance
     end
 
     # The UUID to use for locking. May be nil if the process is not registered or is unusable/expired.
@@ -57,10 +55,18 @@ module GoodJob # :nodoc:
       value
     end
 
+    # Whether the tracker has no active registrations and can be removed from {.instances}.
+    # It is re-added to {.instances} when it is registered again.
+    # @return [Boolean]
+    def prunable?
+      @locks.zero?
+    end
+
     # The expected UUID of the process for use in inspection.
     # Use {#id_for_lock} if using this as a lock key.
     # @return [String]
     def process_id
+      reset if forked?
       @record_id
     end
 
@@ -75,6 +81,7 @@ module GoodJob # :nodoc:
       # where with_connection always returns a newly borrowed connection.
       GoodJob::Process.lease_connection if with_advisory_lock && advisory_lock_connection.nil?
 
+      register_instance
       synchronize(with_connection: with_advisory_lock) do
         if with_advisory_lock && !advisory_locked?
           if @record
@@ -112,9 +119,10 @@ module GoodJob # :nodoc:
         if with_advisory_lock && @advisory_locked
           active = advisory_locked?
           if !active || matches_advisory_locked_connection?(advisory_lock_connection)
-            @record.advisory_unlock(connection: advisory_lock_connection) if active
-            # Remaining jobs need heartbeat liveness once the advisory lock is gone.
+            # Move remaining jobs to heartbeat liveness before releasing the lock; otherwise
+            # another process's cleanup can see an unlocked advisory record and release them.
             @record&.update(lock_type: nil) if @locks > 1
+            @record.advisory_unlock(connection: advisory_lock_connection) if active
             @advisory_locked = false
             @advisory_locked_connection = nil
           end
@@ -213,7 +221,14 @@ module GoodJob # :nodoc:
       synchronize { ns_reset }
     end
 
+    # Reset lazily after a fork (rather than with an ActiveSupport::ForkTracker callback)
+    # so that the tracker is not retained after it is no longer used.
+    def forked?
+      @pid != ::Process.pid
+    end
+
     def ns_reset
+      @pid = ::Process.pid
       @record_id = SecureRandom.uuid
       @record = nil
       @advisory_locked = false
@@ -235,7 +250,10 @@ module GoodJob # :nodoc:
       elsif @mutex.owned?
         yield
       else
-        @mutex.synchronize(&block)
+        @mutex.synchronize do
+          ns_reset if forked?
+          yield
+        end
       end
     end
   end

data/lib/good_job/cron_manager.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "concurrent/errors"
+require "concurrent/future"
 require "concurrent/hash"
 require "concurrent/scheduled_task"
 require "fugit"
@@ -9,11 +11,7 @@ module GoodJob # :nodoc:
   # CronManagers enqueue jobs on a repeating schedule.
   #
   class CronManager
-    # @!attribute [r] instances
-    #   @!scope class
-    #   List of all instantiated CronManagers in the current process.
-    #   @return [Array<GoodJob::CronManager>, nil]
-    cattr_reader :instances, default: Concurrent::Array.new, instance_reader: false
+    include InstanceRegistry
 
     # Task observer for cron task
     # @param time [Time]
@@ -41,11 +39,12 @@ module GoodJob # :nodoc:
       @graceful_restart_period = graceful_restart_period
 
       start if start_on_initialize
-      self.class.instances << self
+      register_instance
     end
 
     # Schedule tasks that will enqueue jobs based on their schedule
     def start
+      register_instance
       ActiveSupport::Notifications.instrument("cron_manager_start.good_job", cron_entries: cron_entries) do
         @running = true
         graceful_restart = graceful_restart?

data/lib/good_job/instance_registry.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "concurrent/array"
+
+module GoodJob # :nodoc:
+  # Tracks instances of a class in a class-level +instances+ registry so they can be
+  # shut down or restarted together (e.g. by {GoodJob.shutdown} and {GoodJob.restart}).
+  # Instances remain in the registry after they are shut down so that they can be
+  # restarted; use +prune+ to remove them so they can be garbage collected.
+  module InstanceRegistry
+    extend ActiveSupport::Concern
+
+    included do
+      # @!attribute [r] instances
+      #   @!scope class
+      #   List of all registered instances in the current process.
+      #   @return [Array]
+      cattr_reader :instances, default: Concurrent::Array.new, instance_reader: false
+    end
+
+    class_methods do
+      # Removes prunable (e.g. shut down) instances from the registry so they can be garbage collected.
+      # Instances are re-registered if they are started again.
+      # @return [Array] The pruned instances.
+      def prune
+        pruned = instances.select(&:prunable?)
+        instances.delete_if { |instance| pruned.include?(instance) }
+        pruned
+      end
+    end
+
+    # Whether the instance can be removed from the registry.
+    # @return [Boolean]
+    def prunable?
+      shutdown?
+    end
+
+    private
+
+    def register_instance
+      instances = self.class.instances
+      instances << self unless instances.include?(self)
+    end
+  end
+end

data/lib/good_job/job_performer.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'concurrent/delay'
+require "concurrent/set"
 
 module GoodJob
   #
@@ -32,7 +33,7 @@ module GoodJob
     def next
       active_job_id = nil
       @capsule.tracker.register do
-        job_query.perform_with_lock(lock_id: @capsule.tracker.id_for_lock, parsed_queues: parsed_queues, queue_select_limit: GoodJob.configuration.queue_select_limit, lock_strategy: GoodJob.configuration.lock_strategy) do |execution|
+        job_query.perform_with_lock(lock_id: @capsule.tracker.id_for_lock, parsed_queues: parsed_queues, queue_select_limit: @capsule.configuration.queue_select_limit, lock_strategy: @capsule.configuration.lock_strategy) do |execution|
           @metrics.touch_check_queue_at
 
           if execution

data/lib/good_job/notifier.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/module/attribute_accessors_per_thread'
+require "concurrent/array"
 require 'concurrent/atomic/atomic_boolean'
+require "concurrent/atomic/atomic_fixnum"
+require "concurrent/atomic/event"
 require "concurrent/scheduled_task"
 require "good_job/notifier/process_heartbeat"
 
@@ -39,11 +42,7 @@ module GoodJob # :nodoc:
       PG::Error
     ].freeze
 
-    # @!attribute [r] instances
-    #   @!scope class
-    #   List of all instantiated Notifiers in the current process.
-    #   @return [Array<GoodJob::Notifier>, nil]
-    cattr_reader :instances, default: Concurrent::Array.new, instance_reader: false
+    include InstanceRegistry
 
     # @!attribute [rw] connection
     #   @!scope class
@@ -85,7 +84,6 @@ module GoodJob # :nodoc:
       @last_keepalive_time = Time.current
 
       start
-      self.class.instances << self
     end
 
     def running?
@@ -192,6 +190,7 @@ module GoodJob # :nodoc:
     delegate :synchronize, to: :@monitor
 
     def start
+      register_instance
       synchronize do
         return if @running.true?
 

data/lib/good_job/poller.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
+require "concurrent/array"
 require 'concurrent/atomic/atomic_boolean'
+require "concurrent/timer_task"
 
 module GoodJob # :nodoc:
   #
@@ -14,11 +16,7 @@ module GoodJob # :nodoc:
       run_now: true,
     }.freeze
 
-    # @!attribute [r] instances
-    #   @!scope class
-    #   List of all instantiated Pollers in the current process.
-    #   @return [Array<GoodJob::Poller>, nil]
-    cattr_reader :instances, default: Concurrent::Array.new, instance_reader: false
+    include InstanceRegistry
 
     # Creates GoodJob::Poller from a GoodJob::Configuration instance.
     # @param configuration [GoodJob::Configuration]
@@ -40,7 +38,6 @@ module GoodJob # :nodoc:
       @timer_options[:execution_interval] = poll_interval if poll_interval.present?
 
       create_timer
-      self.class.instances << self
     end
 
     # Tests whether the timer is running.
@@ -99,6 +96,7 @@ module GoodJob # :nodoc:
 
     # @return [void]
     def create_timer
+      register_instance
       return if @timer_options[:execution_interval] <= 0
 
       @timer = Concurrent::TimerTask.new(@timer_options) do

data/lib/good_job/probe_server/simple_handler.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "concurrent/atomic/atomic_boolean"
+require "concurrent/future"
+
 module GoodJob
   class ProbeServer
     class SimpleHandler

data/lib/good_job/probe_server/webrick_handler.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "concurrent/future"
+
 module GoodJob
   class ProbeServer
     class WebrickHandler

data/lib/good_job/probe_server.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "concurrent/errors"
+
 module GoodJob
   class ProbeServer
     def self.task_observer(time, output, thread_error) # rubocop:disable Lint/UnusedMethodArgument

data/lib/good_job/ractors.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "concurrent/map"
+
 module GoodJob
   # Compatibility layer for running GoodJob in a Ractor-ized Rails application.
   #

data/lib/good_job/scheduler.rb

@@ -2,6 +2,7 @@
 
 require "concurrent/executor/thread_pool_executor"
 require "concurrent/executor/timer_set"
+require "concurrent/future"
 require "concurrent/scheduled_task"
 require "concurrent/utility/processor_counter"
 
@@ -32,11 +33,7 @@ module GoodJob # :nodoc:
     # In CRuby, this sets the thread quantum to ~12.5ms ( 100ms * 2^(-3) ).
     LOW_THREAD_PRIORITY = -3
 
-    # @!attribute [r] instances
-    #   @!scope class
-    #   List of all instantiated Schedulers in the current process.
-    #   @return [Array<GoodJob::Scheduler>, nil]
-    cattr_reader :instances, default: Concurrent::Array.new, instance_reader: false
+    include InstanceRegistry
 
     # Human readable name of the scheduler that includes configuration values.
     # @return [String]
@@ -74,7 +71,6 @@ module GoodJob # :nodoc:
 
       create_executor
       warm_cache if warm_cache_on_initialize
-      self.class.instances << self
     end
 
     # Tests whether the scheduler is running.
@@ -270,6 +266,7 @@ module GoodJob # :nodoc:
 
     # @return [void]
     def create_executor
+      register_instance
       instrument("scheduler_create_pool", { performer_name: performer.name, max_threads: @executor_options[:max_threads] }) do
         @timer_set = TimerSet.new
         @executor = ThreadPoolExecutor.new(@executor_options)

data/lib/good_job/shared_executor.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'concurrent/executor/executor_service'
+require "concurrent/executor/thread_pool_executor"
 
 module GoodJob
   class SharedExecutor
@@ -9,18 +10,14 @@ module GoodJob
 
     MAX_THREADS = 2
 
-    # @!attribute [r] instances
-    #   @!scope class
-    #   List of all instantiated SharedExecutor in the current process.
-    #   @return [Array<GoodJob::SharedExecutor>, nil]
-    cattr_reader :instances, default: Concurrent::Array.new, instance_reader: false
+    include InstanceRegistry
 
     attr_reader :executor
 
     def initialize
       @mutex = Mutex.new
 
-      self.class.instances << self
+      register_instance
     end
 
     def post(*args, &task)
@@ -75,6 +72,7 @@ module GoodJob
     private
 
     def create_executor
+      register_instance
       @executor = Concurrent::ThreadPoolExecutor.new(
         # On JRuby, a Java thread pool with an unbounded queue never grows beyond min_threads (except to a single
         # thread from 0), and the Notifier's listen loop occupies a thread for as long as it runs.

data/lib/good_job/systemd_service.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "concurrent/errors"
 require 'concurrent/timer_task'
 require 'good_job/sd_notify'
 

data/lib/good_job/version.rb

@@ -2,7 +2,7 @@
 
 module GoodJob
   # GoodJob gem version.
-  VERSION = '4.22.1'
+  VERSION = '4.23.0'
 
   # GoodJob version as Gem::Version object
   GEM_VERSION = Gem::Version.new(VERSION)

data/lib/good_job.rb

@@ -7,6 +7,7 @@ require_relative "good_job/version"
 require_relative "good_job/engine"
 require_relative "good_job/ractors"
 
+require_relative "good_job/instance_registry"
 require_relative "good_job/adapter"
 require_relative "good_job/adapter/inline_buffer"
 require_relative "active_job/queue_adapters/good_job_adapter"
@@ -249,6 +250,16 @@ module GoodJob
     Capsule.instances.all?(&:shutdown?)
   end
 
+  # Removes shut down instances (e.g. {GoodJob::Capsule}, {GoodJob::Scheduler}, {GoodJob::Notifier}) from their
+  # class-level registries so they can be garbage collected. Shut down instances are otherwise retained so that
+  # {.restart} can restart them; pruned instances will not be restarted by {.restart} unless started again directly.
+  # This is useful in processes that repeatedly create and shut down capsules, such as test suites.
+  # @return [void]
+  def self.prune
+    [Adapter, Capsule, CronManager, Notifier, Poller, Scheduler, SharedExecutor, CapsuleTracker].each(&:prune)
+    nil
+  end
+
   # Stops and restarts executing jobs.
   # GoodJob does its work in pools of background threads.
   # When forking processes you should shut down these background threads before forking, and restart them after forking.
@@ -387,8 +398,8 @@ module GoodJob
   # For use in tests/CI to validate GoodJob is up-to-date.
   # @return [Boolean]
   def self.migrated?
-    GoodJob::ConcurrencyClaim.connection_pool.with_connection do |connection|
-      connection.table_exists?(GoodJob::ConcurrencyClaim.table_name)
+    GoodJob::Execution.connection_pool.with_connection do |connection|
+      connection.index_name_exists?(GoodJob::Execution.table_name, :index_good_job_executions_on_created_at)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 4.22.1
+  version: 4.23.0
 platform: ruby
 authors:
 - Ben Sheldon
@@ -275,6 +275,7 @@ files:
 - app/controllers/good_job/batches_controller.rb
 - app/controllers/good_job/cleaner_controller.rb
 - app/controllers/good_job/cron_entries_controller.rb
+- app/controllers/good_job/executions_controller.rb
 - app/controllers/good_job/frontends_controller.rb
 - app/controllers/good_job/jobs_controller.rb
 - app/controllers/good_job/metrics_controller.rb
@@ -307,6 +308,7 @@ files:
 - app/models/concerns/good_job/advisory_lockable.rb
 - app/models/concerns/good_job/error_events.rb
 - app/models/concerns/good_job/filterable.rb
+- app/models/concerns/good_job/filtered_arguments.rb
 - app/models/concerns/good_job/reportable.rb
 - app/models/good_job/active_record_parent_class.rb
 - app/models/good_job/base_record.rb
@@ -332,6 +334,7 @@ files:
 - app/views/good_job/cleaner/index.html.erb
 - app/views/good_job/cron_entries/index.html.erb
 - app/views/good_job/cron_entries/show.html.erb
+- app/views/good_job/executions/show.html.erb
 - app/views/good_job/jobs/_executions.erb
 - app/views/good_job/jobs/_table.erb
 - app/views/good_job/jobs/index.html.erb
@@ -394,6 +397,7 @@ files:
 - lib/generators/good_job/templates/update/migrations/19_remove_redundant_good_jobs_indexes.rb.erb
 - lib/generators/good_job/templates/update/migrations/20_reorder_good_jobs_cron_index.rb.erb
 - lib/generators/good_job/templates/update/migrations/21_create_good_job_concurrency_claims.rb.erb
+- lib/generators/good_job/templates/update/migrations/22_add_index_good_job_executions_on_created_at.rb.erb
 - lib/generators/good_job/update_generator.rb
 - lib/good_job.rb
 - lib/good_job/active_job_extensions/batches.rb
@@ -416,6 +420,7 @@ files:
 - lib/good_job/daemon.rb
 - lib/good_job/dependencies.rb
 - lib/good_job/engine.rb
+- lib/good_job/instance_registry.rb
 - lib/good_job/interrupt_error.rb
 - lib/good_job/interrupted_error.rb
 - lib/good_job/job_performer.rb