judoscale-que 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 288ad007c0af7afa58ef656c70bc54fd9878e1af5811391faaac799fb96bf4e0
-  data.tar.gz: cdf6fe36d4a113b5f2df7154c197305257d445d84e5e88771418738c63cb5305
+  metadata.gz: 1928bee403da48853efb6cf9ec4ff5238eecc6d30a29555535205d5e571fe9b8
+  data.tar.gz: 1561549cecba98c480841404e0d8e909dc11a7b2a535196b7354bf424a608f73
 SHA512:
-  metadata.gz: 90ef5bf2e2f7acf88075194b54348a9eb06c5a2a42f9323851d298d350e68b08338fc8f933e2072865ba7b616c492370c8e193a2b07a396f7e79b97e9cc0d669
-  data.tar.gz: 686d49ff941967522e4a96f6cb4a8fddaf329659e5a7cb8cd76ed7e1df9bab56618a90983e670790ed11172fe84df6d0ab8b0690631829f0db052644ffe1ac38
+  metadata.gz: dd227662d8f047624aacd68cf2bf91649f01ff69f792c5b174150eabca2419df897fe3b8ae5dccc49dd182e4887e4df3ea22ca69f50d425a2b3616412241ff24
+  data.tar.gz: 02b0dbca091f210db1322d91827ea7c9910570e1f722543b175ec5b0a9bb7fc6a30b42e1764268c35686d3bc73e6eab8b4c2954d82a07e712c10dd470410b7c1

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-que (1.0.0.rc1)
+    judoscale-que (1.0.0.rc2)
       judoscale-ruby
       que (>= 1.0)
 
@@ -28,7 +28,7 @@ GEM
       concurrent-ruby (~> 1.0)
     minitest (5.15.0)
     pg (1.3.5)
-    que (1.4.0)
+    que (2.2.0)
     rake (13.0.6)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)

data/judoscale-que.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 Que 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 Que 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 "que", ">= 1.0"
+
+  spec.post_install_message = <<~EOS
+    `judoscale-que` is deprecated! Please migrate to `rails-autoscale-que`.
+    See https://github.com/rails-autoscale/rails-autoscale-gems for the installation guide.
+  EOS
 end

data/lib/judoscale/que/metrics_collector.rb

@@ -23,8 +23,19 @@ module Judoscale
         GROUP BY 1
       SQL
 
-      def self.adapter_identifier
-        :que
+      BUSY_METRICS_SQL = ActiveRecordHelper.cleanse_sql(<<~SQL)
+        SELECT queue, count(*)
+        FROM que_jobs
+        WHERE id IN (
+          SELECT (classid::bigint << 32) + objid::bigint AS id
+          FROM pg_locks
+          WHERE locktype = 'advisory'
+        )
+        GROUP BY 1
+      SQL
+
+      def self.adapter_config
+        Judoscale::Config.instance.que
       end
 
       def collect
@@ -34,6 +45,11 @@ module Judoscale
         run_at_by_queue = select_rows_silently(METRICS_SQL).to_h
         self.queues |= run_at_by_queue.keys
 
+        if track_busy_jobs?
+          busy_count_by_queue = select_rows_silently(BUSY_METRICS_SQL).to_h
+          self.queues |= busy_count_by_queue.keys
+        end
+
         queues.each do |queue|
           run_at = run_at_by_queue[queue]
           run_at = DateTime.parse(run_at) if run_at.is_a?(String)
@@ -41,6 +57,11 @@ module Judoscale
           latency_ms = 0 if latency_ms < 0
 
           metrics.push Metric.new(:qt, latency_ms, t, queue)
+
+          if track_busy_jobs?
+            busy_count = busy_count_by_queue[queue] || 0
+            metrics.push Metric.new(:busy, busy_count, Time.now, queue)
+          end
         end
 
         log_collection(metrics)

data/lib/judoscale/que/version.rb

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

data/lib/judoscale/que.rb

@@ -6,9 +6,10 @@ require "judoscale/que/version"
 require "judoscale/que/metrics_collector"
 require "que"
 
-Judoscale.add_adapter :"judoscale-que", {
-  adapter_version: Judoscale::Que::VERSION,
-  framework_version: ::Que::VERSION
-}, metrics_collector: Judoscale::Que::MetricsCollector
-
-Judoscale::Config.add_adapter_config :que, Judoscale::Config::JobAdapterConfig
+Judoscale.add_adapter :"judoscale-que",
+  {
+    adapter_version: Judoscale::Que::VERSION,
+    framework_version: ::Que::VERSION
+  },
+  metrics_collector: Judoscale::Que::MetricsCollector,
+  expose_config: Judoscale::Config::JobAdapterConfig.new(:que)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judoscale-que
 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
@@ -65,7 +65,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-que` is deprecated! Please migrate to `rails-autoscale-que`.
+  See https://github.com/rails-autoscale/rails-autoscale-gems for the installation guide.
 rdoc_options: []
 require_paths:
 - lib
@@ -83,6 +85,6 @@ requirements: []
 rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
-summary: This gem provides Que 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 Que with the Judoscale Heroku add-on.
 test_files: []