good_job 3.21.4 → 3.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9e4ef5306eec4101ebed1018da4202479324823721d34e51bfb16e1809ee4ba
-  data.tar.gz: 848574c70fb834dfa2bea8339bb7373466975fb84717c75ee51d7b4dd502235c
+  metadata.gz: 699ef4a7d62e1eb7c96644525c9e2239913fb5d23ceafacb13be172e96720532
+  data.tar.gz: dcfe3389202698fa321d4c10349758766db20811feafb10024373d54c94dcd2e
 SHA512:
-  metadata.gz: d18fb332702f5c9deed1806cc370991a2c42dc18dc81627a2e2688571967771fa0bb503268e142095ed82a97a387dbca9989070b91bdc34652a65716b1919df0
-  data.tar.gz: 988194bd1f4ffb95a0f41aae78bc5a3ecb2d2de1c8179dee58c7b0bed4ca01f4562adcd34b7e0986c75f1e80e081c78f6726d8328445df03d528ec1d680aad2f
+  metadata.gz: 77215885e8d798ba791814bb64f07f2c70d54fa0dd3bb9bbc476dc0464d4c150089bf466e4ed16b648425f78eb9b7e86f0b1259f19e166633f60619347ea3281
+  data.tar.gz: 8f1b9a3e16080e331581efbe48bea5060666c4eda460737e1a34508ee6d278abc1fea91e68d486759f39a082b1969c87f84e22a620d7598bc4f9b93d69fce7d8

data/CHANGELOG.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## [v3.22.0](https://github.com/bensheldon/good_job/tree/v3.22.0) (2024-01-03)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.21.5...v3.22.0)
+
+**Implemented enhancements:**
+
+- Add "updated at" info in secondary top navbar [\#1204](https://github.com/bensheldon/good_job/pull/1204) ([sparshalc](https://github.com/sparshalc))
+- Re-add footer with GoodJob version number [\#1201](https://github.com/bensheldon/good_job/pull/1201) ([Pauloparakleto](https://github.com/Pauloparakleto))
+- Add Active Job extension for Labels [\#1188](https://github.com/bensheldon/good_job/pull/1188) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Limiting by executed jobs count by period [\#1198](https://github.com/bensheldon/good_job/issues/1198)
+- Cron jobs processing in async mode [\#1196](https://github.com/bensheldon/good_job/issues/1196)
+- Dashboard Missing Translation? [\#1192](https://github.com/bensheldon/good_job/issues/1192)
+- Show last update on top nav bar [\#1183](https://github.com/bensheldon/good_job/issues/1183)
+- Wrong quoting of the query to spot new jobs? [\#1179](https://github.com/bensheldon/good_job/issues/1179)
+- \[Possible bug\] good\_job does not honour the wait parameter on retry\_on [\#1174](https://github.com/bensheldon/good_job/issues/1174)
+- Running GoodJob in production with systemd throws an error due to a wrong communication with WatchDog [\#1172](https://github.com/bensheldon/good_job/issues/1172)
+
+**Merged pull requests:**
+
+- Bump the bundler-dependencies group with 3 updates [\#1202](https://github.com/bensheldon/good_job/pull/1202) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Remove duplicated intro sentence in README [\#1195](https://github.com/bensheldon/good_job/pull/1195) ([benoittgt](https://github.com/benoittgt))
+- Fix namespace for `InterruptError` in README [\#1193](https://github.com/bensheldon/good_job/pull/1193) ([padde](https://github.com/padde))
+- Bump github/codeql-action from 2 to 3 [\#1191](https://github.com/bensheldon/good_job/pull/1191) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump actions/upload-artifact from 3 to 4 [\#1190](https://github.com/bensheldon/good_job/pull/1190) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Lock RubyGems version for Ruby \< 3.0 in CI [\#1189](https://github.com/bensheldon/good_job/pull/1189) ([bensheldon](https://github.com/bensheldon))
+- Active Record and Active Job name formatting [\#1182](https://github.com/bensheldon/good_job/pull/1182) ([andyatkinson](https://github.com/andyatkinson))
+- Remove redundant `good_jobs.active_job_id` index [\#1181](https://github.com/bensheldon/good_job/pull/1181) ([andyatkinson](https://github.com/andyatkinson))
+- Add missing word in readme [\#1177](https://github.com/bensheldon/good_job/pull/1177) ([Earlopain](https://github.com/Earlopain))
+
+## [v3.21.5](https://github.com/bensheldon/good_job/tree/v3.21.5) (2023-12-12)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.21.4...v3.21.5)
+
+**Fixed bugs:**
+
+- Fix conditional index migration to be rollbackable [\#1176](https://github.com/bensheldon/good_job/pull/1176) ([bensheldon](https://github.com/bensheldon))
+
 ## [v3.21.4](https://github.com/bensheldon/good_job/tree/v3.21.4) (2023-12-11)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.21.3...v3.21.4)

data/README.md

@@ -4,11 +4,11 @@
 [![Test Status](https://github.com/bensheldon/good_job/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/bensheldon/good_job/actions/workflows/test.yml?query=branch%3Amain)
 [![Ruby Toolbox](https://img.shields.io/badge/dynamic/json?color=blue&label=Ruby%20Toolbox&query=%24.projects%5B0%5D.score&url=https%3A%2F%2Fwww.ruby-toolbox.com%2Fapi%2Fprojects%2Fcompare%2Fgood_job&logo=data:image/svg+xml;base64,PHN2ZyBhcmlhLWhpZGRlbj0idHJ1ZSIgZm9jdXNhYmxlPSJmYWxzZSIgZGF0YS1wcmVmaXg9ImZhcyIgZGF0YS1pY29uPSJmbGFzayIgY2xhc3M9InN2Zy1pbmxpbmUtLWZhIGZhLWZsYXNrIGZhLXctMTQiIHJvbGU9ImltZyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2aWV3Qm94PSIwIDAgNDQ4IDUxMiI+PHBhdGggZmlsbD0id2hpdGUiIGQ9Ik00MzcuMiA0MDMuNUwzMjAgMjE1VjY0aDhjMTMuMyAwIDI0LTEwLjcgMjQtMjRWMjRjMC0xMy4zLTEwLjctMjQtMjQtMjRIMTIwYy0xMy4zIDAtMjQgMTAuNy0yNCAyNHYxNmMwIDEzLjMgMTAuNyAyNCAyNCAyNGg4djE1MUwxMC44IDQwMy41Qy0xOC41IDQ1MC42IDE1LjMgNTEyIDcwLjkgNTEyaDMwNi4yYzU1LjcgMCA4OS40LTYxLjUgNjAuMS0xMDguNXpNMTM3LjkgMzIwbDQ4LjItNzcuNmMzLjctNS4yIDUuOC0xMS42IDUuOC0xOC40VjY0aDY0djE2MGMwIDYuOSAyLjIgMTMuMiA1LjggMTguNGw0OC4yIDc3LjZoLTE3MnoiPjwvcGF0aD48L3N2Zz4=)](https://www.ruby-toolbox.com/projects/good_job)
 
-GoodJob is a multithreaded, Postgres-based, ActiveJob backend for Ruby on Rails.
+GoodJob is a multithreaded, Postgres-based, Active Job backend for Ruby on Rails.
 
-**Inspired by [Delayed::Job](https://github.com/collectiveidea/delayed_job) and [Que](https://github.com/que-rb/que), GoodJob is designed for maximum compatibility with Ruby on Rails, ActiveJob, and Postgres to be simple and performant for most workloads.**
+**Inspired by [Delayed::Job](https://github.com/collectiveidea/delayed_job) and [Que](https://github.com/que-rb/que), GoodJob is designed for maximum compatibility with Ruby on Rails, Active Job, and Postgres to be simple and performant for most workloads.**
 
-- **Designed for ActiveJob.** Complete support for [async, queues, delays, priorities, timeouts, and retries](https://edgeguides.rubyonrails.org/active_job_basics.html) with near-zero configuration.
+- **Designed for Active Job.** Complete support for [async, queues, delays, priorities, timeouts, and retries](https://edgeguides.rubyonrails.org/active_job_basics.html) with near-zero configuration.
 - **Built for Rails.** Fully adopts Ruby on Rails [threading and code execution guidelines](https://guides.rubyonrails.org/threading_and_code_execution.html) with [Concurrent::Ruby](https://github.com/ruby-concurrency/concurrent-ruby).
 - **Backed by Postgres.** Relies upon Postgres integrity, session-level Advisory Locks to provide run-once safety and stay within the limits of `schema.rb`, and LISTEN/NOTIFY to reduce queuing latency.
 - **For most workloads.** Targets full-stack teams, economy-minded solo developers, and applications that enqueue 1-million jobs/day and more.
@@ -55,7 +55,7 @@ For more of the story of GoodJob, read the [introductory blog post](https://isla
     - [Exceptions, retries, and reliability](#exceptions-retries-and-reliability)
         - [Exceptions](#exceptions)
         - [Retries](#retries)
-        - [ActionMailer retries](#actionmailer-retries)
+        - [Action Mailer retries](#action-mailer-retries)
         - [Interrupts](#interrupts)
     - [Timeouts](#timeouts)
     - [Optimize queues, threads, and processes](#optimize-queues-threads-and-processes)
@@ -63,7 +63,7 @@ For more of the story of GoodJob, read the [introductory blog post](https://isla
     - [Production setup](#production-setup)
     - [Queue performance with Queue Select Limit](#queue-performance-with-queue-select-limit)
     - [Execute jobs async / in-process](#execute-jobs-async--in-process)
-    - [Migrate to GoodJob from a different ActiveJob backend](#migrate-to-goodjob-from-a-different-activejob-backend)
+    - [Migrate to GoodJob from a different Active Job backend](#migrate-to-goodjob-from-a-different-active-job-backend)
     - [Monitor and preserve worked jobs](#monitor-and-preserve-worked-jobs)
     - [Write tests](#write-tests)
     - [PgBouncer compatibility](#pgbouncer-compatibility)
@@ -103,7 +103,7 @@ For more of the story of GoodJob, read the [introductory blog post](https://isla
     bin/rails db:migrate:animals
     ```
 
-1. Configure the ActiveJob adapter:
+1. Configure the Active Job adapter:
 
     ```ruby
     # config/application.rb or config/environments/{RAILS_ENV}.rb
@@ -116,7 +116,7 @@ For more of the story of GoodJob, read the [introductory blog post](https://isla
     YourJob.perform_later
     ```
 
-    GoodJob supports all ActiveJob features:
+    GoodJob supports all Active Job features:
 
     ```ruby
     YourJob.set(queue: :some_queue, wait: 5.minutes, priority: 10).perform_later
@@ -222,7 +222,7 @@ and this command is not required to be used.
 
 ### Configuration options
 
-ActiveJob configuration depends on where the code is placed:
+Active Job configuration depends on where the code is placed:
 
 - `config.active_job.queue_adapter = :good_job` within `config/application.rb` or `config/environments/*.rb`.
 - `ActiveJob::Base.queue_adapter = :good_job` within an initializer (e.g. `config/initializers/active_job.rb`).
@@ -321,7 +321,7 @@ config.good_job.execution_mode = :external
 
 Good Job’s general behavior can also be configured via attributes directly on the `GoodJob` module:
 
-- **`GoodJob.configure_active_record { ... }`** Inject Active Record configuration into GoodJob's base model, for example, when using [multiple databases with ActiveRecord](https://guides.rubyonrails.org/active_record_multiple_databases.html) or when other custom configuration is necessary for the ActiveRecord model to connect to the Postgres database. Example:
+- **`GoodJob.configure_active_record { ... }`** Inject Active Record configuration into GoodJob's base model, for example, when using [multiple databases with Active Record](https://guides.rubyonrails.org/active_record_multiple_databases.html) or when other custom configuration is necessary for the Active Record model to connect to the Postgres database. Example:
 
     ```ruby
     # config/initializers/good_job.rb
@@ -331,7 +331,7 @@ Good Job’s general behavior can also be configured via attributes directly on
     end
     ```
 
-- **`GoodJob.active_record_parent_class`** (string) Alternatively, modify the ActiveRecord parent class inherited by GoodJob's Active Record model `GoodJob::Job` (defaults to `"ActiveRecord::Base"`). Configure this _The value must be a String to avoid premature initialization of ActiveRecord._
+- **`GoodJob.active_record_parent_class`** (string) Alternatively, modify the Active Record parent class inherited by GoodJob's Active Record model `GoodJob::Job` (defaults to `"ActiveRecord::Base"`). Configure this _The value must be a String to avoid premature initialization of Active Record._
 
 You’ll generally want to configure these in `config/initializers/good_job.rb`, like so:
 
@@ -438,9 +438,34 @@ The Dashboard can be set to automatically refresh by checking "Live Poll" in the
 
 Higher priority numbers run first in all versions of GoodJob v3.x and below. GoodJob v4.x will change job `priority` to give smaller numbers higher priority (default: `0`), in accordance with Active Job's definition of priority (see #524). To opt-in to this behavior now, set `config.good_job.smaller_number_is_higher_priority = true` in your GoodJob initializer or `application.rb`.
 
+### Labelled jobs
+
+Labels are the recommended way to add context or metadata to specific jobs. For example, all jobs that have a dependency on an email service could be labeled `email`. Using labels requires adding the Active Job extension `GoodJob::ActiveJobExtensions::Labels` to your job class.
+
+```ruby
+class ApplicationRecord < ActiveJob::Base
+  include GoodJob::ActiveJobExtensions::Labels
+end
+
+# Add a default label to every job within the class
+class WelcomeJob < ApplicationRecord
+  self.good_job_labels = ["email"]
+
+  def perform
+    # Labels can be inspected from within the job
+    puts good_job_labels # => ["email"]
+  end
+end
+
+# Or add to individual jobs when enqueued
+WelcomeJob.set(good_job_labels: ["email"]).perform_later
+```
+
+Labels can be used to search jobs in the Dashboard. For example, to find all jobs labeled `email`, search for `email`.
+
 ### Concurrency controls
 
-GoodJob can extend ActiveJob to provide limits on concurrently running jobs, either at time of _enqueue_ or at _perform_. Limiting concurrency can help prevent duplicate, double or unnecessary jobs from being enqueued, or race conditions when performing, for example when interacting with 3rd-party APIs.
+GoodJob can extend Active Job to provide limits on concurrently running jobs, either at time of _enqueue_ or at _perform_. Limiting concurrency can help prevent duplicate, double or unnecessary jobs from being enqueued, or race conditions when performing, for example when interacting with 3rd-party APIs.
 
 ```ruby
 class MyJob < ApplicationJob
@@ -469,7 +494,7 @@ class MyJob < ApplicationJob
 
     # A unique key to be globally locked against.
     # Can be String or Lambda/Proc that is invoked in the context of the job.
-    # Note: Arguments passed to #perform_later can be accessed through ActiveJob's `arguments` method
+    # Note: Arguments passed to #perform_later can be accessed through Active Job's `arguments` method
     # which is an array containing positional arguments and, optionally, a kwarg hash.
     key: -> { "MyJob-#{arguments.first}-#{arguments.last[:version]}" } #  MyJob.perform_later("Alice", version: 'v2') => "MyJob-Alice-v2"
   )
@@ -549,11 +574,11 @@ active_jobs = GoodJob::Bulk.enqueue do
   # If an exception is raised within this block, no jobs will be inserted.
 end
 
-# All ActiveJob instances are returned from GoodJob::Bulk.enqueue.
+# All Active Job instances are returned from GoodJob::Bulk.enqueue.
 # Jobs that have been successfully enqueued have a `provider_job_id` set.
 active_jobs.all?(&:provider_job_id)
 
-# Bulk enqueue ActiveJob instances directly without using `.perform_later`:
+# Bulk enqueue Active Job instances directly without using `.perform_later`:
 GoodJob::Bulk.enqueue(MyJob.new, AnotherJob.new)
 ```
 
@@ -737,7 +762,7 @@ GoodJob follows semantic versioning, though updates may be encouraged through de
 
 Upgrading between minor versions (e.g. v1.4 to v1.5) should not introduce breaking changes, but can introduce new deprecation warnings and database migration warnings.
 
-Database migrations introduced in minor releases are _not required_ to be applied until the next major release. If you would like apply newly introduced migrations immediately, assert `GoodJob.migrated?` in your application's test suite.
+Database migrations introduced in minor releases are _not required_ to be applied until the next major release. If you would like to apply newly introduced migrations immediately, assert `GoodJob.migrated?` in your application's test suite.
 
 To perform upgrades to the GoodJob database tables:
 
@@ -791,7 +816,7 @@ Notable changes:
 - Renames `:async_server` execution mode to `:async`; renames prior `:async` execution mode to `:async_all`.
 - Sets default Development environment's execution mode to `:async` with disabled polling.
 - Excludes performing jobs from `enqueue_limit`'s count in `GoodJob::ActiveJobExtensions::Concurrency`.
-- Triggers `GoodJob.on_thread_error` for unhandled ActiveJob exceptions.
+- Triggers `GoodJob.on_thread_error` for unhandled Active Job exceptions.
 - Renames `GoodJob.reperform_jobs_on_standard_error` accessor to `GoodJob.retry_on_unhandled_error`.
 - Renames `GoodJob::Adapter.shutdown(wait:)` argument to `GoodJob::Adapter.shutdown(timeout:)`.
 - Changes Advisory Lock key format from `good_jobs[ROW_ID]` to `good_jobs-[ACTIVE_JOB_ID]`.
@@ -801,11 +826,11 @@ Notable changes:
 
 ### Exceptions, retries, and reliability
 
-GoodJob guarantees that a completely-performed job will run once and only once. GoodJob fully supports ActiveJob's built-in functionality for error handling, retries and timeouts.
+GoodJob guarantees that a completely-performed job will run once and only once. GoodJob fully supports Active Job's built-in functionality for error handling, retries and timeouts.
 
 #### Exceptions
 
-ActiveJob provides [tools for rescuing and retrying exceptions](https://guides.rubyonrails.org/active_job_basics.html#exceptions), including `retry_on`, `discard_on`, `rescue_from` that will rescue exceptions before they get to GoodJob.
+Active Job provides [tools for rescuing and retrying exceptions](https://guides.rubyonrails.org/active_job_basics.html#exceptions), including `retry_on`, `discard_on`, `rescue_from` that will rescue exceptions before they get to GoodJob.
 
 If errors do reach GoodJob, you can assign a callable to `GoodJob.on_thread_error` to be notified. For example, to log errors to an exception monitoring service like Sentry (or Bugsnag, Airbrake, Honeybadger, etc.):
 
@@ -816,9 +841,9 @@ GoodJob.on_thread_error = -> (exception) { Rails.error.report(exception) }
 
 #### Retries
 
-By default, GoodJob relies on ActiveJob's retry functionality.
+By default, GoodJob relies on Active Job's retry functionality.
 
-ActiveJob can be configured to retry an infinite number of times, with a polynomial backoff. Using ActiveJob's `retry_on` prevents exceptions from reaching GoodJob:
+Active Job can be configured to retry an infinite number of times, with a polynomial backoff. Using Active Job's `retry_on` prevents exceptions from reaching GoodJob:
 
 ```ruby
 class ApplicationJob < ActiveJob::Base
@@ -860,7 +885,7 @@ end
 
 By default, jobs will not be retried unless `retry_on` is configured. This can be overridden by setting `GoodJob.retry_on_unhandled_error` to `true`; GoodJob will then retry the failing job immediately and infinitely, potentially causing high load.
 
-#### ActionMailer retries
+#### Action Mailer retries
 
 Any configuration in `ApplicationJob` will have to be duplicated on `ActionMailer::MailDeliveryJob` because ActionMailer uses that custom class which inherits from `ActiveJob::Base`,  rather than your application's `ApplicationJob`.
 
@@ -886,16 +911,16 @@ might also be configured to use (deprecated now) `ActionMailer::DeliveryJob`.
 
 Jobs will be automatically retried if the process is interrupted while performing a job, for example as the result of a `SIGKILL` or power failure.
 
-If you need more control over interrupt-caused retries, include the `GoodJob::ActiveJobExtensions::InterruptErrors` extension in your job class. When an interrupted job is retried, the extension will raise a `GoodJob::InterruptError` exception within the job, which allows you to use ActiveJob's `retry_on` and `discard_on` to control the behavior of the job.
+If you need more control over interrupt-caused retries, include the `GoodJob::ActiveJobExtensions::InterruptErrors` extension in your job class. When an interrupted job is retried, the extension will raise a `GoodJob::InterruptError` exception within the job, which allows you to use Active Job's `retry_on` and `discard_on` to control the behavior of the job.
 
 ```ruby
 class MyJob < ApplicationJob
   # The extension must be included before other extensions
   include GoodJob::ActiveJobExtensions::InterruptErrors
   # Discard the job if it is interrupted
-  discard_on InterruptError
+  discard_on GoodJob::InterruptError
   # Retry the job if it is interrupted
-  retry_on InterruptError, wait: 0, attempts: Float::INFINITY
+  retry_on GoodJob::InterruptError, wait: 0, attempts: Float::INFINITY
 end
 ```
 
@@ -1176,9 +1201,9 @@ Depending on your application configuration, you may need to take additional ste
 
   If you are using cron-style jobs, you might also want to look at your Passenger configuration, especially at [`passenger_pool_idle_time`](https://www.phusionpassenger.com/library/config/nginx/reference/#passenger_pool_idle_time) and [`passenger_min_instances`](https://www.phusionpassenger.com/library/config/nginx/reference/#passenger_min_instances) to make sure there's always at least once process running that can execute cron-style scheduled jobs. See also [Passenger's optimization guide](https://www.phusionpassenger.com/library/config/nginx/optimization/#minimizing-process-spawning) for more information.
 
-### Migrate to GoodJob from a different ActiveJob backend
+### Migrate to GoodJob from a different Active Job backend
 
-If your application is already using an ActiveJob backend, you will need to install GoodJob to enqueue and perform newly created jobs _and_ finish performing pre-existing jobs on the previous backend.
+If your application is already using an Active Job backend, you will need to install GoodJob to enqueue and perform newly created jobs _and_ finish performing pre-existing jobs on the previous backend.
 
 1. Enqueue newly created jobs on GoodJob either entirely by setting `ActiveJob::Base.queue_adapter = :good_job` or progressively via individual job classes:
 
@@ -1198,7 +1223,7 @@ If your application is already using an ActiveJob backend, you will need to inst
     worker: bundle exec que ./config/environment.rb & bundle exec good_job & wait -n
     ```
 
-1. Once you are confident that no unperformed jobs remain in the previous ActiveJob backend, code and configuration for that backend can be completely removed.
+1. Once you are confident that no unperformed jobs remain in the previous Active Job backend, code and configuration for that backend can be completely removed.
 
 ### Monitor and preserve worked jobs
 
@@ -1271,7 +1296,7 @@ A workaround to this limitation is to make a direct database connection availabl
         url: postgres://database_host/my_database
     ```
 
-1. Create a new ActiveRecord base class that uses the direct database connection
+1. Create a new Active Record base class that uses the direct database connection
 
     ```ruby
     # app/models/application_direct_record.rb
@@ -1282,7 +1307,7 @@ A workaround to this limitation is to make a direct database connection availabl
     end
     ```
 
-1. Configure GoodJob to use the newly created ActiveRecord base class:
+1. Configure GoodJob to use the newly created Active Record base class:
 
     ```ruby
     # config/initializers/good_job.rb

data/app/controllers/good_job/jobs_controller.rb

@@ -96,7 +96,7 @@ module GoodJob
     def redirect_on_error(exception)
       alert = case exception
               when GoodJob::Job::AdapterNotGoodJobError
-                "ActiveJob Queue Adapter must be GoodJob."
+                "Active Job Queue Adapter must be GoodJob."
               when GoodJob::Job::ActionForStateMismatchError
                 "Job is not in an appropriate state for this action."
               else

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

@@ -34,7 +34,7 @@ module GoodJob
         query = query.to_s.strip
         next if query.blank?
 
-        tsvector = "(to_tsvector('english', serialized_params) || to_tsvector('english', id::text) || to_tsvector('english', COALESCE(error, '')::text))"
+        tsvector = "(to_tsvector('english', id::text) || to_tsvector('english', COALESCE(active_job_id::text, '')) || to_tsvector('english', serialized_params) || to_tsvector('english', COALESCE(error, ''))#{" || to_tsvector('english', COALESCE(array_to_string(labels, ' '), ''))" if labels_migrated?})"
         to_tsquery_function = database_supports_websearch_to_tsquery? ? 'websearch_to_tsquery' : 'plainto_tsquery'
         where("#{tsvector} @@ #{to_tsquery_function}(?)", query)
           .order(sanitize_sql_for_order([Arel.sql("ts_rank(#{tsvector}, #{to_tsquery_function}(?))"), query]) => 'DESC')

data/app/models/good_job/base_execution.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GoodJob
-  # ActiveRecord model to share behavior between {Job} and {Execution} models
+  # Active Record model to share behavior between {Job} and {Execution} models
   # which both read out of the same table.
   class BaseExecution < BaseRecord
     include AdvisoryLockable
@@ -56,6 +56,27 @@ module GoodJob
         migration_pending_warning!
         false
       end
+
+      def labels_migrated?
+        return true if columns_hash["labels"].present?
+
+        migration_pending_warning!
+        false
+      end
+
+      def labels_indices_migrated?
+        return true if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_labels)
+
+        migration_pending_warning!
+        false
+      end
+
+      def active_job_id_index_removal_migrated?
+        return true unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_active_job_id)
+
+        migration_pending_warning!
+        false
+      end
     end
 
     # The ActiveJob job class, as a string
@@ -88,6 +109,7 @@ module GoodJob
                        .tap do |job_data|
         job_data["provider_job_id"] = id
         job_data["good_job_concurrency_key"] = concurrency_key if concurrency_key
+        job_data["good_job_labels"] = Array(labels) if self.class.labels_migrated? && labels.present?
       end
     end
   end

data/app/models/good_job/execution.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GoodJob
-  # ActiveRecord model that represents an +ActiveJob+ job.
+  # Active Record model that represents an +ActiveJob+ job.
   class Execution < BaseExecution
     # Raised if something attempts to execute a previously completed Execution again.
     PreviouslyPerformedError = Class.new(StandardError)
@@ -150,9 +150,9 @@ module GoodJob
     # @return [ActiveRecord::Relation]
     scope :schedule_ordered, -> { order(coalesce_scheduled_at_created_at.asc) }
 
-    # Get Jobs were completed before the given timestamp. If no timestamp is
-    # provided, get all jobs that have been completed. By default, GoodJob
-    # destroys jobs after they are completed and this will find no jobs.
+    # Get completed jobs before the given timestamp. If no timestamp is
+    # provided, get *all* completed jobs. By default, GoodJob
+    # destroys jobs after they're completed, meaning this returns no jobs.
     # However, if you have changed {GoodJob.preserve_job_records}, this may
     # find completed Jobs.
     # @!method finished(timestamp = nil)
@@ -225,6 +225,13 @@ module GoodJob
       execution_args[:scheduled_at] = Time.zone.at(active_job.scheduled_at) if active_job.scheduled_at
       execution_args[:concurrency_key] = active_job.good_job_concurrency_key if active_job.respond_to?(:good_job_concurrency_key)
 
+      if active_job.respond_to?(:good_job_labels) && active_job.good_job_labels.any? && labels_migrated?
+        labels = active_job.good_job_labels.dup
+        labels.map! { |label| label.to_s.strip.presence }
+        labels.tap(&:compact!).tap(&:uniq!)
+        execution_args[:labels] = labels
+      end
+
       reenqueued_current_execution = CurrentThread.active_job_id && CurrentThread.active_job_id == active_job.job_id
       current_execution = CurrentThread.execution
 

data/app/models/good_job/job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module GoodJob
-  # ActiveRecord model that represents an +ActiveJob+ job.
+  # Active Record model that represents an +ActiveJob+ job.
   # There is not a table in the database whose discrete rows represents "Jobs".
   # The +good_jobs+ table is a table of individual {GoodJob::Execution}s that share the same +active_job_id+.
   # A single row from the +good_jobs+ table of executions is fetched to represent a Job.
@@ -9,7 +9,7 @@ module GoodJob
   class Job < BaseExecution
     # Raised when an inappropriate action is applied to a Job based on its state.
     ActionForStateMismatchError = Class.new(StandardError)
-    # Raised when an action requires GoodJob to be the ActiveJob Queue Adapter but GoodJob is not.
+    # Raised when GoodJob is not configured as the Active Job Queue Adapter
     AdapterNotGoodJobError = Class.new(StandardError)
     # Attached to a Job's Execution when the Job is discarded.
     DiscardJobError = Class.new(StandardError)
@@ -60,7 +60,7 @@ module GoodJob
 
     scope :unfinished_undiscrete, -> { where(finished_at: nil, retried_good_job_id: nil, is_discrete: [nil, false]) }
 
-    # The job's ActiveJob UUID
+    # The job's Active Job UUID
     # @return [String]
     def id
       active_job_id
@@ -101,7 +101,7 @@ module GoodJob
       executions.first
     end
 
-    # The number of times this job has been executed, according to ActiveJob's serialized state.
+    # The number of times this job has been executed, according to Active Job's serialized state.
     # @return [Numeric]
     def executions_count
       aj_count = serialized_params.fetch('executions', 0)

data/app/views/good_job/shared/_footer.erb

@@ -1,13 +1,5 @@
 <footer class="footer mt-auto py-3 bg-body-tertiary border-top text-muted small" id="footer" data-live-poll-region="footer">
   <div class="container-fluid">
-    <div class="row">
-      <div class="col-6">
-        <%= t(".last_update_html", time: Time.current.utc.iso8601) %>
-      </div>
-
-      <div class="col-6 text-end">
-        <%= t(".wording") %>
-      </div>
-    </div>
+    GoodJob v<%= GoodJob::VERSION %>
   </div>
 </footer>

data/app/views/good_job/shared/_navbar.erb

@@ -1,4 +1,4 @@
-<nav class="navbar navbar-expand-lg border-bottom bg-body sticky-top shadow-sm">
+<nav class="navbar navbar-expand-lg border-bottom bg-body sticky-top">
   <div class="container-fluid">
     <%= link_to t(".name"), root_path, class: "navbar-brand mb-0 h1" %>
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">

data/app/views/good_job/shared/_secondary_navbar.erb

@@ -0,0 +1,11 @@
+<nav class="navbar p-1 shadow-sm mt-auto border-bottom text-muted small" id="secondary-navbar" data-live-poll-region="secondary-navbar">
+  <div class="container-fluid">
+    <div class="flex-fill d-none d-sm-block ">
+      <%= t(".inspiration") %>
+    </div>
+    <div class="flex-fill text-end">
+      <% last_updated_at = Time.current.utc.iso8601 %>
+      <%= t(".last_updated") %>&nbsp;<time id="page-updated-at" datetime="<%= last_updated_at %>"><%== last_updated_at %></time>
+    </div>
+  </div>
+</nav>

data/app/views/layouts/good_job/application.html.erb

@@ -1,44 +1,39 @@
 <!DOCTYPE html>
 <html lang="<%= I18n.locale %>" data-bs-theme="auto">
-<head>
-  <title>Good Job Dashboard</title>
-  <meta charset="utf-8">
-  <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport">
-  <%= csrf_meta_tags %>
-  <%= csp_meta_tag %>
-
-  <%# Do not use asset tag helpers to avoid paths being overriden by config.asset_host %>
-  <%= tag.link rel: "stylesheet", href: frontend_static_path(:bootstrap, format: :css, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
-  <%= tag.link rel: "stylesheet", href: frontend_static_path(:style, format: :css, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
-
-  <%= tag.script "", src: frontend_static_path(:bootstrap, format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
-  <%= tag.script "", src: frontend_static_path(:chartjs, format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
-  <%= tag.script "", src: frontend_static_path(:rails_ujs, format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
-
-  <%= tag.script "", src: frontend_static_path(:es_module_shims, format: :js, v: GoodJob::VERSION, locale: nil), async: true, nonce: content_security_policy_nonce %>
-  <% importmaps = GoodJob::FrontendsController.js_modules.keys.index_with { |module_name| frontend_module_path(module_name, format: :js, locale: nil, v: GoodJob::VERSION) } %>
-  <%= tag.script({ imports: importmaps }.to_json.html_safe, type: "importmap", nonce: content_security_policy_nonce) %>
-  <%= tag.script "", type: "module", nonce: content_security_policy_nonce do %> import "application"; <% end %>
-  <%= tag.script "", nonce: content_security_policy_nonce do %>
-    // Ensure theme is updated before dom loads to avoid flash of style
-    let theme = localStorage.getItem('good_job-theme');
-    if (!["light", "dark"].includes(theme)) {
+  <head>
+    <title>Good Job Dashboard</title>
+    <meta charset="utf-8">
+    <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport">
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
+    <%# Do not use asset tag helpers to avoid paths being overriden by config.asset_host %>
+    <%= tag.link rel: "stylesheet", href: frontend_static_path(:bootstrap, format: :css, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+    <%= tag.link rel: "stylesheet", href: frontend_static_path(:style, format: :css, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+    <%= tag.script "", src: frontend_static_path(:bootstrap, format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+    <%= tag.script "", src: frontend_static_path(:chartjs, format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+    <%= tag.script "", src: frontend_static_path(:rails_ujs, format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+    <%= tag.script "", src: frontend_static_path(:es_module_shims, format: :js, v: GoodJob::VERSION, locale: nil), async: true, nonce: content_security_policy_nonce %>
+    <% importmaps = GoodJob::FrontendsController.js_modules.keys.index_with { |module_name| frontend_module_path(module_name, format: :js, locale: nil, v: GoodJob::VERSION) } %>
+    <%= tag.script({ imports: importmaps }.to_json.html_safe, type: "importmap", nonce: content_security_policy_nonce) %>
+    <%= tag.script "", type: "module", nonce: content_security_policy_nonce do %> import "application"; <% end %>
+    <%= tag.script "", nonce: content_security_policy_nonce do %>
+      // Ensure theme is updated before dom loads to avoid flash of style
+      let theme = localStorage.getItem('good_job-theme');
+      if (!["light", "dark"].includes(theme)) {
       theme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
-    }
-    document.documentElement.setAttribute('data-bs-theme', theme);
-  <% end %>
-</head>
-<body>
-  <div class="d-flex flex-column min-vh-100">
-    <%= render "good_job/shared/navbar" %>
-
-    <div class="container-fluid flex-grow-1 relative">
-      <%= render "good_job/shared/alert" %>
-
-      <%= yield %>
+      }
+      document.documentElement.setAttribute('data-bs-theme', theme);
+    <% end %>
+  </head>
+  <body>
+    <div class="d-flex flex-column min-vh-100">
+      <%= render "good_job/shared/navbar" %>
+      <%= render "good_job/shared/secondary_navbar" %>
+      <div class="container-fluid flex-grow-1 relative">
+        <%= render "good_job/shared/alert" %>
+        <%= yield %>
+      </div>
+      <%= render "good_job/shared/footer" %>
     </div>
-
-    <%= render "good_job/shared/footer" %>
-  </div>
-</body>
+  </body>
 </html>

data/config/locales/de.yml

@@ -219,9 +219,6 @@ de:
         placeholder: Suchen Sie nach Klasse, Job-ID, Jobparametern und Fehlertext.
         queue_name: Warteschlangenname
         search: Suchen
-      footer:
-        last_update_html: Zuletzt aktualisiert <time id="page-updated-at" datetime="%{time}">%{time}</time>
-        wording: Denk daran, auch du machst einen guten Job!
       navbar:
         batches: Batches
         cron_schedules: Cron
@@ -234,6 +231,9 @@ de:
           dark: Dunkel
           light: Licht
           theme: Thema
+      secondary_navbar:
+        inspiration: Denk daran, auch du machst einen guten Job!
+        last_updated: Zuletzt aktualisiert
     status:
       discarded: Ausrangiert
       queued: In der Warteschlange

data/config/locales/en.yml

@@ -219,9 +219,6 @@ en:
         placeholder: Search by class, job id, job params, and error text.
         queue_name: Queue name
         search: Search
-      footer:
-        last_update_html: Last updated <time id="page-updated-at" datetime="%{time}">%{time}</time>
-        wording: Remember, you're doing a Good Job too!
       navbar:
         batches: Batches
         cron_schedules: Cron
@@ -234,6 +231,9 @@ en:
           dark: Dark
           light: Light
           theme: Theme
+      secondary_navbar:
+        inspiration: Remember, you're doing a Good Job too!
+        last_updated: Last updated
     status:
       discarded: Discarded
       queued: Queued

data/config/locales/es.yml

@@ -217,9 +217,6 @@ es:
         placeholder: Buscar por clase, id de tarea, parámetros y mensaje de error.
         queue_name: Nombre de la cola
         search: Buscar
-      footer:
-        last_update_html: Última actualización <time id="page-updated-at" datetime="%{time}">%{time}</time>
-        wording: "¡Recuerda, también tú estás haciendo un buen trabajo!"
       navbar:
         batches: Batches
         cron_schedules: Cron
@@ -232,6 +229,9 @@ es:
           dark: Oscuro
           light: Luz
           theme: Tema
+      secondary_navbar:
+        inspiration: "¡Recuerda, también tú estás haciendo un buen trabajo!"
+        last_updated: Última actualización
     status:
       discarded:
         one: Descartada

data/config/locales/fr.yml

@@ -219,9 +219,6 @@ fr:
         placeholder: Recherche par classe, ID de job, paramètres de job et texte d'erreur.
         queue_name: Nom de la file d'attente
         search: Recherche
-      footer:
-        last_update_html: Dernière mise à jour <time id="page-updated-at" datetime="%{time}">%{time}</time>
-        wording: N'oublie pas, toi aussi tu fais du bon boulot !
       navbar:
         batches: Lots
         cron_schedules: Cron
@@ -234,6 +231,9 @@ fr:
           dark: Sombre
           light: Lumière
           theme: Thème
+      secondary_navbar:
+        inspiration: N'oublie pas, toi aussi tu fais du bon boulot !
+        last_updated: Dernière mise à jour
     status:
       discarded: Mis au rebut
       queued: À la file

data/config/locales/ja.yml

@@ -219,9 +219,6 @@ ja:
         placeholder: クラス名、ジョブID、ジョブパラメータ、エラーテキストで検索
         queue_name: キュー名
         search: 検索
-      footer:
-        last_update_html: 最終更新 <time id="page-updated-at" datetime="%{time}">%{time}</time>
-        wording: Remember, you're doing a Good Job too!
       navbar:
         batches: バッチ
         cron_schedules: Cron
@@ -234,6 +231,9 @@ ja:
           dark: 暗い
           light: ライト
           theme: テーマ
+      secondary_navbar:
+        inspiration: 覚えておいてください、あなたも良い仕事をしています！
+        last_updated: 最終更新
     status:
       discarded: 破棄済み
       queued: 処理待ち

data/config/locales/nl.yml

@@ -219,9 +219,6 @@ nl:
         placeholder: Zoek op klasse, taak-ID, taakparameters en fouttekst.
         queue_name: Wachtrij naam
         search: Zoekopdracht
-      footer:
-        last_update_html: Laatst bijgewerkt <time id="page-updated-at" datetime="%{time}">%{time}</time>
-        wording: 'Onthoud: jij levert ook goed werk!'
       navbar:
         batches: Batches
         cron_schedules: Cron
@@ -234,6 +231,9 @@ nl:
           dark: Donker
           light: Licht
           theme: Thema
+      secondary_navbar:
+        inspiration: 'Onthoud: jij levert ook goed werk!'
+        last_updated: Laatst bijgewerkt
     status:
       discarded: weggegooid
       queued: In de wachtrij

data/config/locales/ru.yml

@@ -245,9 +245,6 @@ ru:
         placeholder: Поиск по классу, идентификатору задания, параметрам задания и тексту ошибки.
         queue_name: Имя очереди
         search: Поиск
-      footer:
-        last_update_html: Последнее обновление <time id="page-updated-at" datetime="%{time}">%{time}</time>
-        wording: Запомни, ты делаешь Good Job тоже!
       navbar:
         batches: Batches
         cron_schedules: Cron
@@ -260,6 +257,9 @@ ru:
           dark: Темный
           light: Свет
           theme: Тема
+      secondary_navbar:
+        inspiration: Запомни, ты делаешь Good Job тоже!
+        last_updated: Последнее обновление
     status:
       discarded: Отброшено
       queued: В очереди

data/config/locales/tr.yml

@@ -219,9 +219,6 @@ tr:
         placeholder: Sınıfa, iş kimliğine, iş parametrelerine ve hata metnine göre ara.
         queue_name: Kuyruk adı
         search: Ara
-      footer:
-        last_update_html: Son güncelleme <time id="page-updated-at" datetime="%{time}">%{time}</time>
-        wording: Unutmayın, siz de iyi bir iş yapıyorsunuz!
       navbar:
         batches: Toplu İşler
         cron_schedules: Cron
@@ -234,6 +231,9 @@ tr:
           dark: Karanlık
           light: Işık
           theme: Tema
+      secondary_navbar:
+        inspiration: Unutmayın, siz de iyi bir iş yapıyorsunuz!
+        last_updated: Son güncelleme
     status:
       discarded: İptal Edildi
       queued: Sırada

data/config/locales/uk.yml

@@ -245,9 +245,6 @@ uk:
         placeholder: Пошук за класом, ідентифікатором роботи, параметрами роботи та текстом помилки.
         queue_name: Назва черги
         search: Пошук
-      footer:
-        last_update_html: Останнє оновлення <time id="page-updated-at" datetime="%{time}">%{time}</time>
-        wording: Пам'ятайте, ви теж робите хорошу роботу!
       navbar:
         batches: Batches
         cron_schedules: Cron
@@ -260,6 +257,9 @@ uk:
           dark: Темний
           light: світло
           theme: Тема
+      secondary_navbar:
+        inspiration: Пам'ятайте, ви теж робите хорошу роботу!
+        last_updated: Останнє оновлення
     status:
       discarded: Відхилено
       queued: У черзі

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

@@ -29,6 +29,7 @@ class CreateGoodJobs < ActiveRecord::Migration<%= migration_version %>
       t.integer :executions_count
       t.text :job_class
       t.integer :error_event, limit: 2
+      t.text :labels, array: true
     end
 
     create_table :good_job_batches, id: :uuid do |t|
@@ -76,12 +77,12 @@ class CreateGoodJobs < ActiveRecord::Migration<%= migration_version %>
     add_index :good_jobs, :concurrency_key, where: "(finished_at IS NULL)", name: :index_good_jobs_on_concurrency_key_when_unfinished
     add_index :good_jobs, [:cron_key, :created_at], where: "(cron_key IS NOT NULL)", name: :index_good_jobs_on_cron_key_and_created_at_cond
     add_index :good_jobs, [:cron_key, :cron_at], where: "(cron_key IS NOT NULL)", unique: true, name: :index_good_jobs_on_cron_key_and_cron_at_cond
-    add_index :good_jobs, [:active_job_id], name: :index_good_jobs_on_active_job_id
     add_index :good_jobs, [:finished_at], where: "retried_good_job_id IS NULL AND finished_at IS NOT NULL", name: :index_good_jobs_jobs_on_finished_at
     add_index :good_jobs, [:priority, :created_at], order: { priority: "DESC NULLS LAST", created_at: :asc },
       where: "finished_at IS NULL", name: :index_good_jobs_jobs_on_priority_created_at_when_unfinished
     add_index :good_jobs, [:batch_id], where: "batch_id IS NOT NULL"
     add_index :good_jobs, [:batch_callback_id], where: "batch_callback_id IS NOT NULL"
+    add_index :good_jobs, :labels, using: :gin, where: "(labels IS NOT NULL)", name: :index_good_jobs_on_labels
 
     add_index :good_job_executions, [:active_job_id, :created_at], name: :index_good_job_executions_on_active_job_id_and_created_at
   end

data/lib/generators/good_job/templates/update/migrations/07_recreate_good_job_cron_indexes_with_conditional.rb.erb

@@ -25,11 +25,11 @@ class RecreateGoodJobCronIndexesWithConditional < ActiveRecord::Migration<%= mig
 
       dir.down do
         unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_cron_key_and_created_at)
-          add_index :good_jobs, [:cron_key, :created_at], where: "(cron_key IS NOT NULL)",
+          add_index :good_jobs, [:cron_key, :created_at],
                     name: :index_good_jobs_on_cron_key_and_created_at, algorithm: :concurrently
         end
         unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_cron_key_and_cron_at)
-          add_index :good_jobs, [:cron_key, :cron_at], where: "(cron_key IS NOT NULL)", unique: true,
+          add_index :good_jobs, [:cron_key, :cron_at], unique: true,
                     name: :index_good_jobs_on_cron_key_and_cron_at, algorithm: :concurrently
         end
 

data/lib/generators/good_job/templates/update/migrations/08_create_good_job_labels.rb.erb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateGoodJobLabels < ActiveRecord::Migration<%= migration_version %>
+  def change
+    reversible do |dir|
+      dir.up do
+        # Ensure this incremental update migration is idempotent
+        # with monolithic install migration.
+        return if connection.column_exists?(:good_jobs, :labels)
+      end
+    end
+
+    add_column :good_jobs, :labels, :text, array: true
+  end
+end

data/lib/generators/good_job/templates/update/migrations/09_create_good_job_labels_index.rb.erb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class CreateGoodJobLabelsIndex < ActiveRecord::Migration<%= migration_version %>
+  disable_ddl_transaction!
+
+  def change
+    reversible do |dir|
+      dir.up do
+        unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_labels)
+          add_index :good_jobs, :labels, using: :gin, where: "(labels IS NOT NULL)",
+            name: :index_good_jobs_on_labels, algorithm: :concurrently
+        end
+      end
+
+      dir.down do
+        if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_labels)
+          remove_index :good_jobs, name: :index_good_jobs_on_labels
+        end
+      end
+    end
+  end
+end

data/lib/generators/good_job/templates/update/migrations/10_remove_good_job_active_id_index.rb.erb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class RemoveGoodJobActiveIdIndex < ActiveRecord::Migration<%= migration_version %>
+  disable_ddl_transaction!
+
+  def change
+    reversible do |dir|
+      dir.up do
+        if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_active_job_id)
+          remove_index :good_jobs, name: :index_good_jobs_on_active_job_id
+        end
+      end
+
+      dir.down do
+        unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_active_job_id)
+          add_index :good_jobs, :active_job_id, name: :index_good_jobs_on_active_job_id
+        end
+      end
+    end
+  end
+end

data/lib/good_job/active_job_extensions/labels.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module GoodJob
+  module ActiveJobExtensions
+    module Labels
+      extend ActiveSupport::Concern
+
+      module Prepends
+        def initialize(*arguments)
+          super
+          self.good_job_labels = Array(self.class.good_job_labels)
+        end
+
+        def enqueue(options = {})
+          self.good_job_labels = Array(options[:good_job_labels]) if options.key?(:good_job_labels)
+          super
+        end
+
+        def deserialize(job_data)
+          super
+          self.good_job_labels = job_data.delete("good_job_labels")&.dup || []
+        end
+      end
+
+      included do
+        prepend Prepends
+        class_attribute :good_job_labels, instance_accessor: false, instance_predicate: false, default: []
+        attr_accessor :good_job_labels
+      end
+    end
+  end
+end

data/lib/good_job/version.rb

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

data/lib/good_job.rb

@@ -12,6 +12,7 @@ require "good_job/active_job_extensions/batches"
 require "good_job/active_job_extensions/concurrency"
 require "good_job/interrupt_error"
 require "good_job/active_job_extensions/interrupt_errors"
+require "good_job/active_job_extensions/labels"
 require "good_job/active_job_extensions/notify_options"
 
 require "good_job/assignable_connection"
@@ -22,7 +23,7 @@ require "good_job/cleanup_tracker"
 require "good_job/cli"
 require "good_job/configuration"
 require "good_job/cron_manager"
-require 'good_job/current_thread'
+require "good_job/current_thread"
 require "good_job/daemon"
 require "good_job/dependencies"
 require "good_job/job_performer"
@@ -272,7 +273,7 @@ module GoodJob
   def self.migrated?
     # Always update with the most recent migration check
     GoodJob::Execution.reset_column_information
-    GoodJob::Execution.cron_indices_migrated?
+    GoodJob::Execution.active_job_id_index_removal_migrated?
   end
 
   ActiveSupport.run_load_hooks(:good_job, self)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.21.4
+  version: 3.22.0
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -307,6 +307,7 @@ files:
 - app/views/good_job/shared/_filter.erb
 - app/views/good_job/shared/_footer.erb
 - app/views/good_job/shared/_navbar.erb
+- app/views/good_job/shared/_secondary_navbar.erb
 - app/views/good_job/shared/icons/_arrow_clockwise.html.erb
 - app/views/good_job/shared/icons/_check.html.erb
 - app/views/good_job/shared/icons/_circle_half.html.erb
@@ -345,11 +346,15 @@ files:
 - lib/generators/good_job/templates/update/migrations/05_create_good_job_executions.rb.erb
 - lib/generators/good_job/templates/update/migrations/06_create_good_jobs_error_event.rb.erb
 - lib/generators/good_job/templates/update/migrations/07_recreate_good_job_cron_indexes_with_conditional.rb.erb
+- lib/generators/good_job/templates/update/migrations/08_create_good_job_labels.rb.erb
+- lib/generators/good_job/templates/update/migrations/09_create_good_job_labels_index.rb.erb
+- lib/generators/good_job/templates/update/migrations/10_remove_good_job_active_id_index.rb.erb
 - lib/generators/good_job/update_generator.rb
 - lib/good_job.rb
 - lib/good_job/active_job_extensions/batches.rb
 - lib/good_job/active_job_extensions/concurrency.rb
 - lib/good_job/active_job_extensions/interrupt_errors.rb
+- lib/good_job/active_job_extensions/labels.rb
 - lib/good_job/active_job_extensions/notify_options.rb
 - lib/good_job/adapter.rb
 - lib/good_job/assignable_connection.rb