good_job 4.9.2 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eebb74f90c823f1b2dd3dbeeecffc6279b072d5929182c7734357ce98ebd3a1a
-  data.tar.gz: f0df3c322938cb34d9a5686a344db8e412a2878473ff778928006855ab8339a1
+  metadata.gz: 464fe8415569d7b3a2e09f1ae95052ae8349969cb9086ee56e85d7d02a161de8
+  data.tar.gz: 9c1dd45dc3e99d9ed218a7123a38ab6f106ebf8b93871af86655d5ee9cf3a64f
 SHA512:
-  metadata.gz: a91aae2a4768af8c89c8b0e2b04898d70dbe145b8808f2e1cc60fd18dd63faafd3679ca7444abd9e6863b7991b778ee709ba8949ac791362ff850c7aca3dcb5c
-  data.tar.gz: e3df10dbd134f6e335938578c0050e838d2b0073a6a3d7f64a90313e70afd214e76307df146be840dc8fecfcfca32bcb4ea9671f7549573c2e0e32adb8006a7a
+  metadata.gz: 2270c9d1fdd9c0b953f921ac873ffed572270907ce1d99cbb92b1ddb63b9afa979603af20aacbd2b01745b4e76743966d5851ab1a742f60fcb29258aaef5cae9
+  data.tar.gz: 62802abd14cd93633bc7667bf42b74cbeb7bb420de6a85f3dd0fa7e93aad63eb0714f52976d80b527152bd6e7746a231a17fd46a15f8674ec7e90149df410b05

data/CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## [v4.10.0](https://github.com/bensheldon/good_job/tree/v4.10.0) (2025-04-26)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v4.9.3...v4.10.0)
+
+**Implemented enhancements:**
+
+- Improve dashboard performance when searching for job ID [\#1619](https://github.com/bensheldon/good_job/pull/1619) ([francois](https://github.com/francois))
+
+**Fixed bugs:**
+
+- Fix Batches dashboard deserealization error [\#1628](https://github.com/bensheldon/good_job/pull/1628) ([JulianPasquale](https://github.com/JulianPasquale))
+- Fix enqueue\_after\_transaction\_commit config [\#1626](https://github.com/bensheldon/good_job/pull/1626) ([santib](https://github.com/santib))
+
+**Closed issues:**
+
+- Retried jobs with GoodJob::ActiveJobExtensions::Concurrency::ConcurrencyExceededError lose their arguments [\#1620](https://github.com/bensheldon/good_job/issues/1620)
+- Searching for job ID fails on Heroku due to 30s request limit [\#1618](https://github.com/bensheldon/good_job/issues/1618)
+- Poor performance when enqueuing many throttled jobs because of unindexed queries [\#1603](https://github.com/bensheldon/good_job/issues/1603)
+
+**Merged pull requests:**
+
+- Update `GoodJob.migrated?` for latest migration [\#1631](https://github.com/bensheldon/good_job/pull/1631) ([Earlopain](https://github.com/Earlopain))
+
+## [v4.9.3](https://github.com/bensheldon/good_job/tree/v4.9.3) (2025-03-10)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v4.9.2...v4.9.3)
+
+**Closed issues:**
+
+- perform\_job.good\_job notification for successful jobs has error\_event: :discarded [\#1609](https://github.com/bensheldon/good_job/issues/1609)
+
+**Merged pull requests:**
+
+- Fix instrumentation of "perform\_job.good\_job" event [\#1616](https://github.com/bensheldon/good_job/pull/1616) ([bensheldon](https://github.com/bensheldon))
+
 ## [v4.9.2](https://github.com/bensheldon/good_job/tree/v4.9.2) (2025-03-09)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v4.9.1...v4.9.2)

data/app/filters/good_job/jobs_filter.rb

@@ -2,6 +2,8 @@
 
 module GoodJob
   class JobsFilter < BaseFilter
+    UUID_REGEX = /\A[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}\z/i
+
     def state_names
       %w[scheduled retried queued running succeeded discarded]
     end
@@ -25,7 +27,16 @@ module GoodJob
 
       query = query.job_class(filter_params[:job_class]) if filter_params[:job_class].present?
       query = query.where(queue_name: filter_params[:queue_name]) if filter_params[:queue_name].present?
-      query = query.search_text(filter_params[:query]) if filter_params[:query].present?
+
+      search_query = filter_params[:query]&.strip
+      if search_query.present?
+        query = if query_is_uuid_and_job_exists?(search_query)
+                  query.where(active_job_id: search_query)
+                else
+                  query.search_text(search_query)
+                end
+      end
+
       query = query.where(cron_key: filter_params[:cron_key]) if filter_params[:cron_key].present?
       query = query.where(finished_at: finished_since(filter_params[:finished_since])..) if filter_params[:finished_since].present?
 
@@ -90,5 +101,9 @@ module GoodJob
         7.days.ago
       end
     end
+
+    def query_is_uuid_and_job_exists?(search_query)
+      @_query_is_uuid_and_job_exists ||= search_query&.match?(UUID_REGEX) && base_query.exists?(active_job_id: search_query)
+    end
   end
 end

data/app/models/good_job/batch_record.rb

@@ -40,7 +40,19 @@ module GoodJob
     end
 
     def display_attributes
-      attributes.except('serialized_properties').merge(properties: properties)
+      display_properties = begin
+        serialized_properties
+      rescue ActiveJob::DeserializationError
+        JSON.parse(read_attribute_before_type_cast(:serialized_properties))
+      end
+
+      attribute_names.to_h do |name|
+        if name == "serialized_properties"
+          ["properties", display_properties]
+        else
+          [name, self[name]]
+        end
+      end
     end
 
     def _continue_discard_or_finish(job = nil, lock: true)

data/app/models/good_job/execution_result.rb

@@ -9,7 +9,7 @@ module GoodJob
     attr_reader :handled_error
     # @return [Exception, nil]
     attr_reader :unhandled_error
-    # @return [String, nil]
+    # @return [Symbol, nil]
     attr_reader :error_event
     # @return [Boolean, nil]
     attr_reader :unexecutable

data/app/models/good_job/job.rb

@@ -249,6 +249,13 @@ module GoodJob
           Arel.sql('integer')
         )
       end
+
+      def concurrency_key_created_at_index_migrated?
+        return true if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_concurrency_key_and_created_at)
+
+        migration_pending_warning!
+        false
+      end
     end
 
     def self.build_for_enqueue(active_job, scheduled_at: nil)
@@ -642,8 +649,9 @@ module GoodJob
               value = nil
             end
             handled_error ||= current_thread.error_on_retry || current_thread.error_on_discard
-
-            error_event = if handled_error == current_thread.error_on_discard
+            error_event = if !handled_error
+                            nil
+                          elsif handled_error == current_thread.error_on_discard
                             :discarded
                           elsif handled_error == current_thread.error_on_retry
                             :retried
@@ -655,6 +663,7 @@ module GoodJob
 
             instrument_payload.merge!(
               value: value,
+              error: handled_error,
               handled_error: handled_error,
               retried: current_thread.retried_job.present?,
               error_event: error_event
@@ -669,7 +678,11 @@ module GoodJob
                             :unhandled
                           end
 
-            instrument_payload[:unhandled_error] = e
+            instrument_payload.merge!(
+              error: e,
+              unhandled_error: e,
+              error_event: error_event
+            )
             ExecutionResult.new(value: nil, unhandled_error: e, error_event: error_event)
           end
         end

data/app/views/good_job/batches/_table.erb

@@ -76,7 +76,7 @@
             </div>
           </div>
           <%= tag.div id: dom_id(batch, "properties"), class: "batch-properties list-group-item collapse small bg-dark text-light" do %>
-            <%= tag.pre JSON.pretty_generate(batch.properties) %>
+            <%= tag.pre JSON.pretty_generate(batch.display_attributes["properties"]) %>
           <% end %>
         <% end %>
       <% else %>

data/lib/good_job/configuration.rb

@@ -367,6 +367,7 @@ module GoodJob
     # @return [Boolean]
     def enqueue_after_transaction_commit
       return options[:enqueue_after_transaction_commit] unless options[:enqueue_after_transaction_commit].nil?
+      return rails_config[:enqueue_after_transaction_commit] unless rails_config[:enqueue_after_transaction_commit].nil?
 
       DEFAULT_ENQUEUE_AFTER_TRANSACTION_COMMIT
     end

data/lib/good_job/version.rb

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

data/lib/good_job.rb

@@ -290,7 +290,7 @@ module GoodJob
   # For use in tests/CI to validate GoodJob is up-to-date.
   # @return [Boolean]
   def self.migrated?
-    GoodJob::BatchRecord.jobs_finished_at_migrated?
+    GoodJob::Job.concurrency_key_created_at_index_migrated?
   end
 
   # Pause job execution for a given queue or job class.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 4.9.2
+  version: 4.10.0
 platform: ruby
 authors:
 - Ben Sheldon
 bindir: exe
 cert_chain: []
-date: 2025-03-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -240,9 +240,9 @@ executables:
 - good_job
 extensions: []
 extra_rdoc_files:
-- README.md
 - CHANGELOG.md
 - LICENSE.txt
+- README.md
 files:
 - CHANGELOG.md
 - LICENSE.txt
@@ -421,7 +421,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.8
 specification_version: 4
 summary: A multithreaded, Postgres-based ActiveJob backend for Ruby on Rails
 test_files: []