hirefire-resource 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d0159499127d61d2281f345a3c4b50cb1a975012aed540d34a6463b53d5cc77
-  data.tar.gz: 6424c3fd3462880b0e2a635ddde4fefdce30740b4eee3edaabf7ff9d29a0a895
+  metadata.gz: 0d45d749acb1ce30e85634881f98f7259e9b2bd24f6f76983d2e5c946e1222d1
+  data.tar.gz: 9f5b1702bef3cda52f67ea3b1ff35045a600cf0df83da2f17e3c608b4890481d
 SHA512:
-  metadata.gz: 60f7e44322babde5329e98b57c0698cd0ac9824f98cb4d83de30cd9dc750fdfb8845ddd8916a754d62011f397a2565afe437dd71b1d8f36ab4d8fa6f634cde96
-  data.tar.gz: f40b10e7e7d7a24824970f19a235619feec0171c374ca5a16ff5263c3a36996a44ad3088ab6aacee7cf8bf9abdf6175d8faa43cb5fc7bc2f4d255ce3ace0dd08
+  metadata.gz: 65e6fd490177ea36113595126becc4b32d7068852f3a4b03af53a43327961f80726ea5e7deb01b4e20c9ea5db7c2601bea4c3c1c9e1e55f773bb84d7a5ff9606
+  data.tar.gz: 27fcb7a34f1383e44cff4243e9ec61748ac9947efcead5c649b12f9c19bdec150225781046ce57f62d622ae5a7e8ac8b4d4ee0f753b8adfe9471fed5300fc939

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 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.
+* Add tests for `solid_queue ~> 1`.
+* Drop tests for `ruby ~> 2.7`.
+
 ## v1.0.4
 
 * Add support for `good_job ~> 4`, for the `job_queue_size`, `job_queue_latency` and `queue` (deprecated) macros.

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/deprecated/delayed_job.rb

@@ -37,13 +37,13 @@ module HireFire
               query = query.where(priority: options[:min_priority]..) if options.key?(:min_priority)
               query = query.where(priority: ..options[:max_priority]) if options.key?(:max_priority)
               query = query.where(queue: queues) unless queues.empty?
-              query.count.tap { ActiveRecord::Base.clear_active_connections! }
+              query.count
             when :active_record_2
               # Note: There is no queue column in delayed_job <= 2.x
               query = ::Delayed::Job.scoped(conditions: ["run_at <= ? AND failed_at is NULL", Time.now.utc])
               query = query.scoped(conditions: ["priority >= ?", options[:min_priority]]) if options.key?(:min_priority)
               query = query.scoped(conditions: ["priority <= ?", options[:max_priority]]) if options.key?(:max_priority)
-              query.count.tap { ActiveRecord::Base.clear_active_connections! if ActiveRecord::Base.respond_to?(:clear_active_connections!) }
+              query.count
             when :mongoid
               query = ::Delayed::Job.where(:failed_at => nil, :run_at.lte => Time.now.utc)
               query = query.where(:priority.gte => options[:min_priority]) if options.key?(:min_priority)

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.4"
+  VERSION = "1.0.6"
 end

data/lib/hirefire/worker.rb

@@ -6,7 +6,7 @@ module HireFire
 
     class MissingDynoBlockError < StandardError; end
 
-    PROCESS_NAME_PATTERN = /\A[a-zA-Z][a-zA-Z0-9_-]{0,29}\z/
+    PROCESS_NAME_PATTERN = /\A[a-zA-Z][a-zA-Z0-9_-]{0,62}\z/
 
     attr_reader :name
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-26 00:00:00.000000000 Z
+date: 2024-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: HireFire integration library for Ruby applications