rails-autoscale-sidekiq 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13c6bd1e98a94c63ae9721ee5f5fe8a0704e0c319e0e59c7f363cbea26ef6789
-  data.tar.gz: a78902faee8159c7d80d89ef721de20e719faef1b3479fc215a5701571f0e6e1
+  metadata.gz: 6f03a9d4e15d94b3512f570d2831b07158d7513edb1aef1f1f6e9591947481ab
+  data.tar.gz: f8b6ac6c8923b46a8e9f4d5a3b511798a21a0633552e9aa041d2eff385802eb1
 SHA512:
-  metadata.gz: ce5c1e4dc29c81547db9cdcc8a647af096902448cb597c6c33cb30adf0f5fa66a9900a3296454cecf48702561428df6b4a6977abe49b5aa76ef4d289de7ea4de
-  data.tar.gz: 0e801667705cb9781f4a5a5f520e81a991a63ac204f50400c988f11fb6f744a0a52f0f45dfe3faeb4de3520349d80002754228889629578206e06b6d91962ee4
+  metadata.gz: 0a199e5122ea03ecca8cb06146e6b691ccc0c7b9afa8e5637509e19dd6c440b7715936715558bc34eed865850bf69e981b375eb71e6da75cdb0719bcd629d83c
+  data.tar.gz: 50eec05653c48bd455a8ddac3f977983520ace2d1fad85b37af16cd2f1a58ce3c58e2375df2a276e654b8b80859fb45d019762c2f7b32738a486449e5a954b3a

data/Gemfile

@@ -1,8 +1,10 @@
 source "https://rubygems.org"
 
-gemspec
+gemspec name: "judoscale-sidekiq"
 
-gem "rails-autoscale-core", path: "../rails-autoscale-core"
+gem "judoscale-ruby", path: "../judoscale-ruby"
+gem "sidekiq", "~> 7.0"
 gem "minitest"
 gem "rake"
+gem "rake-release"
 gem "debug"

data/Gemfile-sidekiq-5

@@ -1,8 +1,9 @@
 source "https://rubygems.org"
 
-gemspec
+gemspec name: "judoscale-sidekiq"
 
-gem "rails-autoscale-core", path: "../rails-autoscale-core"
+gem "judoscale-ruby", path: "../judoscale-ruby"
 gem "sidekiq", "~> 5.0"
 gem "minitest"
 gem "rake"
+gem "rake-release"

data/Gemfile.lock

@@ -1,18 +1,19 @@
 PATH
-  remote: ../rails-autoscale-core
+  remote: ../judoscale-ruby
   specs:
-    rails-autoscale-core (1.1.0)
+    judoscale-ruby (1.2.1)
 
 PATH
   remote: .
   specs:
-    rails-autoscale-sidekiq (1.1.0)
-      rails-autoscale-core
+    judoscale-sidekiq (1.2.1)
+      judoscale-ruby
       sidekiq (>= 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    concurrent-ruby (1.1.10)
     connection_pool (2.3.0)
     debug (1.6.2)
       irb (>= 1.3.6)
@@ -21,15 +22,19 @@ GEM
     irb (1.4.1)
       reline (>= 0.3.0)
     minitest (5.15.0)
-    rack (2.2.4)
+    rack (3.0.0)
     rake (13.0.6)
-    redis (4.8.0)
+    rake-release (1.3.0)
+      bundler (>= 1.11, < 3)
+    redis-client (0.11.1)
+      connection_pool
     reline (0.3.1)
       io-console (~> 0.5)
-    sidekiq (6.5.7)
-      connection_pool (>= 2.2.5)
-      rack (~> 2.0)
-      redis (>= 4.5.0, < 5)
+    sidekiq (7.0.1)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      rack (>= 2.2.4)
+      redis-client (>= 0.9.0)
 
 PLATFORMS
   arm64-darwin-20
@@ -39,10 +44,12 @@ PLATFORMS
 
 DEPENDENCIES
   debug
+  judoscale-ruby!
+  judoscale-sidekiq!
   minitest
-  rails-autoscale-core!
-  rails-autoscale-sidekiq!
   rake
+  rake-release
+  sidekiq (~> 7.0)
 
 BUNDLED WITH
    2.3.9

data/Rakefile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
+require "rake/release"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|

data/judoscale-sidekiq.gemspec

@@ -0,0 +1,30 @@
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "judoscale/sidekiq/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "judoscale-sidekiq"
+  spec.version = Judoscale::Sidekiq::VERSION
+  spec.authors = ["Adam McCrea", "Carlos Antonio da Silva"]
+  spec.email = ["adam@adamlogic.com"]
+
+  spec.summary = "This gem provides Sidekiq integration with the Judoscale autoscaling add-on for Heroku."
+  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"
+  spec.add_dependency "sidekiq", ">= 5.0"
+end

data/lib/{rails_autoscale → judoscale}/sidekiq/metrics_collector.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require "rails_autoscale/job_metrics_collector"
-require "rails_autoscale/metric"
+require "judoscale/job_metrics_collector"
+require "judoscale/metric"
 
-module RailsAutoscale
+module Judoscale
   module Sidekiq
-    class MetricsCollector < RailsAutoscale::JobMetricsCollector
+    class MetricsCollector < Judoscale::JobMetricsCollector
       def self.adapter_config
-        RailsAutoscale::Config.instance.sidekiq
+        Judoscale::Config.instance.sidekiq
       end
 
       def collect
@@ -21,7 +21,10 @@ module RailsAutoscale
         if track_busy_jobs?
           busy_counts = Hash.new { |h, k| h[k] = 0 }
           ::Sidekiq::Workers.new.each do |pid, tid, work|
-            busy_counts[work.dig("payload", "queue")] += 1
+            payload = work["payload"]
+            # payload is unparsed in Sidekiq 7
+            payload = JSON.parse(payload) if payload.is_a?(String)
+            busy_counts[payload["queue"]] += 1
           end
         end
 

data/lib/{rails_autoscale → judoscale}/sidekiq/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-module RailsAutoscale
+module Judoscale
   module Sidekiq
-    VERSION = "1.1.0"
+    VERSION = "1.2.1"
   end
 end

data/lib/judoscale/sidekiq.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "judoscale-ruby"
+require "judoscale/config"
+require "judoscale/sidekiq/version"
+require "judoscale/sidekiq/metrics_collector"
+require "sidekiq/api"
+
+Judoscale.add_adapter :"judoscale-sidekiq",
+  {
+    adapter_version: Judoscale::Sidekiq::VERSION,
+    framework_version: ::Sidekiq::VERSION
+  },
+  metrics_collector: Judoscale::Sidekiq::MetricsCollector,
+  expose_config: Judoscale::Config::JobAdapterConfig.new(:sidekiq)

data/lib/judoscale-sidekiq.rb

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

data/rails-autoscale-sidekiq.gemspec

@@ -1,23 +1,23 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "rails_autoscale/sidekiq/version"
+require "judoscale/sidekiq/version"
 
 Gem::Specification.new do |spec|
   spec.name = "rails-autoscale-sidekiq"
-  spec.version = RailsAutoscale::Sidekiq::VERSION
+  spec.version = Judoscale::Sidekiq::VERSION
   spec.authors = ["Adam McCrea", "Carlos Antonio da Silva"]
   spec.email = ["adam@adamlogic.com"]
 
-  spec.summary = "This gem provides Sidekiq integration with the Rails Autoscale autoscaling add-on for Heroku."
-  spec.homepage = "https://railsautoscale.com"
+  spec.summary = "This gem provides Sidekiq integration with the Judoscale autoscaling add-on for Heroku."
+  spec.homepage = "https://judoscale.com"
   spec.license = "MIT"
 
   spec.metadata = {
-    "homepage_uri" => "https://railsautoscale.com",
-    "bug_tracker_uri" => "https://github.com/rails-autoscale/rails-autoscale-gems/issues",
-    "documentation_uri" => "https://railsautoscale.com/docs",
-    "changelog_uri" => "https://github.com/rails-autoscale/rails-autoscale-gems/blob/main/CHANGELOG.md",
-    "source_code_uri" => "https://github.com/rails-autoscale/rails-autoscale-gems"
+    "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)/}) }
@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.6.0"
 
-  spec.add_dependency "rails-autoscale-core"
+  spec.add_dependency "judoscale-ruby"
   spec.add_dependency "sidekiq", ">= 5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-autoscale-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Adam McCrea
@@ -9,10 +9,10 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails-autoscale-core
+  name: judoscale-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -50,20 +50,21 @@ files:
 - Gemfile-sidekiq-5
 - Gemfile.lock
 - Rakefile
-- lib/rails-autoscale-sidekiq.rb
-- lib/rails_autoscale/sidekiq.rb
-- lib/rails_autoscale/sidekiq/metrics_collector.rb
-- lib/rails_autoscale/sidekiq/version.rb
+- judoscale-sidekiq.gemspec
+- lib/judoscale-sidekiq.rb
+- lib/judoscale/sidekiq.rb
+- lib/judoscale/sidekiq/metrics_collector.rb
+- lib/judoscale/sidekiq/version.rb
 - rails-autoscale-sidekiq.gemspec
-homepage: https://railsautoscale.com
+homepage: https://judoscale.com
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://railsautoscale.com
-  bug_tracker_uri: https://github.com/rails-autoscale/rails-autoscale-gems/issues
-  documentation_uri: https://railsautoscale.com/docs
-  changelog_uri: https://github.com/rails-autoscale/rails-autoscale-gems/blob/main/CHANGELOG.md
-  source_code_uri: https://github.com/rails-autoscale/rails-autoscale-gems
+  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
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -82,6 +83,6 @@ requirements: []
 rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
-summary: This gem provides Sidekiq integration with the Rails Autoscale autoscaling
-  add-on for Heroku.
+summary: This gem provides Sidekiq integration with the Judoscale autoscaling add-on
+  for Heroku.
 test_files: []

data/lib/rails-autoscale-sidekiq.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_autoscale/sidekiq"

data/lib/rails_autoscale/sidekiq.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require "rails-autoscale-core"
-require "rails_autoscale/config"
-require "rails_autoscale/sidekiq/version"
-require "rails_autoscale/sidekiq/metrics_collector"
-require "sidekiq/api"
-
-RailsAutoscale.add_adapter :"rails-autoscale-sidekiq",
-  {
-    adapter_version: RailsAutoscale::Sidekiq::VERSION,
-    framework_version: ::Sidekiq::VERSION
-  },
-  metrics_collector: RailsAutoscale::Sidekiq::MetricsCollector,
-  expose_config: RailsAutoscale::Config::JobAdapterConfig.new(:sidekiq)