good_job 3.27.4 → 3.28.1

data/config/locales/ru.yml

@@ -148,6 +148,8 @@ ru:
       discard:
         notice: Задание было отменено
       executions:
+        application_trace: Application Trace
+        full_trace: Full Trace
         in_queue: в очереди
         runtime: время выполнения
         title: Выполнение заданий

data/config/locales/tr.yml

@@ -124,6 +124,8 @@ tr:
       discard:
         notice: İş İptal Edildi
       executions:
+        application_trace: Application Trace
+        full_trace: Full Trace
         in_queue: sırada
         runtime: çalışma süresi
         title: İşlemler

data/config/locales/uk.yml

@@ -148,6 +148,8 @@ uk:
       discard:
         notice: Завдання було відхилено
       executions:
+        application_trace: Application Trace
+        full_trace: Full Trace
         in_queue: у черзі
         runtime: час виконання
         title: Виконання

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

@@ -57,6 +57,7 @@ class CreateGoodJobs < ActiveRecord::Migration<%= migration_version %>
       t.datetime :finished_at
       t.text :error
       t.integer :error_event, limit: 2
+      t.text :error_backtrace, array: true
     end
 
     create_table :good_job_processes, id: :uuid do |t|

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class CreateGoodJobExecutionErrorBacktrace < 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_job_executions, :error_backtrace)
+      end
+    end
+
+    add_column :good_job_executions, :error_backtrace, :text, array: true
+  end
+end

data/lib/good_job/active_job_extensions/batches.rb

@@ -6,7 +6,7 @@ module GoodJob
       extend ActiveSupport::Concern
 
       def batch
-        @_batch ||= CurrentThread.execution&.batch&.to_batch
+        @_batch ||= CurrentThread.execution&.batch&.to_batch if CurrentThread.execution.present? && CurrentThread.execution.active_job_id == job_id
       end
       alias batch? batch
     end

data/lib/good_job/active_job_extensions/concurrency.rb

@@ -75,7 +75,7 @@ module GoodJob
           key = job.good_job_concurrency_key
           next if key.blank?
 
-          if CurrentThread.execution.blank?
+          if CurrentThread.execution.blank? || CurrentThread.execution.active_job_id != job_id
             logger.debug("Ignoring concurrency limits because the job is executed with `perform_now`.")
             next
           end
@@ -96,7 +96,7 @@ module GoodJob
 
               query = DiscreteExecution.joins(:job)
                                        .where(GoodJob::Job.table_name => { concurrency_key: key })
-                                       .where(DiscreteExecution.arel_table[:created_at].gt(throttle_period.ago))
+                                       .where(DiscreteExecution.arel_table[:created_at].gt(DiscreteExecution.bind_value('created_at', throttle_period.ago, ActiveRecord::Type::DateTime)))
               allowed_active_job_ids = query.where(error: nil).or(query.where.not(error: "GoodJob::ActiveJobExtensions::Concurrency::ThrottleExceededError: GoodJob::ActiveJobExtensions::Concurrency::ThrottleExceededError"))
                                             .order(created_at: :asc)
                                             .limit(throttle_limit)

data/lib/good_job/active_job_extensions/notify_options.rb

@@ -9,7 +9,7 @@ module GoodJob
     # @example
     #   # Include the concern to your job class:
     #   class MyJob < ApplicationJob
-    #     include GoodJob::ActiveJobExtensions::Notify
+    #     include GoodJob::ActiveJobExtensions::NotifyOptions
     #     self.good_job_notify = false
     #   end
     #

data/lib/good_job/capsule.rb

@@ -12,7 +12,7 @@ module GoodJob
     cattr_reader :instances, default: Concurrent::Array.new, instance_reader: false
 
     # @param configuration [GoodJob::Configuration] Configuration to use for this capsule.
-    def initialize(configuration: GoodJob.configuration)
+    def initialize(configuration: nil)
       @configuration = configuration
       @startable = true
       @started_at = nil
@@ -30,13 +30,13 @@ module GoodJob
         return unless startable?(force: force)
 
         @shared_executor = GoodJob::SharedExecutor.new
-        @notifier = GoodJob::Notifier.new(enable_listening: @configuration.enable_listen_notify, executor: @shared_executor.executor)
-        @poller = GoodJob::Poller.new(poll_interval: @configuration.poll_interval)
-        @multi_scheduler = GoodJob::MultiScheduler.from_configuration(@configuration, warm_cache_on_initialize: true)
+        @notifier = GoodJob::Notifier.new(enable_listening: configuration.enable_listen_notify, executor: @shared_executor.executor)
+        @poller = GoodJob::Poller.new(poll_interval: configuration.poll_interval)
+        @multi_scheduler = GoodJob::MultiScheduler.from_configuration(configuration, warm_cache_on_initialize: true)
         @notifier.recipients.push([@multi_scheduler, :create_thread])
         @poller.recipients.push(-> { @multi_scheduler.create_thread({ fanout: true }) })
 
-        @cron_manager = GoodJob::CronManager.new(@configuration.cron_entries, start_on_initialize: true, executor: @shared_executor.executor) if @configuration.enable_cron?
+        @cron_manager = GoodJob::CronManager.new(configuration.cron_entries, start_on_initialize: true, executor: @shared_executor.executor) if configuration.enable_cron?
 
         @startable = false
         @started_at = Time.current
@@ -51,7 +51,7 @@ module GoodJob
     #   * +nil+ will trigger a shutdown but not wait for it to complete.
     # @return [void]
     def shutdown(timeout: NONE)
-      timeout = @configuration.shutdown_timeout if timeout == NONE
+      timeout = configuration.shutdown_timeout if timeout == NONE
       GoodJob._shutdown_all([@shared_executor, @notifier, @poller, @multi_scheduler, @cron_manager].compact, timeout: timeout)
       @startable = false
       @started_at = nil
@@ -101,6 +101,10 @@ module GoodJob
 
     private
 
+    def configuration
+      @configuration || GoodJob.configuration
+    end
+
     def startable?(force: false)
       !@started_at && (@startable || force)
     end

data/lib/good_job/version.rb

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

data/lib/good_job.rb

@@ -203,7 +203,7 @@ module GoodJob
       deleted_batches_count = 0
       deleted_discrete_executions_count = 0
 
-      jobs_query = GoodJob::Job.where('finished_at <= ?', timestamp).order(finished_at: :asc).limit(in_batches_of)
+      jobs_query = GoodJob::Job.finished_before(timestamp).order(finished_at: :asc).limit(in_batches_of)
       jobs_query = jobs_query.succeeded unless include_discarded
       loop do
         active_job_ids = jobs_query.pluck(:active_job_id)
@@ -219,7 +219,7 @@ module GoodJob
       end
 
       if GoodJob::BatchRecord.migrated?
-        batches_query = GoodJob::BatchRecord.where('finished_at <= ?', timestamp).limit(in_batches_of)
+        batches_query = GoodJob::BatchRecord.finished_before(timestamp).limit(in_batches_of)
         batches_query = batches_query.succeeded unless include_discarded
         loop do
           deleted = batches_query.delete_all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 3.27.4
+  version: 3.28.1
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-04 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
-- !ruby/object:Gem::Dependency
-  name: benchmark-ips
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -385,6 +357,7 @@ files:
 - 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_create_good_job_execution_error_backtrace.rb.erb
 - lib/generators/good_job/templates/update/migrations/10_remove_good_job_active_id_index.rb.erb
 - lib/generators/good_job/templates/update/migrations/11_create_index_good_job_jobs_for_candidate_lookup.rb.erb
 - lib/generators/good_job/update_generator.rb
@@ -458,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A multithreaded, Postgres-based ActiveJob backend for Ruby on Rails