good_job 4.23.1 → 4.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62018fa8fb4313f6aa3e6ef7531ac3073adc80449fd28a03f655014ce0c1922b
-  data.tar.gz: 478315a41ea1d69a9d15781b4b57ecd099504c3da754605b12fd752a10cb3ad0
+  metadata.gz: ca3ea73eb3548ddaa1b84dab18b341c9c8182f91d52b82a41681cfa2080550da
+  data.tar.gz: 9fc5590d811d1b04c847054d685d9f911910356c33d0726d1ba1620a2228caf5
 SHA512:
-  metadata.gz: 2f3f11b6633b90116e2cbe15057032cdd49609c074a80c21ef496ec250dea79f9ce5f3b3eda27db5c36bfd4cd1c262fda7b41301a168772148d70d35ca3f7dc7
-  data.tar.gz: 33ef016c46794b39cd7006b16073849c76d62116ab2c42030087b91286ebfd20887bf8735c7f0183fcd8a5acb4c599ae7eabbddcb36420f3a2484044301fc231
+  metadata.gz: 2bca41349e888ed1e16ad8a3da30cfb17390eb1451803aa14b2bed95c39494a6cf83b7eb29a6cb39d86b1545756d58ced8c3cbf4acd5d53d56873d2652ce5766
+  data.tar.gz: f10b1e0bd0f51edce6879785642730d96367fe2f4fdd5d4206576c510993950fb278db1e38d3ed6c3a2bd1a9050aa99502a4e81a2e8dd3f2a78806c5c509b0a0

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [v4.24.0](https://github.com/bensheldon/good_job/tree/v4.24.0) (2026-10-29)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v4.23.1...v4.24.0)
+
+**Implemented enhancements:**
+
+- Add a separate retention period for discarded jobs [\#1897](https://github.com/bensheldon/good_job/pull/1897) ([IslamElsayed](https://github.com/IslamElsayed))
+
+**Fixed bugs:**
+
+- Prevent idle or malformed connections from stalling or stopping the probe server [\#1902](https://github.com/bensheldon/good_job/pull/1902) ([bensheldon](https://github.com/bensheldon))
+- Validate advisory lock SQL identifiers and harden dashboard filter params [\#1901](https://github.com/bensheldon/good_job/pull/1901) ([bensheldon](https://github.com/bensheldon))
+- Don't retain or report schedulers replaced by a capsule restart [\#1894](https://github.com/bensheldon/good_job/pull/1894) ([bensheldon](https://github.com/bensheldon))
+
+**Closed issues:**
+
+- \[feature request\] Cleanup older discarded jobs [\#1597](https://github.com/bensheldon/good_job/issues/1597)
+
+**Merged pull requests:**
+
+- Restructure code so it type-checks under Sorbet without runtime assertions [\#1899](https://github.com/bensheldon/good_job/pull/1899) ([bensheldon](https://github.com/bensheldon))
+- Upgrade development/demo Ruby to 4.0.9 and update dependencies [\#1898](https://github.com/bensheldon/good_job/pull/1898) ([bensheldon](https://github.com/bensheldon))
+- Fix flaky JRuby FrozenError by preloading record schemas in specs [\#1896](https://github.com/bensheldon/good_job/pull/1896) ([bensheldon](https://github.com/bensheldon))
+- Demo: shorten database connection lifetimes [\#1895](https://github.com/bensheldon/good_job/pull/1895) ([bensheldon](https://github.com/bensheldon))
+
 ## [v4.23.1](https://github.com/bensheldon/good_job/tree/v4.23.1) (2026-10-27)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v4.23.0...v4.23.1)

data/README.md

@@ -236,7 +236,8 @@ Usage:
   good_job cleanup_preserved_jobs
 
 Options:
-  [--before-seconds-ago=SECONDS] # Destroy records finished more than this many seconds ago (env var:  GOOD_JOB_CLEANUP_PRESERVED_JOBS_BEFORE_SECONDS_AGO, default: 1209600 (14 days))
+  [--before-seconds-ago=SECONDS]            # Destroy records finished more than this many seconds ago (env var: GOOD_JOB_CLEANUP_PRESERVED_JOBS_BEFORE_SECONDS_AGO, default: 1209600 (14 days))
+  [--discarded-before-seconds-ago=SECONDS]  # Destroy discarded records finished more than this many seconds ago (env var: GOOD_JOB_CLEANUP_DISCARDED_JOBS_BEFORE_SECONDS_AGO, default: same as --before-seconds-ago)
 
 Manually destroys preserved job records.
 
@@ -317,6 +318,7 @@ Available configuration options are:
 - `cron` (hash) cron configuration. Defaults to `{}`. You can also set this as a JSON string with the environment variable `GOOD_JOB_CRON`
 - `cleanup_discarded_jobs` (boolean) whether to destroy discarded jobs when cleaning up preserved jobs using the `$ good_job cleanup_preserved_jobs` CLI command or calling `GoodJob.cleanup_preserved_jobs`. Defaults to `true`. Can also be set with the environment variable `GOOD_JOB_CLEANUP_DISCARDED_JOBS`.
 - `cleanup_preserved_jobs_before_seconds_ago` (integer) number of seconds to preserve jobs when using the `$ good_job cleanup_preserved_jobs` CLI command or calling `GoodJob.cleanup_preserved_jobs`. Defaults to `1209600` (14 days). Can also be set with  the environment variable `GOOD_JOB_CLEANUP_PRESERVED_JOBS_BEFORE_SECONDS_AGO`.
+- `cleanup_discarded_jobs_before_seconds_ago` (integer) number of seconds to preserve discarded jobs, when they should be kept longer (or shorter) than other jobs. Has no effect when `cleanup_discarded_jobs` is `false`. Defaults to `nil`, which uses `cleanup_preserved_jobs_before_seconds_ago`. Can also be set with the environment variable `GOOD_JOB_CLEANUP_DISCARDED_JOBS_BEFORE_SECONDS_AGO`.
 - `cleanup_interval_jobs` (integer) Number of jobs a Scheduler will execute before cleaning up preserved jobs. Defaults to `1000`. Disable with `false`. Can also be set with  the environment variable `GOOD_JOB_CLEANUP_INTERVAL_JOBS` and disabled with `0`).
 - `cleanup_interval_seconds` (integer) Number of seconds a Scheduler will wait before cleaning up preserved jobs. Defaults to `600` (10 minutes). Disable with `false`. Can also be set with  the environment variable `GOOD_JOB_CLEANUP_INTERVAL_SECONDS` and disabled with `0`).
 - `logger` ([Rails Logger](https://api.rubyonrails.org/classes/ActiveSupport/Logger.html)) lets you set a custom logger for GoodJob. It should be an instance of a Rails `Logger` (Default: `Rails.logger`).
@@ -1600,6 +1602,7 @@ GoodJob will automatically delete preserved job records after 14 days. The reten
 
 ```ruby
 config.good_job.cleanup_preserved_jobs_before_seconds_ago = 14.days
+config.good_job.cleanup_discarded_jobs_before_seconds_ago = 90.days # Optional: keep discarded jobs longer than the others.
 config.good_job.cleanup_interval_jobs = 1_000 # Number of executed jobs between deletion sweeps.
 config.good_job.cleanup_interval_seconds = 10.minutes # Number of seconds between deletion sweeps.
 ```
@@ -1611,6 +1614,7 @@ It is also possible to manually trigger a cleanup of preserved job records:
     ```ruby
     GoodJob.cleanup_preserved_jobs # Will use default retention period
     GoodJob.cleanup_preserved_jobs(older_than: 7.days) # custom retention period
+    GoodJob.cleanup_preserved_jobs(older_than: 7.days, discarded_older_than: 90.days) # keep discarded jobs longer
     ```
 
 - For example, using the `good_job` command-line utility:

data/app/charts/good_job/base_chart.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/charts/good_job/latency_metric/base.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob
@@ -6,7 +7,7 @@ module GoodJob
     # expression over +good_job_executions+, the aggregate that summarizes it per
     # time bucket, and their titles.
     class Base
-      def expression = self.class::EXPRESSION
+      def expression = self.class.const_get(:EXPRESSION)
 
       def to_arel = Arel.sql(expression)
 

data/app/charts/good_job/latency_metric/execution.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/charts/good_job/latency_metric/queue.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/charts/good_job/latency_metric/total.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/charts/good_job/latency_metric.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/charts/good_job/performance_index_chart.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/charts/good_job/performance_range.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob
@@ -281,8 +282,9 @@ module GoodJob
       components = match.captures
       components[-1] ||= "0"
       numeric_components = components.map { |component| Integer(component, 10) }
-      local_time = Time.utc(*numeric_components)
-      normalized_value = format("%04d-%02d-%02dT%02d:%02d:%02d", *numeric_components)
+      year, month, day, hour, minute, second = numeric_components
+      local_time = Time.utc(year, month, day, hour, minute, second)
+      normalized_value = format("%04d-%02d-%02dT%02d:%02d:%02d", year, month, day, hour, minute, second)
       return unless local_time.strftime("%Y-%m-%dT%H:%M:%S") == normalized_value
 
       periods = @local_time_zone.tzinfo.periods_for_local(local_time)
@@ -291,7 +293,7 @@ module GoodJob
       # A local input cannot carry an offset. Include both repeated fall-back occurrences
       # by resolving starts to the earlier instant and ends to the later instant.
       instants = periods.map do |period|
-        (local_time - period.utc_total_offset).in_time_zone
+        local_time.ago(period.utc_total_offset).in_time_zone
       end
       parameter_key == "chart_end" ? instants.max : instants.min
     end

data/app/charts/good_job/performance_show_chart.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/charts/good_job/scheduled_by_queue_chart.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/controllers/good_job/application_controller.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob
@@ -19,14 +20,16 @@ module GoodJob
       policy.frame_ancestors(:none) if policy.frame_ancestors(*policy.frame_ancestors).blank?
     end
 
-    before_action do
-      next if request.content_security_policy_nonce_generator
+    before_action :set_content_security_policy_nonce_generator
+
+    private
+
+    def set_content_security_policy_nonce_generator
+      return if request.content_security_policy_nonce_generator
 
       request.content_security_policy_nonce_generator = ->(_request) { SecureRandom.base64(16) }
     end
 
-    private
-
     def default_url_options(options = {})
       { locale: I18n.locale }.merge(options)
     end

data/app/controllers/good_job/batches_controller.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/controllers/good_job/cleaner_controller.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/controllers/good_job/cron_entries_controller.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/controllers/good_job/executions_controller.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/controllers/good_job/frontends_controller.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob
@@ -6,7 +7,7 @@ module GoodJob
     skip_after_action :verify_same_origin_request, raise: false
 
     def self.asset_path(*path)
-      Engine.root.join("app/frontend/good_job", *path)
+      path.reduce(Engine.root.join("app/frontend/good_job")) { |asset_path, segment| asset_path.join(segment) }
     end
 
     STATIC_ASSETS = {
@@ -38,9 +39,7 @@ module GoodJob
       end.merge(MODULE_OVERRIDES)
     end
 
-    before_action do
-      expires_in 1.year, public: true
-    end
+    before_action :set_cache_headers
 
     def static
       render file: STATIC_ASSETS.dig(params[:format]&.to_sym, params[:id]&.to_sym) || raise(ActionController::RoutingError, 'Not Found')
@@ -51,5 +50,11 @@ module GoodJob
 
       render file: self.class.js_modules[params[:id]&.to_sym] || raise(ActionController::RoutingError, 'Not Found')
     end
+
+    private
+
+    def set_cache_headers
+      expires_in 1.year, public: true
+    end
   end
 end

data/app/controllers/good_job/jobs_controller.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/controllers/good_job/metrics_controller.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/controllers/good_job/pauses_controller.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/controllers/good_job/performance_controller.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/controllers/good_job/processes_controller.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/filters/good_job/base_filter.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob
@@ -15,7 +16,7 @@ module GoodJob
     def records
       @_records ||= begin
         after_id = params[:after_id]
-        after_at = params[:after_at].present? ? Time.zone.parse(params[:after_at]) : nil
+        after_at = parse_after_at(params[:after_at])
         limit = params.fetch(:limit, DEFAULT_LIMIT)
 
         query_for_records.display_all(
@@ -88,6 +89,14 @@ module GoodJob
 
     private
 
+    def parse_after_at(value)
+      return unless value.is_a?(String) && value.present?
+
+      Time.zone.parse(value)
+    rescue ArgumentError
+      nil
+    end
+
     def query_for_records
       raise NotImplementedError
     end

data/app/filters/good_job/batches_filter.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/filters/good_job/jobs_filter.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob
@@ -92,7 +93,9 @@ module GoodJob
     end
 
     def filter_by_search_query(query)
-      search_query = query&.strip
+      return {} unless query.is_a?(String)
+
+      search_query = query.strip
       return {} if search_query.blank?
 
       if query_is_uuid_and_job_exists?(search_query)

data/app/helpers/good_job/application_helper.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/helpers/good_job/icons_helper.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

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

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module GoodJob
@@ -30,6 +31,10 @@ module GoodJob
     #
     # @example
     #   GoodJob::AdvisoryLockable.hash_function = "sha256"
+    # pgcrypto digest() types; "md5", "hashtext", and "uuid_v5" have dedicated branches in +advisory_lock_bigint_sql+.
+    DIGEST_HASH_FUNCTIONS = %w[sha1 sha224 sha256 sha384 sha512].freeze
+    ADVISORY_LOCK_FUNCTION_PATTERN = /\Apg_(try_)?advisory_(xact_)?(un)?lock(_shared)?\z/
+
     class << self
       def hash_function=(value)
         @_hash_function = value
@@ -386,7 +391,7 @@ module GoodJob
           cte_type = supports_cte_materialization_specifiers? ? :MATERIALIZED : :""
           composed_cte = Arel::Nodes::As.new(cte_table, Arel::Nodes::UnaryOperation.new(cte_type, cte_query.arel))
 
-          lock_condition = "#{function}(#{advisory_lock_bigint_sql("#{_quoted_table_name_string} || '-' || #{adapter_class.quote_table_name(cte_table.name)}.#{adapter_class.quote_column_name(column)}::text")})"
+          lock_condition = "#{advisory_lock_function_sql(function)}(#{advisory_lock_bigint_sql("#{_quoted_table_name_string} || '-' || #{adapter_class.quote_table_name(cte_table.name)}.#{adapter_class.quote_column_name(column)}::text")})"
           query = cte_table.project(cte_table[:id])
                            .with(composed_cte)
                            .where(defined?(Arel::Nodes::BoundSqlLiteral) ? Arel::Nodes::BoundSqlLiteral.new(lock_condition, [], {}) : Arel::Nodes::SqlLiteral.new(lock_condition))
@@ -414,11 +419,11 @@ module GoodJob
       def advisory_lock_key(key, function: advisory_lockable_function, connection: nil)
         query = if function.include? "_try_"
                   <<~SQL.squish
-                    SELECT #{function}(#{advisory_lock_bigint_sql('$1::text')}) AS locked
+                    SELECT #{advisory_lock_function_sql(function)}(#{advisory_lock_bigint_sql('$1::text')}) AS locked
                   SQL
                 else
                   <<~SQL.squish
-                    SELECT #{function}(#{advisory_lock_bigint_sql('$1::text')})::text AS locked
+                    SELECT #{advisory_lock_function_sql(function)}(#{advisory_lock_bigint_sql('$1::text')})::text AS locked
                   SQL
                 end
 
@@ -522,7 +527,7 @@ module GoodJob
         raise ArgumentError, "No unlock function provided" if function.blank?
 
         query = <<~SQL.squish
-          SELECT #{function}(#{advisory_lock_bigint_sql('$1::text')}) AS unlocked
+          SELECT #{advisory_lock_function_sql(function)}(#{advisory_lock_bigint_sql('$1::text')}) AS unlocked
         SQL
         binds = [
           ActiveRecord::Relation::QueryAttribute.new('key', key, ActiveRecord::Type::String.new),
@@ -608,10 +613,23 @@ module GoodJob
           "('x' || substr(replace(uuid_generate_v5('6ba7b810-9dad-11d1-80b4-00c04fd430c8'::uuid, (#{value_sql})::text)::text, '-', ''), 1, 16))::bit(64)::bigint"
         else
           # pgcrypto's digest() supports sha1, sha224, sha256, sha384, sha512
-          "('x' || substr(encode(digest((#{value_sql})::text, '#{GoodJob::AdvisoryLockable.hash_function}'), 'hex'), 1, 16))::bit(64)::bigint"
+          digest_type = GoodJob::AdvisoryLockable.hash_function.to_s.downcase
+          raise ArgumentError, "Unsupported advisory lock hash function: #{digest_type.inspect}" unless DIGEST_HASH_FUNCTIONS.include?(digest_type)
+
+          "('x' || substr(encode(digest((#{value_sql})::text, '#{digest_type}'), 'hex'), 1, 16))::bit(64)::bigint"
         end
       end
 
+      # Validates a Postgres advisory lock function name before it is interpolated into SQL.
+      # @param function [String, Symbol]
+      # @return [String]
+      def advisory_lock_function_sql(function)
+        function = function.to_s
+        raise ArgumentError, "Unsupported advisory lock function: #{function.inspect}" unless ADVISORY_LOCK_FUNCTION_PATTERN.match?(function)
+
+        function
+      end
+
       # Extracts the upper 32 bits of the advisory lock bigint, used as +classid+ in pg_locks.
       def advisory_lock_classid_sql(value_sql)
         "substring((#{advisory_lock_bigint_sql(value_sql)})::bit(64) from 1 for 32)::bit(32)::int"

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

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module GoodJob

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

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module GoodJob

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

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

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

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module GoodJob

data/app/models/good_job/active_record_parent_class.rb

@@ -1,3 +1,4 @@
+# typed: ignore
 # frozen_string_literal: true
 
 module GoodJob

data/app/models/good_job/base_record.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/models/good_job/batch.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob
@@ -109,22 +110,22 @@ module GoodJob
 
         begin
           if build_result[:bulkable].any?
-            Job.transaction(requires_new: true, joinable: false) do
-              persisted_jobs = _insert_jobs(build_result[:bulkable], build_result[:active_jobs_by_job_id])
-
-              if execute_inline
-                inline_jobs = persisted_jobs.select { |job| job.scheduled_at.nil? || job.scheduled_at <= current_time }
-                if lock_strategy != :advisory && lock_id && inline_jobs.any?
-                  Job.where(id: inline_jobs.map(&:id)).update_all( # rubocop:disable Rails/SkipsModelValidations
-                    locked_by_id: lock_id, locked_at: current_time, lock_type: Job.lock_types[lock_strategy.to_s]
-                  )
-                  inline_jobs.each { |j| j.assign_attributes(locked_by_id: lock_id, locked_at: current_time, lock_type: lock_strategy) }
-                end
-                case lock_strategy
-                when :advisory, :hybrid
-                  inline_jobs.each(&:advisory_lock!)
-                end
+            persisted_jobs, inline_jobs = Job.transaction(requires_new: true, joinable: false) do
+              inserted_jobs = _insert_jobs(build_result[:bulkable], build_result[:active_jobs_by_job_id])
+              next [inserted_jobs, []] unless execute_inline
+
+              jobs_to_inline = inserted_jobs.select { |job| job.scheduled_at.nil? || job.scheduled_at <= current_time }
+              if lock_strategy != :advisory && lock_id && jobs_to_inline.any?
+                Job.where(id: jobs_to_inline.map(&:id)).update_all( # rubocop:disable Rails/SkipsModelValidations
+                  locked_by_id: lock_id, locked_at: current_time, lock_type: Job.lock_types[lock_strategy.to_s]
+                )
+                jobs_to_inline.each { |j| j.assign_attributes(locked_by_id: lock_id, locked_at: current_time, lock_type: lock_strategy) }
               end
+              case lock_strategy
+              when :advisory, :hybrid
+                jobs_to_inline.each(&:advisory_lock!)
+              end
+              [inserted_jobs, jobs_to_inline]
             end
           end
 
@@ -444,7 +445,7 @@ module GoodJob
           state = { queue_name: queue_name, count: grouped_jobs.size }
           state[:scheduled_at] = scheduled_at if scheduled_at
 
-          executed_locally = adapter.respond_to?(:execute_async?) && adapter.execute_async? && GoodJob.capsule&.create_thread(state)
+          executed_locally = adapter.respond_to?(:execute_async?) && adapter.execute_async? && GoodJob.capsule.create_thread(state)
           unless executed_locally
             state[:count] = grouped_jobs.count { |job| _send_notify?(active_jobs_by_job_id[job.active_job_id]) }
             Notifier.notify(state) unless state[:count].zero?

data/app/models/good_job/batch_record.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require 'active_job/arguments'
@@ -63,8 +64,8 @@ module GoodJob
           if job_discarded && !discarded_at
             update(discarded_at: Time.current)
 
-            if on_discard.present?
-              discard_job_class = on_discard.constantize
+            discard_job_class = on_discard.presence&.constantize
+            if discard_job_class
               Job.defer_after_commit_maybe(discard_job_class) do
                 Batch.within_thread(batch_id: nil, batch_callback_id: id) do
                   discard_job_class.set(priority: callback_priority, queue: callback_queue_name).perform_later(to_batch, { event: :discard })
@@ -76,8 +77,8 @@ module GoodJob
           if enqueued_at && !(self.class.jobs_finished_at_migrated? ? jobs_finished_at : finished_at) && jobs.where(finished_at: nil).none?
             self.class.jobs_finished_at_migrated? ? update(jobs_finished_at: Time.current) : update(finished_at: Time.current)
 
-            if !discarded_at && on_success.present?
-              success_job_class = on_success.constantize
+            success_job_class = on_success.presence&.constantize unless discarded_at
+            if success_job_class
               Job.defer_after_commit_maybe(success_job_class) do
                 Batch.within_thread(batch_id: nil, batch_callback_id: id) do
                   success_job_class.set(priority: callback_priority, queue: callback_queue_name).perform_later(to_batch, { event: :success })
@@ -85,11 +86,11 @@ module GoodJob
               end
             end
 
-            if on_finish.present?
-              finish_job_class = on_finish.constantize
+            finish_job_class = on_finish.presence&.constantize
+            if finish_job_class
               Job.defer_after_commit_maybe(finish_job_class) do
                 Batch.within_thread(batch_id: nil, batch_callback_id: id) do
-                  on_finish.constantize.set(priority: callback_priority, queue: callback_queue_name).perform_later(to_batch, { event: :finish })
+                  finish_job_class.set(priority: callback_priority, queue: callback_queue_name).perform_later(to_batch, { event: :finish })
                 end
               end
             end
@@ -113,7 +114,8 @@ module GoodJob
     end
 
     if Rails.gem_version < Gem::Version.new('7.1.0.alpha')
-      serialize :serialized_properties, PropertySerializer, default: -> { {} }
+      # Positional coder argument; Sorbet only knows the Rails 7.1+ signature
+      public_send(:serialize, :serialized_properties, PropertySerializer, default: -> { {} }) # rubocop:disable Style/SendWithLiteralMethodName
     else
       serialize :serialized_properties, coder: PropertySerializer, default: -> { {} }
     end

data/app/models/good_job/concurrency_claim.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/models/good_job/cron_entry.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require "concurrent/hash"

data/app/models/good_job/discrete_execution.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/models/good_job/execution.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob # :nodoc:
@@ -44,7 +45,7 @@ module GoodJob # :nodoc:
 
     def status
       if finished_at.present?
-        if error.present? && job.finished_at.present?
+        if error.present? && job&.finished_at.present?
           :discarded
         elsif error.present?
           :retried
@@ -57,9 +58,11 @@ module GoodJob # :nodoc:
     end
 
     def interrupted_duration
-      return unless error_event == "interrupted" && finished_at && performed_at
+      interrupted_at = finished_at
+      started_at = performed_at
+      return unless error_event == "interrupted" && interrupted_at && started_at
 
-      finished_at - performed_at
+      interrupted_at - started_at
     end
 
     def display_serialized_params

data/app/models/good_job/execution_result.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/models/good_job/i18n_config.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module GoodJob

data/app/models/good_job/job/lockable.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module GoodJob