judoscale-resque 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7deeebf5eec99c390e3c8ca7f5bde2c1738e00df21c94859c7f01f92a3a8d8bc
-  data.tar.gz: e71578e2cc7d72ef2044c1e97005fb7f0657afa2922a3c3f4023f400789b9d5f
+  metadata.gz: 7caf083d01edd33b3a09c0d8e34dd3365936f609929c45d87273be58dc8d9132
+  data.tar.gz: 5e58f3b635f98efcd2d0c2ba48d12bdb539abfb6261dde72780f306cf215ecf0
 SHA512:
-  metadata.gz: 28c1483091686e5ac07ea2fc6889463e6a05830831f3d8bd6457a01b31c8bfa4aa02c68008b18133427da04edab5b8c69e15511fc51bcd2a74f36b0186a9e23e
-  data.tar.gz: f1278a7258bdb73f760ec4b0611712457d7fecd66a73b452d93c0dd84aedfb3ffc16d737bda138a7112eca59628ab9dafd3ec2d6821dce72ea35fef961e63b3f
+  metadata.gz: cba7a62dc8a424f07d614ce916cf12867e53516c50ef677b56c2ec258caeba5f15ddfff3ed18b359c891bc3d5431501653aecf5fc9ba0e1b56b8c671d24bca7c
+  data.tar.gz: 0b45c55b28902393973c42758dfbe9b52f5e2b45acda2ed46592e7548f264ed9612da73ce10803daefaa1fde7f86816e25125588ca0135dc4226ae692b4e9eeb

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: ../judoscale-ruby
   specs:
-    judoscale-ruby (1.0.0.rc1)
+    judoscale-ruby (1.0.0.rc2)
 
 PATH
   remote: .
   specs:
-    judoscale-resque (1.0.0.rc1)
+    judoscale-resque (1.0.0.rc2)
       judoscale-ruby
       resque (>= 2.0)
 
@@ -16,27 +16,27 @@ GEM
     minitest (5.15.0)
     mono_logger (1.1.1)
     multi_json (1.15.0)
-    mustermann (1.1.1)
+    mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
-    rack (2.2.3)
-    rack-protection (2.2.0)
+    rack (2.2.4)
+    rack-protection (2.2.2)
       rack
     rake (13.0.6)
-    redis (4.6.0)
-    redis-namespace (1.8.2)
-      redis (>= 3.0.4)
+    redis (4.7.1)
+    redis-namespace (1.9.0)
+      redis (>= 4)
     resque (2.2.1)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.6)
       sinatra (>= 0.9.2)
     ruby2_keywords (0.0.5)
-    sinatra (2.2.0)
-      mustermann (~> 1.0)
+    sinatra (2.2.2)
+      mustermann (~> 2.0)
       rack (~> 2.2)
-      rack-protection (= 2.2.0)
+      rack-protection (= 2.2.2)
       tilt (~> 2.0)
-    tilt (2.0.10)
+    tilt (2.0.11)
 
 PLATFORMS
   arm64-darwin-20

data/judoscale-resque.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors = ["Adam McCrea", "Carlos Antonio da Silva"]
   spec.email = ["adam@adamlogic.com"]
 
-  spec.summary = "This gem provides Resque integration with the Judoscale autoscaling add-on for Heroku."
+  spec.summary = "This gem is deprecated. See https://github.com/rails-autoscale/rails-autoscale-gems to integrate Resque with the Judoscale Heroku add-on."
   spec.homepage = "https://judoscale.com"
   spec.license = "MIT"
 
@@ -27,4 +27,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "judoscale-ruby"
   spec.add_dependency "resque", ">= 2.0"
+
+  spec.post_install_message = <<~EOS
+    `judoscale-resque` is deprecated! Please migrate to `rails-autoscale-resque`.
+    See https://github.com/rails-autoscale/rails-autoscale-gems for the installation guide.
+  EOS
 end

data/lib/judoscale/resque/latency_extension.rb

@@ -0,0 +1,23 @@
+module Judoscale
+  module Resque
+    module LatencyExtension
+      # Store the time when jobs are pushed to the queue in order to calculate latency.
+      def push(queue, item)
+        item["timestamp"] = Time.now.utc.to_f
+        super
+      end
+
+      # Calculate latency for the given queue using the stored timestamp of the oldest item in the queue.
+      def latency(queue)
+        if (item = peek(queue))
+          timestamp = item["timestamp"]
+          timestamp ? Time.now.utc.to_f - timestamp.to_f : 0.0
+        else
+          0.0
+        end
+      end
+    end
+  end
+end
+
+::Resque.extend(Judoscale::Resque::LatencyExtension)

data/lib/judoscale/resque/metrics_collector.rb

@@ -6,8 +6,8 @@ require "judoscale/metric"
 module Judoscale
   module Resque
     class MetricsCollector < Judoscale::JobMetricsCollector
-      def self.adapter_identifier
-        :resque
+      def self.adapter_config
+        Judoscale::Config.instance.resque
       end
 
       def collect
@@ -29,7 +29,10 @@ module Judoscale
         queues.each do |queue|
           next if queue.nil? || queue.empty?
           depth = ::Resque.size(queue)
+          latency = (::Resque.latency(queue) * 1000).ceil
+
           metrics.push Metric.new(:qd, depth, Time.now, queue)
+          metrics.push Metric.new(:qt, latency, Time.now, queue)
 
           if track_busy_jobs?
             busy_count = busy_counts[queue]

data/lib/judoscale/resque/version.rb

@@ -2,6 +2,6 @@
 
 module Judoscale
   module Resque
-    VERSION = "1.0.0.rc1"
+    VERSION = "1.0.0.rc2"
   end
 end

data/lib/judoscale/resque.rb

@@ -5,10 +5,12 @@ require "judoscale/config"
 require "judoscale/resque/version"
 require "judoscale/resque/metrics_collector"
 require "resque"
+require "judoscale/resque/latency_extension"
 
-Judoscale.add_adapter :"judoscale-resque", {
-  adapter_version: Judoscale::Resque::VERSION,
-  framework_version: ::Resque::VERSION
-}, metrics_collector: Judoscale::Resque::MetricsCollector
-
-Judoscale::Config.add_adapter_config :resque, Judoscale::Config::JobAdapterConfig
+Judoscale.add_adapter :"judoscale-resque",
+  {
+    adapter_version: Judoscale::Resque::VERSION,
+    framework_version: ::Resque::VERSION
+  },
+  metrics_collector: Judoscale::Resque::MetricsCollector,
+  expose_config: Judoscale::Config::JobAdapterConfig.new(:resque)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judoscale-resque
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Adam McCrea
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: judoscale-ruby
@@ -52,6 +52,7 @@ files:
 - judoscale-resque.gemspec
 - lib/judoscale-resque.rb
 - lib/judoscale/resque.rb
+- lib/judoscale/resque/latency_extension.rb
 - lib/judoscale/resque/metrics_collector.rb
 - lib/judoscale/resque/version.rb
 homepage: https://judoscale.com
@@ -63,7 +64,9 @@ metadata:
   documentation_uri: https://judoscale.com/docs
   changelog_uri: https://github.com/judoscale/judoscale-ruby/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/judoscale/judoscale-ruby
-post_install_message:
+post_install_message: |
+  `judoscale-resque` is deprecated! Please migrate to `rails-autoscale-resque`.
+  See https://github.com/rails-autoscale/rails-autoscale-gems for the installation guide.
 rdoc_options: []
 require_paths:
 - lib
@@ -81,6 +84,6 @@ requirements: []
 rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
-summary: This gem provides Resque integration with the Judoscale autoscaling add-on
-  for Heroku.
+summary: This gem is deprecated. See https://github.com/rails-autoscale/rails-autoscale-gems
+  to integrate Resque with the Judoscale Heroku add-on.
 test_files: []