hirefire-resource 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c981cc399cbd8abdb5a0416b0f05286621aef47c03db25fb646607f553976f6
-  data.tar.gz: '08047393729ab2f071e4d08cd49e5ca92e6cdeae1ed5875da52df996b6b7b358'
+  metadata.gz: 0d45d749acb1ce30e85634881f98f7259e9b2bd24f6f76983d2e5c946e1222d1
+  data.tar.gz: 9f5b1702bef3cda52f67ea3b1ff35045a600cf0df83da2f17e3c608b4890481d
 SHA512:
-  metadata.gz: 92e00b6fdc3d51f7a2f363b83b77e6c9da56f2d535e163f2e40fc6c0260bcfaadfea060f0ef3e03e4e19809698d1d898382625cb3f42dc30dd0ad00949b3943b
-  data.tar.gz: 3d9780fda27839409e76c48b66143fad5149d5e77217737c2a90004dfb3dea8018b24aad24e00be15030e73d8791c7e8b9126b85b4586e0f9b5242a3922b0923
+  metadata.gz: 65e6fd490177ea36113595126becc4b32d7068852f3a4b03af53a43327961f80726ea5e7deb01b4e20c9ea5db7c2601bea4c3c1c9e1e55f773bb84d7a5ff9606
+  data.tar.gz: 27fcb7a34f1383e44cff4243e9ec61748ac9947efcead5c649b12f9c19bdec150225781046ce57f62d622ae5a7e8ac8b4d4ee0f753b8adfe9471fed5300fc939

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.0.6
+
+* Ensure that discarded jobs are not used when measuring queue size and latency with Good Job v3 and v4.
+
 ## v1.0.5
 
 * Increase process name length constraint from 30 to 63.

data/lib/hirefire/macro/bunny.rb

@@ -25,6 +25,16 @@ module HireFire
       #   with the accurate counting of jobs that are currently scheduled to run, leading to
       #   premature upscaling. If you want to be able to schedule jobs to run in the future,
       #   consider using the Delayed Message Plugin for RabbitMQ.
+      #
+      # @note The method relies on the `message_count` metric to determine the number of "Ready" messages
+      #   in the queue. When using auto-acknowledgment, messages are acknowledged immediately upon delivery,
+      #   causing the `message_count` to drop to zero, even if the consumer is processing messages. To ensure
+      #   accurate metrics:
+      #   - Enable manual acknowledgment (`manual_ack: true`) so that RabbitMQ tracks unacknowledged messages.
+      #   - Set a reasonable prefetch limit (`channel.prefetch(x)`) to control the number of messages delivered
+      #     to the consumer, allowing a measurable backlog to remain in the "Ready" state.
+      #   This configuration ensures accurate scaling metrics and prevents premature depletion of the queue.
+      #
       # @param queues [Array<String, Symbol>] Names of the queues for size measurement.
       # @param amqp_url [String, nil] (optional) RabbitMQ URL for establishing a new connection.
       # @return [Integer] Total job queue size.

data/lib/hirefire/macro/good_job.rb

@@ -28,6 +28,7 @@ module HireFire
         query = good_job_class
         query = query.where(queue_name: queues) if queues.any?
         query = query.where(performed_at: nil)
+        query = query.where.not(error_event: discarded_enum).or(query.where(error_event: nil)) if error_event_supported?
         query = query.where(scheduled_at: ..Time.now).or(query.where(scheduled_at: nil))
         query = query.order(scheduled_at: :asc, created_at: :asc)
 
@@ -55,6 +56,7 @@ module HireFire
         query = good_job_class
         query = query.where(queue_name: queues) if queues.any?
         query = query.where(performed_at: nil)
+        query = query.where.not(error_event: discarded_enum).or(query.where(error_event: nil)) if error_event_supported?
         query = query.where(scheduled_at: ..Time.now).or(query.where(scheduled_at: nil))
         query.count
       end

data/lib/hirefire/macro/helpers/good_job.rb

@@ -13,6 +13,21 @@ module HireFire
             ::GoodJob::Execution
           end
         end
+
+        def error_event_supported?
+          Gem::Version.new(::GoodJob::VERSION) >= Gem::Version.new("3.0.0")
+        end
+
+        [
+          :interrupted,
+          :unhandled,
+          :handled,
+          :retried,
+          :retry_stopped,
+          :discarded
+        ].each_with_index do |event, index|
+          define_method(:"#{event}_enum") { index }
+        end
       end
     end
   end

data/lib/hirefire/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HireFire
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-15 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal