rails-autoscale-que 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bee374e8fd44b4e4f4e8a6bdd7c99126124d8541884be3df4295f6a61d2fe6d6
-  data.tar.gz: 5616ab915a67a420cecab35b47239834e7137b7eb1b571d6966a41a20f6039b8
+  metadata.gz: 3ebd5bed6afc65d8e3dd1da5e64c8ebf915fd104d0cecad546e54876f2352d6f
+  data.tar.gz: 452399f4355339098cd12676febdf2b4120d89f3153b70a0d95d8fc445db361a
 SHA512:
-  metadata.gz: 765bfec943878b9de999b8e69512a32471e45e7f6bd68cd5903027fe0c54e31957ae97b69804f9815278d6759fac1df88f2a913e9da7f0312b77a05a58052967
-  data.tar.gz: a9a0df37d1b2a76e213c46c2fd2de732c8830bbf04f1ed30fb81d1121fcda7096537517e7bfe49b3872c3130198ffb66a8c9e633a7229ef86513e216fa36b0f3
+  metadata.gz: 963f9fecc3c108cfb24a7a34d8e0b567a4818aea3f8ce69f978e0b8e568e3fc4bc1fb203b9352b39f42b0a66a9da8eed01ec5a1687acd62c5a2479d2bbf36a5b
+  data.tar.gz: d5d8bf23d7026f610a0d8850583df9a825355d50bdc98d510c3e3501a0cd6c6c8d45baabc204870c43503169681b32deddbf8ea9ed46c632df385bed66e261dd

data/lib/rails-autoscale-que.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require "judoscale/que"
+require "judoscale-que"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-autoscale-que
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Adam McCrea
@@ -10,36 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails-autoscale-core
+  name: judoscale-que
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
-- !ruby/object:Gem::Dependency
-  name: que
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.8.0
 description: 
 email:
 - hello@judoscale.com
@@ -47,18 +33,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile-activerecord-6-1
-- Gemfile-activerecord-7-0
-- Gemfile-que-1
-- Rakefile
-- judoscale-que.gemspec
-- lib/judoscale-que.rb
-- lib/judoscale/que.rb
-- lib/judoscale/que/metrics_collector.rb
-- lib/judoscale/que/version.rb
 - lib/rails-autoscale-que.rb
-- rails-autoscale-que.gemspec
 homepage: https://judoscale.com
 licenses:
 - MIT
@@ -76,14 +51,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Autoscaling for Que workers.

data/Gemfile

@@ -1,10 +0,0 @@
-source "https://rubygems.org"
-
-gemspec name: "judoscale-que"
-
-gem "judoscale-ruby", path: "../judoscale-ruby"
-gem "activerecord"
-gem "pg"
-gem "minitest"
-gem "rake"
-gem "debug"

data/Gemfile-activerecord-6-1

@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gemspec name: "judoscale-que"
-
-gem "judoscale-ruby", path: "../judoscale-ruby"
-gem "activerecord", "~> 6.1"
-gem "pg"
-gem "minitest"
-gem "rake"

data/Gemfile-activerecord-7-0

@@ -1,9 +0,0 @@
-source "https://rubygems.org"
-
-gemspec name: "judoscale-que"
-
-gem "judoscale-ruby", path: "../judoscale-ruby"
-gem "activerecord", "~> 7.0"
-gem "pg"
-gem "minitest"
-gem "rake"

data/Gemfile-que-1

@@ -1,10 +0,0 @@
-source "https://rubygems.org"
-
-gemspec name: "judoscale-que"
-
-gem "judoscale-ruby", path: "../judoscale-ruby"
-gem "que", "~> 1.0"
-gem "activerecord"
-gem "pg"
-gem "minitest"
-gem "rake"

data/Rakefile

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "lib"
-  t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
-task default: :test

data/judoscale-que.gemspec

@@ -1,30 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "judoscale/que/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "judoscale-que"
-  spec.version = Judoscale::Que::VERSION
-  spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"]
-  spec.email = ["hello@judoscale.com"]
-
-  spec.summary = "Autoscaling for Que workers."
-  spec.homepage = "https://judoscale.com"
-  spec.license = "MIT"
-
-  spec.metadata = {
-    "homepage_uri" => "https://judoscale.com",
-    "bug_tracker_uri" => "https://github.com/judoscale/judoscale-ruby/issues",
-    "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"
-  }
-
-  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = ">= 2.6.0"
-
-  spec.add_dependency "judoscale-ruby", Judoscale::Que::VERSION
-  spec.add_dependency "que", ">= 1.0"
-end

data/lib/judoscale/que/metrics_collector.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-require "judoscale/job_metrics_collector"
-require "judoscale/job_metrics_collector/active_record_helper"
-require "judoscale/metric"
-
-module Judoscale
-  module Que
-    class MetricsCollector < Judoscale::JobMetricsCollector
-      include ActiveRecordHelper
-
-      METRICS_SQL = ActiveRecordHelper.cleanse_sql(<<~SQL)
-        SELECT queue, min(run_at)
-        FROM que_jobs
-        WHERE finished_at IS NULL
-        AND expired_at IS NULL
-        AND error_count = 0
-        AND id NOT IN (
-          SELECT (classid::bigint << 32) + objid::bigint AS id
-          FROM pg_locks
-          WHERE locktype = 'advisory'
-        )
-        GROUP BY 1
-      SQL
-
-      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 self.collect?(config)
-        super && ActiveRecordHelper.table_exists?("que_jobs")
-      end
-
-      def collect
-        metrics = []
-        t = Time.now.utc
-
-        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)
-          latency_ms = run_at ? ((t - run_at) * 1000).ceil : 0
-          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)
-        metrics
-      end
-    end
-  end
-end

data/lib/judoscale/que/version.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Judoscale
-  module Que
-    VERSION = "1.7.0"
-  end
-end

data/lib/judoscale/que.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require "judoscale-ruby"
-require "judoscale/config"
-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,
-  expose_config: Judoscale::Config::JobAdapterConfig.new(:que)

data/lib/judoscale-que.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require "judoscale/que"

data/rails-autoscale-que.gemspec

@@ -1,30 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "judoscale/que/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "rails-autoscale-que"
-  spec.version = Judoscale::Que::VERSION
-  spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"]
-  spec.email = ["hello@judoscale.com"]
-
-  spec.summary = "Autoscaling for Que workers."
-  spec.homepage = "https://judoscale.com"
-  spec.license = "MIT"
-
-  spec.metadata = {
-    "homepage_uri" => "https://judoscale.com",
-    "bug_tracker_uri" => "https://github.com/judoscale/judoscale-ruby/issues",
-    "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"
-  }
-
-  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.require_paths = ["lib"]
-
-  spec.required_ruby_version = ">= 2.6.0"
-
-  spec.add_dependency "rails-autoscale-core", Judoscale::Que::VERSION
-  spec.add_dependency "que", ">= 1.0"
-end