good_job 3.15.4 → 3.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee08a99ae7d26df57e3f0a7a64b737e987041815805117ac6d4e6119df229932
-  data.tar.gz: fd747fed38d2227bde7898438b6d597d55c5cb72f6f7125171b5637aff168d5a
+  metadata.gz: 20bb64485159969378a5abf5d960de13a3f27df63846f85cda6e4ef410c9af23
+  data.tar.gz: de0d39b68577c973ca4a4c9d9bccd8bda29bad7e6ca5a936112db7c8df6b038b
 SHA512:
-  metadata.gz: e32e66f000d6d7cd0a84fd6ab5a7bdf08f2a5f996bd5533ffc11f68ba33ee96e9d4ddc90a64dea1dbfcad43b07b75fcb34ed66c38546cda52b2cd5c0da90a329
-  data.tar.gz: 8f2a8c72500ee21f634ae6436d12ddc0641e730281b8b9534189f5892b795c6dc3a214e30e4a348878285a8912342dea3fbc74a6ab615a4de5b38f025767db3f
+  metadata.gz: 9fa9474d0ee2ff9e8e47aa5e3cc31d6cd1924c7d00276a9da2bc4611b970ea80d68a0bc79c9da7f4266c85e0bedfc491860dabff4d4e1088d485a11a21a895f5
+  data.tar.gz: eb6a2ea5cdacd25fd930aab7eba6b498ffb5998fa82c78e552f7acaebf59f6f6cd950fb6488e4c317b461ff8931df5250820cdeb46d40a4047a1e8c24495756b

data/CHANGELOG.md

@@ -1,5 +1,177 @@
 # Changelog
 
+## [v3.16.0](https://github.com/bensheldon/good_job/tree/v3.16.0) (2023-07-10)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.14...v3.16.0)
+
+**Implemented enhancements:**
+
+- Add `GoodJob.configure_active_record` as alternative to `GoodJob.active_record_parent_class` [\#1004](https://github.com/bensheldon/good_job/pull/1004) ([bensheldon](https://github.com/bensheldon))
+- Configure `dashboard_default_locale` using custom subclass of `I18n::Config` to isolate I18n configuration from parent application [\#1001](https://github.com/bensheldon/good_job/pull/1001) ([bensheldon](https://github.com/bensheldon))
+- Create `error_event` column to track the context of an error \(discarded, retried, retry\_stopped, etc\) [\#995](https://github.com/bensheldon/good_job/pull/995) ([bensheldon](https://github.com/bensheldon))
+- Added metrics to Scheduler and track in Process state [\#984](https://github.com/bensheldon/good_job/pull/984) ([AndersGM](https://github.com/AndersGM))
+
+**Fixed bugs:**
+
+- Use Concurrent::Array for class `instances` to avoid JRuby synchronization errors [\#1002](https://github.com/bensheldon/good_job/pull/1002) ([bensheldon](https://github.com/bensheldon))
+- Add test to assert enqueuing behavior within transactions [\#998](https://github.com/bensheldon/good_job/pull/998) ([bensheldon](https://github.com/bensheldon))
+- Fix Ukrainian language code [\#996](https://github.com/bensheldon/good_job/pull/996) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Is `pgcrypto` necessary? [\#805](https://github.com/bensheldon/good_job/issues/805)
+- Integrate Sorbet type checking [\#404](https://github.com/bensheldon/good_job/issues/404)
+
+**Merged pull requests:**
+
+- Unify `frozen_string_literal` comment style [\#1003](https://github.com/bensheldon/good_job/pull/1003) ([dixpac](https://github.com/dixpac))
+- Add more execution mode details and caveats to Readme Set Up section [\#997](https://github.com/bensheldon/good_job/pull/997) ([bensheldon](https://github.com/bensheldon))
+- Add note in migrations that `pgcrypto` extension isn't necessary in PG 13+ [\#837](https://github.com/bensheldon/good_job/pull/837) ([bensheldon](https://github.com/bensheldon))
+- Add Sorbet to linter [\#760](https://github.com/bensheldon/good_job/pull/760) ([sam1el](https://github.com/sam1el))
+
+## [v3.15.14](https://github.com/bensheldon/good_job/tree/v3.15.14) (2023-07-03)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.13...v3.15.14)
+
+**Implemented enhancements:**
+
+- Add Process heartbeat that is updated inside of Notifier [\#977](https://github.com/bensheldon/good_job/pull/977) ([bensheldon](https://github.com/bensheldon))
+
+**Fixed bugs:**
+
+- Dashboard error when trying to display 0 running/queued/retried jobs due to missing 'zero' translation [\#990](https://github.com/bensheldon/good_job/issues/990)
+- Add explicit namespace back to `GoodJob::DiscreteExecution` [\#983](https://github.com/bensheldon/good_job/pull/983) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Persisting ActiveSupport::CurrentAttributes  [\#981](https://github.com/bensheldon/good_job/issues/981)
+- uninitialized constant DiscreteExecution [\#962](https://github.com/bensheldon/good_job/issues/962)
+- Hard kill resilience with execution counts [\#922](https://github.com/bensheldon/good_job/issues/922)
+
+**Merged pull requests:**
+
+- Bump rubocop from 1.53.0 to 1.54.0 [\#994](https://github.com/bensheldon/good_job/pull/994) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rails from 7.0.5 to 7.0.6 [\#993](https://github.com/bensheldon/good_job/pull/993) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Fix CI: Lock traces version for Ruby 2.6 compatible version [\#987](https://github.com/bensheldon/good_job/pull/987) ([bensheldon](https://github.com/bensheldon))
+- Turkish Language support [\#986](https://github.com/bensheldon/good_job/pull/986) ([SemihCag](https://github.com/SemihCag))
+- Use generic error reporter in Readme examples [\#964](https://github.com/bensheldon/good_job/pull/964) ([shouichi](https://github.com/shouichi))
+
+## [v3.15.13](https://github.com/bensheldon/good_job/tree/v3.15.13) (2023-06-14)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.12...v3.15.13)
+
+**Fixed bugs:**
+
+- Replace uncached table\_exists? with cached table\_exists? [\#979](https://github.com/bensheldon/good_job/pull/979) ([cmcinnes-mdsol](https://github.com/cmcinnes-mdsol))
+
+## [v3.15.12](https://github.com/bensheldon/good_job/tree/v3.15.12) (2023-06-11)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.11...v3.15.12)
+
+**Fixed bugs:**
+
+- Do not allow GoodJob to automatically start after Rails initialization if previously shutdown [\#976](https://github.com/bensheldon/good_job/pull/976) ([bensheldon](https://github.com/bensheldon))
+
+**Merged pull requests:**
+
+- Fix Rubocop linting [\#975](https://github.com/bensheldon/good_job/pull/975) ([bensheldon](https://github.com/bensheldon))
+- Bump capybara from 3.38.0 to 3.39.1 [\#970](https://github.com/bensheldon/good_job/pull/970) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump thor from 1.2.1 to 1.2.2 [\#967](https://github.com/bensheldon/good_job/pull/967) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v3.15.11](https://github.com/bensheldon/good_job/tree/v3.15.11) (2023-06-06)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.10...v3.15.11)
+
+**Fixed bugs:**
+
+- Fix `discrete_executions` job re-enqueueing when `retry_job` is called directly [\#973](https://github.com/bensheldon/good_job/pull/973) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Unclear how discrete executions should work with reenqueued  jobs \(leads to broken job-iteration\) [\#972](https://github.com/bensheldon/good_job/issues/972)
+- `build_for_enqueue` discards `scheduled_at` values for bulk-enqueued jobs [\#966](https://github.com/bensheldon/good_job/issues/966)
+
+## [v3.15.10](https://github.com/bensheldon/good_job/tree/v3.15.10) (2023-05-22)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.9...v3.15.10)
+
+**Fixed bugs:**
+
+- Ensure migration warning for `DiscreteExecution` constant is in explicit `GoodJob::` namespace [\#963](https://github.com/bensheldon/good_job/pull/963) ([bensheldon](https://github.com/bensheldon))
+
+## [v3.15.9](https://github.com/bensheldon/good_job/tree/v3.15.9) (2023-05-21)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.8...v3.15.9)
+
+**Fixed bugs:**
+
+- Fix wait and wait\_until ignored in bulk enqueue [\#960](https://github.com/bensheldon/good_job/pull/960) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Does Bulk enqueue respect wait? [\#959](https://github.com/bensheldon/good_job/issues/959)
+- BaseExecution::discrete\_support?  hardcodes the DiscreteExecution table\_name [\#957](https://github.com/bensheldon/good_job/issues/957)
+
+**Merged pull requests:**
+
+- Fix flaky jruby test to widen time-based range [\#961](https://github.com/bensheldon/good_job/pull/961) ([bensheldon](https://github.com/bensheldon))
+- Update README.md [\#953](https://github.com/bensheldon/good_job/pull/953) ([namiwang](https://github.com/namiwang))
+
+## [v3.15.8](https://github.com/bensheldon/good_job/tree/v3.15.8) (2023-05-19)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.7...v3.15.8)
+
+**Fixed bugs:**
+
+- Fix hard-coded and duplicated table\_name [\#958](https://github.com/bensheldon/good_job/pull/958) ([gap777](https://github.com/gap777))
+
+**Closed issues:**
+
+- `active_job.enqueue` Performance Issue [\#939](https://github.com/bensheldon/good_job/issues/939)
+
+**Merged pull requests:**
+
+- Bump rubocop from 1.46.0 to 1.50.2 [\#949](https://github.com/bensheldon/good_job/pull/949) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Bump rubocop-rails from 2.18.0 to 2.19.1 [\#947](https://github.com/bensheldon/good_job/pull/947) ([dependabot[bot]](https://github.com/apps/dependabot))
+
+## [v3.15.7](https://github.com/bensheldon/good_job/tree/v3.15.7) (2023-04-30)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.6...v3.15.7)
+
+**Fixed bugs:**
+
+- Fix Lockable's `SELECT 1 AS one` queries missing `LIMIT 1` [\#946](https://github.com/bensheldon/good_job/pull/946) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Issue with performing jobs that use ActionMailer::Parameterized [\#944](https://github.com/bensheldon/good_job/issues/944)
+- Deprecation warning on the deprecation warning [\#943](https://github.com/bensheldon/good_job/issues/943)
+
+**Merged pull requests:**
+
+- Replace class usage of ActiveSupport::Deprecator with gem-specific instance [\#945](https://github.com/bensheldon/good_job/pull/945) ([bensheldon](https://github.com/bensheldon))
+
+## [v3.15.6](https://github.com/bensheldon/good_job/tree/v3.15.6) (2023-04-24)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.5...v3.15.6)
+
+**Merged pull requests:**
+
+- Refine french translations [\#936](https://github.com/bensheldon/good_job/pull/936) ([francois-ferrandis](https://github.com/francois-ferrandis))
+- feat: locales for ja [\#935](https://github.com/bensheldon/good_job/pull/935) ([aki77](https://github.com/aki77))
+
+## [v3.15.5](https://github.com/bensheldon/good_job/tree/v3.15.5) (2023-04-24)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.4...v3.15.5)
+
+**Fixed bugs:**
+
+- Fix `GoodJob.cleanup_preserved_jobs` to add missing guard for unmigrated discrete executions [\#938](https://github.com/bensheldon/good_job/pull/938) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- Update to 3.15.4 breaks cleanup\_preserved\_jobs [\#937](https://github.com/bensheldon/good_job/issues/937)
+
 ## [v3.15.4](https://github.com/bensheldon/good_job/tree/v3.15.4) (2023-04-22)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v3.15.3...v3.15.4)

data/README.md

@@ -121,8 +121,13 @@ For more of the story of GoodJob, read the [introductory blog post](https://isla
     YourJob.set(queue: :some_queue, wait: 5.minutes, priority: 10).perform_later
     ```
 
-1. In development, GoodJob executes jobs immediately in a separate thread ("async" mode). In production, GoodJob provides different options:
-
+1. **In Rails' development environment**, by default, GoodJob's Adapter executes jobs `async` in a background thread pool in `rails server`.
+    - Because of Rails deferred autoloading, jobs enqueued via the `rails console` may not begin executing on a separate server process until the Rails application is fully initialized by loading a web page once.
+    - Remember, only Active Job's `perform_later` sends jobs to the queue adapter; Active Job's `perform_now` executes the job immediately and does not invoke the queue adapter. GoodJob is not involved in `perform_now` jobs.
+1. **In Rails' test environment**, by default, GoodJob's Adapter executes jobs `inline` immediately in the current thread.
+    - Future-scheduled jobs can be executed with `GoodJob.perform_inline` using using a tool like Timecop or `ActiveSupport::Testing::TimeHelpers`.
+    - Note that Active Job's TestAdapter, which powers test helpers (e.g. `assert_enqueued_with`), may override GoodJob's Adapter in [some configurations](https://github.com/rails/rails/issues/37270).
+1. **In Rails' production environment**, by default, GoodJob's Adapter enqueues jobs in `external` mode to be executed by a separate execution process:
     - By default, GoodJob separates job enqueuing from job execution so that jobs can be scaled independently of the web server.  Use the GoodJob command-line tool to execute jobs:
 
         ```bash
@@ -231,7 +236,7 @@ Rails.application.configure do
   # Configure options individually...
   config.good_job.preserve_job_records = true
   config.good_job.retry_on_unhandled_error = false
-  config.good_job.on_thread_error = -> (exception) { Sentry.capture_exception(exception) }
+  config.good_job.on_thread_error = -> (exception) { Rails.error.report(exception) }
   config.good_job.execution_mode = :async
   config.good_job.queues = '*'
   config.good_job.max_threads = 5
@@ -239,12 +244,13 @@ Rails.application.configure do
   config.good_job.shutdown_timeout = 25 # seconds
   config.good_job.enable_cron = true
   config.good_job.cron = { example: { cron: '0 * * * *', class: 'ExampleJob'  } }
+  config.good_job.dashboard_default_locale = :en
 
   # ...or all at once.
   config.good_job = {
     preserve_job_records: true,
     retry_on_unhandled_error: false,
-    on_thread_error: -> (exception) { Sentry.capture_exception(exception) },
+    on_thread_error: -> (exception) { Rails.error.report(exception) },
     execution_mode: :async,
     queues: '*',
     max_threads: 5,
@@ -257,6 +263,7 @@ Rails.application.configure do
         class: 'ExampleJob'
       },
     },
+    dashboard_default_locale: :en,
   }
 end
 ```
@@ -287,7 +294,7 @@ Available configuration options are:
 - `on_thread_error` (proc, lambda, or callable) will be called when there is an Exception. It can be useful for logging errors to bug tracking services, like Sentry or Airbrake. Example:
 
     ```ruby
-    config.good_job.on_thread_error = -> (exception) { Sentry.capture_exception(exception) }
+    config.good_job.on_thread_error = -> (exception) { Rails.error.report(exception) }
     ```
 
 By default, GoodJob configures the following execution modes per environment:
@@ -311,7 +318,17 @@ config.good_job.execution_mode = :external
 
 Good Job’s general behavior can also be configured via attributes directly on the `GoodJob` module:
 
-- **`GoodJob.active_record_parent_class`** (string) The ActiveRecord parent class inherited by GoodJob's ActiveRecord model `GoodJob::Job` (defaults to `"ActiveRecord::Base"`). Configure this 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. _The value must be a String to avoid premature initialization of ActiveRecord._
+- **`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:
+
+    ```ruby
+    # config/initializers/good_job.rb
+    GoodJob.configure_active_record do
+      connects_to database: :special_database
+      self.table_name_prefix = "special_application_"
+    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._
 
 You’ll generally want to configure these in `config/initializers/good_job.rb`, like so:
 
@@ -472,7 +489,7 @@ config.good_job.enable_cron = ENV['DYNO'] == 'worker.1' # or `true` or via $GOOD
 
 # Configure cron with a hash that has a unique key for each recurring job
 config.good_job.cron = {
-  # Every 15 minutes, enqueue `ExampleJob.set(priority: -10).perform_later(42, name: "Alice")`
+  # Every 15 minutes, enqueue `ExampleJob.set(priority: -10).perform_later(42, "life", name: "Alice")`
   frequent_task: { # each recurring job must have a unique key
     cron: "*/15 * * * *", # cron-style scheduling format by fugit gem
     class: "ExampleJob", # reference the Job class with a string
@@ -760,7 +777,7 @@ If errors do reach GoodJob, you can assign a callable to `GoodJob.on_thread_erro
 
 ```ruby
 # config/initializers/good_job.rb
-GoodJob.on_thread_error = -> (exception) { Sentry.capture_exception(exception) }
+GoodJob.on_thread_error = -> (exception) { Rails.error.report(exception) }
 ```
 
 #### Retries
@@ -794,13 +811,13 @@ class ApplicationJob < ActiveJob::Base
   retry_on StandardError, wait: :exponentially_longer, attempts: Float::INFINITY
 
   retry_on SpecialError, attempts: 5 do |_job, exception|
-    Sentry.capture_exception(exception)
+    Rails.error.report(exception)
   end
 
   around_perform do |_job, block|
     block.call
   rescue StandardError => e
-    Sentry.capture_exception(e)
+    Rails.error.report(e)
     raise
   end
   # ...
@@ -823,7 +840,7 @@ ActionMailer::MailDeliveryJob.retry_on StandardError, wait: :exponentially_longe
 ActionMailer::MailDeliveryJob.around_perform do |_job, block|
   block.call
 rescue StandardError => e
-  Sentry.capture_exception(e)
+  Rails.error.report(e)
   raise
 end
 ```

data/app/controllers/good_job/application_controller.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 module GoodJob
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
 
-    around_action :switch_locale
+    around_action :use_good_job_locale
 
     content_security_policy do |policy|
       policy.default_src(:none) if policy.default_src(*policy.default_src).blank?
@@ -30,8 +31,21 @@ module GoodJob
       { locale: I18n.locale }.merge(options)
     end
 
-    def switch_locale(&action)
+    def use_good_job_locale(&action)
+      @original_i18n_config = I18n.config
+      I18n.config = ::GoodJob::I18nConfig.new
       I18n.with_locale(current_locale, &action)
+    ensure
+      I18n.config = @original_i18n_config
+      @original_i18n_config = nil
+    end
+
+    def use_original_locale
+      prev_config = I18n.config
+      I18n.config = @original_i18n_config if @original_i18n_config
+      yield
+    ensure
+      I18n.config = prev_config
     end
 
     def current_locale
@@ -39,16 +53,9 @@ module GoodJob
         request.GET['locale']
       elsif params[:locale]
         params[:locale]
-      elsif good_job_available_locales.exclude?(I18n.default_locale) && I18n.available_locales.include?(:en)
-        :en
       else
         I18n.default_locale
       end
     end
-
-    def good_job_available_locales
-      @_good_job_available_locales ||= GoodJob::Engine.root.join("config/locales").glob("*.yml").map { |path| File.basename(path, ".yml").to_sym }.uniq
-    end
-    helper_method :good_job_available_locales
   end
 end

data/app/controllers/good_job/batches_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GoodJob
   class BatchesController < GoodJob::ApplicationController
     def index

data/app/controllers/good_job/cron_entries_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GoodJob
   class CronEntriesController < GoodJob::ApplicationController
     before_action :check_settings_migration!, only: [:enable, :disable]
@@ -14,7 +15,7 @@ module GoodJob
 
     def enqueue
       @cron_entry = CronEntry.find(params[:cron_key])
-      @cron_entry.enqueue(Time.current)
+      use_original_locale { @cron_entry.enqueue(Time.current) }
       redirect_back(fallback_location: cron_entries_path, notice: t(".notice"))
     end
 

data/app/controllers/good_job/frontends_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GoodJob
   class FrontendsController < ActionController::Base # rubocop:disable Rails/ApplicationController
     skip_after_action :verify_same_origin_request, raise: false

data/app/controllers/good_job/jobs_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GoodJob
   class JobsController < GoodJob::ApplicationController
     DISCARD_MESSAGE = "Discarded through dashboard"

data/app/controllers/good_job/processes_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GoodJob
   class ProcessesController < GoodJob::ApplicationController
     def index

data/app/filters/good_job/base_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GoodJob
   class BaseFilter
     DEFAULT_LIMIT = 25

data/app/filters/good_job/batches_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GoodJob
   class BatchesFilter < BaseFilter
     def records

data/app/filters/good_job/jobs_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GoodJob
   class JobsFilter < BaseFilter
     def states

data/app/helpers/good_job/application_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GoodJob
   module ApplicationHelper
     def format_duration(sec)
@@ -63,7 +64,6 @@ module GoodJob
     end
 
     def translation_exists?(key, **options)
-      true if good_job_available_locales.include?(I18n.locale)
       I18n.exists?(scope_key_by_partial(key), **options)
     end
   end

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module GoodJob
+  # Shared methods for filtering Execution/Job records from the +good_jobs+ table.
+  module ErrorEvents
+    extend ActiveSupport::Concern
+
+    ERROR_EVENTS = [
+      ERROR_EVENT_INTERRUPTED = 'interrupted',
+      ERROR_EVENT_UNHANDLED = 'unhandled',
+      ERROR_EVENT_HANDLED = 'handled',
+      ERROR_EVENT_RETRIED = 'retried',
+      ERROR_EVENT_RETRY_STOPPED = 'retry_stopped',
+      ERROR_EVENT_DISCARDED = 'discarded',
+    ].freeze
+
+    included do
+      enum error_event: {
+        ERROR_EVENT_INTERRUPTED => 0,
+        ERROR_EVENT_UNHANDLED => 1,
+        ERROR_EVENT_HANDLED => 2,
+        ERROR_EVENT_RETRIED => 3,
+        ERROR_EVENT_RETRY_STOPPED => 4,
+        ERROR_EVENT_DISCARDED => 5,
+      }.freeze, _prefix: :error_event
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GoodJob
   # Shared methods for filtering Execution/Job records from the +good_jobs+ table.
   module Filterable

data/app/models/{good_job → concerns/good_job}/lockable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GoodJob
   #
   # Adds Postgres advisory locking capabilities to an ActiveRecord record.
@@ -324,6 +325,7 @@ module GoodJob
           AND pg_locks.objsubid = 1
           AND pg_locks.classid = ('x' || substr(md5($1::text), 1, 16))::bit(32)::int
           AND pg_locks.objid = (('x' || substr(md5($2::text), 1, 16))::bit(64) << 32)::bit(32)::int
+        LIMIT 1
       SQL
       binds = [
         ActiveRecord::Relation::QueryAttribute.new('key', key, ActiveRecord::Type::String.new),
@@ -351,6 +353,7 @@ module GoodJob
           AND pg_locks.classid = ('x' || substr(md5($1::text), 1, 16))::bit(32)::int
           AND pg_locks.objid = (('x' || substr(md5($2::text), 1, 16))::bit(64) << 32)::bit(32)::int
           AND pg_locks.pid = pg_backend_pid()
+        LIMIT 1
       SQL
       binds = [
         ActiveRecord::Relation::QueryAttribute.new('key', key, ActiveRecord::Type::String.new),

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module GoodJob
   module Reportable
     # There are 3 buckets of non-overlapping statuses:

data/app/models/good_job/active_record_parent_class.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module GoodJob
+  ActiveRecordParentClass = if GoodJob.active_record_parent_class
+                              Object.const_get(GoodJob.active_record_parent_class)
+                            else
+                              ActiveRecord::Base
+                            end
+end

data/app/models/good_job/base_execution.rb

@@ -4,6 +4,8 @@ module GoodJob
   # ActiveRecord model to share behavior between {Job} and {Execution} models
   # which both read out of the same table.
   class BaseExecution < BaseRecord
+    include ErrorEvents
+
     self.table_name = 'good_jobs'
 
     # With a given class name
@@ -35,12 +37,14 @@ module GoodJob
       end
 
       def discrete_support?
-        if connection.table_exists?('good_job_executions')
-          true
-        else
-          migration_pending_warning!
-          false
-        end
+        GoodJob::DiscreteExecution.migrated?
+      end
+
+      def error_event_migrated?
+        return true if columns_hash["error_event"].present?
+
+        migration_pending_warning!
+        false
       end
     end
 

data/app/models/good_job/base_record.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
+
 module GoodJob
   # Base ActiveRecord class that all GoodJob models inherit from.
   # Parent class can be configured with +GoodJob.active_record_parent_class+.
   # @!parse
   #   class BaseRecord < ActiveRecord::Base; end
-  class BaseRecord < Object.const_get(GoodJob.active_record_parent_class)
+  class BaseRecord < ActiveRecordParentClass
     self.abstract_class = true
 
     def self.migration_pending_warning!
-      ActiveSupport::Deprecation.warn(<<~DEPRECATION)
+      GoodJob.deprecator.warn(<<~DEPRECATION)
         GoodJob has pending database migrations. To create the migration files, run:
             rails generate good_job:update
         To apply the migration files, run:
@@ -21,10 +22,12 @@ module GoodJob
     # Can be overriden by child class.
     # @return [Boolean]
     def self.migrated?
-      return true if connection.table_exists?(table_name)
+      return true if table_exists?
 
       migration_pending_warning!
       false
     end
+
+    ActiveSupport.run_load_hooks(:good_job_base_record, self)
   end
 end

data/app/models/good_job/cron_entry.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "concurrent/hash"
 require "concurrent/scheduled_task"
 require "fugit"

data/app/models/good_job/discrete_execution.rb

@@ -2,6 +2,8 @@
 
 module GoodJob # :nodoc:
   class DiscreteExecution < BaseRecord
+    include ErrorEvents
+
     self.table_name = 'good_job_executions'
 
     belongs_to :execution, class_name: 'GoodJob::Execution', foreign_key: 'active_job_id', primary_key: 'active_job_id', inverse_of: :discrete_executions, optional: true
@@ -11,6 +13,13 @@ module GoodJob # :nodoc:
 
     alias_attribute :performed_at, :created_at
 
+    def self.error_event_migrated?
+      return true if columns_hash["error_event"].present?
+
+      migration_pending_warning!
+      false
+    end
+
     def number
       serialized_params.fetch('executions', 0) + 1
     end