hirefire-resource 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d45d749acb1ce30e85634881f98f7259e9b2bd24f6f76983d2e5c946e1222d1
-  data.tar.gz: 9f5b1702bef3cda52f67ea3b1ff35045a600cf0df83da2f17e3c608b4890481d
+  metadata.gz: 2472f4d981a95c1869a29eaa7b97429aa2f9f5d8e2a4e1858a167bfc916daee4
+  data.tar.gz: c97478c3f7632dc6ea0c514d6f34894ea0514a1f259c9685e62ed3a63bbba6af
 SHA512:
-  metadata.gz: 65e6fd490177ea36113595126becc4b32d7068852f3a4b03af53a43327961f80726ea5e7deb01b4e20c9ea5db7c2601bea4c3c1c9e1e55f773bb84d7a5ff9606
-  data.tar.gz: 27fcb7a34f1383e44cff4243e9ec61748ac9947efcead5c649b12f9c19bdec150225781046ce57f62d622ae5a7e8ac8b4d4ee0f753b8adfe9471fed5300fc939
+  metadata.gz: 2dc43ce87ea0435294d7f86d44a5e99a30e1a913d170fafadcd7292d061c9a8acdc3a9e3646467d789d32aa83becc40ee89a2b2048136e1badf993f4f9e3e25f
+  data.tar.gz: 90e56a5fdddeb1fdb98f891614fdb6cd66b7a6d07c6efd000ced14cb73de9aa44682d4772b6c4c12c1e114271b57600c7f578cb2a9439d79386d42fa2080d1e4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.0.7
+
+* Add support for Sidekiq 8.
+
 ## v1.0.6
 
 * Ensure that discarded jobs are not used when measuring queue size and latency with Good Job v3 and v4.

data/lib/hirefire/macro/sidekiq.rb

@@ -128,10 +128,15 @@ module HireFire
 
           max_latencies = oldest_jobs.map do |job_payload|
             job = job_payload ? JSON.parse(job_payload) : {}
-            job["enqueued_at"] ? Time.now.to_f - job["enqueued_at"] : 0.0
+
+            if Gem::Version.new(::Sidekiq::VERSION) >= Gem::Version.new("8.0.0")
+              job["enqueued_at"] ? Time.now.to_i - job["enqueued_at"] / 1000 : 0
+            else
+              job["enqueued_at"] ? Time.now.to_f - job["enqueued_at"] : 0.0
+            end
           end
 
-          max_latencies.max || 0.0
+          Integer(max_latencies.max || 0)
         end
 
         def set_latency(set, queues)
@@ -157,80 +162,6 @@ module HireFire
         extend HireFire::Utility
         extend self
 
-        def call(*queues, server: false, **options)
-          require "sidekiq/api"
-
-          queues = normalize_queues(queues, allow_empty: true)
-
-          if server
-            server_lookup(queues, **options)
-          else
-            client_lookup(queues, **options)
-          end
-        end
-
-        private
-
-        def client_lookup(queues, skip_retries: false, skip_scheduled: false, skip_working: false, max_scheduled: nil)
-          size = enqueued_size(queues)
-          size += scheduled_size(queues, max_scheduled) unless skip_scheduled
-          size += retry_size(queues) unless skip_retries
-          size += working_size(queues) unless skip_working
-          size
-        end
-
-        def enqueued_size(queues)
-          queues = registered_queues if queues.empty?
-
-          ::Sidekiq.redis do |conn|
-            conn.pipelined do |pipeline|
-              queues.each { |name| pipeline.llen("queue:#{name}") }
-            end
-          end.sum
-        end
-
-        def scheduled_size(queues, max = nil)
-          size, now = 0, Time.now
-
-          find_each_in_set(::Sidekiq::ScheduledSet.new) do |job|
-            if job.at > now || max && size >= max
-              break
-            elsif queues.empty? || queues.include?(job["queue"])
-              size += 1
-            end
-          end
-
-          size
-        end
-
-        def retry_size(queues)
-          size = 0
-          now = Time.now
-
-          find_each_in_set(::Sidekiq::RetrySet.new) do |job|
-            if job.at > now
-              break
-            elsif queues.empty? || queues.include?(job["queue"])
-              size += 1
-            end
-          end
-
-          size
-        end
-
-        def working_size(queues)
-          now = Time.now
-          now_as_i = now.to_i
-
-          ::Sidekiq::Workers.new.count do |key, tid, job|
-            if job.is_a?(Hash) # Sidekiq < 7.2.1
-              (queues.empty? || queues.include?(job["queue"])) && job["run_at"] <= now_as_i
-            else # Sidekiq >= 7.2.1
-              (queues.empty? || queues.include?(job.queue)) && job.run_at <= now
-            end
-          end
-        end
-
         SERVER_SIDE_SCRIPT = <<~LUA
           local tonumber = tonumber
           local cjson_decode = cjson.decode
@@ -330,6 +261,80 @@ module HireFire
 
         SERVER_SIDE_SCRIPT_SHA = Digest::SHA1.hexdigest(SERVER_SIDE_SCRIPT).freeze
 
+        def call(*queues, server: false, **options)
+          require "sidekiq/api"
+
+          queues = normalize_queues(queues, allow_empty: true)
+
+          if server
+            server_lookup(queues, **options)
+          else
+            client_lookup(queues, **options)
+          end
+        end
+
+        private
+
+        def client_lookup(queues, skip_retries: false, skip_scheduled: false, skip_working: false, max_scheduled: nil)
+          size = enqueued_size(queues)
+          size += scheduled_size(queues, max_scheduled) unless skip_scheduled
+          size += retry_size(queues) unless skip_retries
+          size += working_size(queues) unless skip_working
+          size
+        end
+
+        def enqueued_size(queues)
+          queues = registered_queues if queues.empty?
+
+          ::Sidekiq.redis do |conn|
+            conn.pipelined do |pipeline|
+              queues.each { |name| pipeline.llen("queue:#{name}") }
+            end
+          end.sum
+        end
+
+        def scheduled_size(queues, max = nil)
+          size, now = 0, Time.now
+
+          find_each_in_set(::Sidekiq::ScheduledSet.new) do |job|
+            if job.at > now || max && size >= max
+              break
+            elsif queues.empty? || queues.include?(job["queue"])
+              size += 1
+            end
+          end
+
+          size
+        end
+
+        def retry_size(queues)
+          size = 0
+          now = Time.now
+
+          find_each_in_set(::Sidekiq::RetrySet.new) do |job|
+            if job.at > now
+              break
+            elsif queues.empty? || queues.include?(job["queue"])
+              size += 1
+            end
+          end
+
+          size
+        end
+
+        def working_size(queues)
+          now = Time.now
+          now_as_i = now.to_i
+
+          ::Sidekiq::Workers.new.count do |key, tid, job|
+            if job.is_a?(Hash) # Sidekiq < 7.2.1
+              (queues.empty? || queues.include?(job["queue"])) && job["run_at"] <= now_as_i
+            else # Sidekiq >= 7.2.1
+              (queues.empty? || queues.include?(job.queue)) && job.run_at <= now
+            end
+          end
+        end
+
         def server_lookup(queues, skip_scheduled: false, skip_retries: false, skip_working: false, max_scheduled: 0)
           ::Sidekiq.redis do |connection|
             now = Time.now.to_i

data/lib/hirefire/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Michael van Rooijen
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2025-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -24,7 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-description: 
 email:
 - support@hirefire.io
 executables: []
@@ -72,7 +70,6 @@ metadata:
   changelog_uri: https://github.com/hirefire/hirefire-resource-ruby/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/hirefire/hirefire-resource-ruby
   bug_tracker_uri: https://github.com/hirefire/hirefire-resource-ruby/issues
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -87,8 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: HireFire integration library for Ruby applications
 test_files: []