good_job 4.9.1 → 4.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 257efee85262d3d49be021082bc73cce8dfcf2bea117841a31862bb592158593
-  data.tar.gz: d5adc70dcd2894ce5190e07eab45e322c7724f74d96f5a4ccf96bee3c1b35798
+  metadata.gz: 11143bd2b5c2841e11678c93f3632485b0bc9dd23927454c07ffc6d1e6b0abea
+  data.tar.gz: 5e2681807571802f1ee335fcc689f27e2aba2a13fe4cc1d633813d1bd949c0cb
 SHA512:
-  metadata.gz: 003cb3656a88bcd02e8354e315dff667a284d3cae0674ff8b5f73a7cbcfd0ed1b60faf27ff23b14a1d83e395209d4292cfb8e6d771835c4a9418c8ff1977b327
-  data.tar.gz: c13483d1ac9f15a720b161905cab041f2c52f7305568b885bfeb0c7fbc514662023cde9ff87fe09f99811536285265aa3d3a4aa31113f73c026f1d39a5521b88
+  metadata.gz: 92b3e5bc089532cac4fe541f1e265915e0ca480f0067e2f1662e2f17d40f8af6c9e983d716fc4405a412dfd86d913c16132654c879b368055ee060f0a93336ce
+  data.tar.gz: a2fe5af27f4dd8ee1afe6ad312d3218d3eff2b8776f87d3d9047db13119f2a9f5d53f9866aa51e3cacb6146f306a4127fc55bf1b503b80c1be7754a356d275d3

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [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)
+
+**Fixed bugs:**
+
+- Quiet duplicate cron enqueue logging by pretending it was halted at before\_enqueue [\#1615](https://github.com/bensheldon/good_job/pull/1615) ([bensheldon](https://github.com/bensheldon))
+
 ## [v4.9.1](https://github.com/bensheldon/good_job/tree/v4.9.1) (2025-03-09)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v4.9.0...v4.9.1)

data/app/models/good_job/cron_entry.rb

@@ -110,8 +110,6 @@ module GoodJob # :nodoc:
           kwargs_value.present? ? configured_job.perform_later(*args_value, **kwargs_value) : configured_job.perform_later(*args_value)
         end
       end
-    rescue ActiveRecord::RecordNotUnique
-      false
     end
 
     def display_properties

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

@@ -387,7 +387,16 @@ module GoodJob
         end
 
         instrument_payload[:job] = job
-        job.save!
+        begin
+          job.save!
+        rescue ActiveRecord::RecordNotUnique
+          raise unless job.cron_key
+
+          # Active Job doesn't have a clean way to cancel an enqueue for unexceptional reasons
+          # This is a workaround to mark it as having been halted in before_enqueue
+          active_job.send(:halted_callback_hook, "duplicate_cron_key", "good_job")
+          return false
+        end
 
         CurrentThread.retried_job = job if retried
 
@@ -633,8 +642,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
@@ -646,6 +656,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
@@ -660,7 +671,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/lib/good_job/adapter.rb

@@ -163,8 +163,10 @@ module GoodJob
             scheduled_at: scheduled_at
           )
 
-          executed_locally = execute_async? && @capsule&.create_thread(job.job_state)
-          Notifier.notify(job.job_state) if !executed_locally && send_notify?(active_job)
+          if job
+            executed_locally = execute_async? && @capsule&.create_thread(job.job_state)
+            Notifier.notify(job.job_state) if !executed_locally && send_notify?(active_job)
+          end
         end
 
         job

data/lib/good_job/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 4.9.1
+  version: 4.9.3
 platform: ruby
 authors:
 - Ben Sheldon
 bindir: exe
 cert_chain: []
-date: 2025-03-09 00:00:00.000000000 Z
+date: 2025-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob