judoscale-ruby 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26e9809db642f08b7291edeae004fb8619f04bbff3130dc6f34043be85a768df
-  data.tar.gz: a2ff6a031395e860a238db874212d4d82e106b8bdb91c2b3d948bb94a7c7a312
+  metadata.gz: 6ec3b89458d553902b60287bec9c3d5a86db77bc17d525264733e35da6bc4447
+  data.tar.gz: ce7fa95c5d69b38f84afe75bb24ab51f07687299eadd112945d2eed75d7c2607
 SHA512:
-  metadata.gz: 66423294a4021d1da21f77823d1ede3fbf4204da0ec61c9e90c33fbda2e34a21b77a7d06fcf95e711912ad38ed8d17875c74a8f5b98caefcaaac82b8d26a93e1
-  data.tar.gz: 948b94b9b8000c7af821a0bf3cbfe1f28317ca70a052b11d46b512b01a718d7e7816fc7e2ec4a7f2a545645401585d2baba6a8927f39448c6d11321c376800ae
+  metadata.gz: 01bc6d8713dec20c578fdcbf3dd91cbcf3cf6c1894e7431773d26b4f1fc63fd8b45d5170e8ad47a43b905d0a56f53e0c1f8ab7192056ac10f1bcd11b9d809b44
+  data.tar.gz: 227e0a5a91a4f7389d72a0b34fb8b19627616c3f8e772bf05c921f2ed761233e1ff0ff4d4cc937993c35fa92fff660252bd743202a690a4460050df34277c142

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    judoscale-ruby (1.0.0.rc1)
+    judoscale-ruby (1.0.0.rc2)
 
 GEM
   remote: https://rubygems.org/

data/judoscale-ruby.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 works with the Judoscale Heroku add-on to automatically scale your web and worker dynos."
+  spec.summary = "This gem is deprecated. See https://github.com/rails-autoscale/rails-autoscale-gems to integrate your Ruby app with the Judoscale Heroku add-on."
   spec.homepage = "https://judoscale.com"
   spec.license = "MIT"
 
@@ -24,4 +24,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.6.0"
+
+  spec.post_install_message = <<~EOS
+    `judoscale-ruby` is deprecated! Please migrate to `rails-autoscale-core`.
+    See https://github.com/rails-autoscale/rails-autoscale-gems for the installation guide.
+  EOS
 end

data/lib/judoscale/adapter_api.rb

@@ -16,7 +16,7 @@ module Judoscale
     end
 
     def report_metrics(report_json)
-      post_json "/v1/metrics", report_json
+      post_json "/v3/reports", report_json
     end
 
     private

data/lib/judoscale/config.rb

@@ -22,9 +22,14 @@ module Judoscale
       UUID_REGEXP = /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/
       DEFAULT_QUEUE_FILTER = ->(queue_name) { !UUID_REGEXP.match?(queue_name) }
 
-      attr_accessor :enabled, :max_queues, :queues, :queue_filter, :track_busy_jobs
+      attr_accessor :identifier, :enabled, :max_queues, :queues, :queue_filter, :track_busy_jobs
 
-      def initialize
+      def initialize(identifier)
+        @identifier = identifier
+        reset
+      end
+
+      def reset
         @enabled = true
         @max_queues = 20
         @queues = []
@@ -34,24 +39,29 @@ module Judoscale
 
       def as_json
         {
-          max_queues: max_queues,
-          queues: queues,
-          queue_filter: queue_filter != DEFAULT_QUEUE_FILTER,
-          track_busy_jobs: track_busy_jobs
+          identifier => {
+            max_queues: max_queues,
+            queues: queues,
+            queue_filter: queue_filter != DEFAULT_QUEUE_FILTER,
+            track_busy_jobs: track_busy_jobs
+          }
         }
       end
     end
 
     include Singleton
 
-    @adapter_configs = {}
+    @adapter_configs = []
     class << self
       attr_reader :adapter_configs
     end
 
-    def self.add_adapter_config(identifier, config_class)
-      @adapter_configs[identifier] = config_class
-      attr_reader identifier
+    def self.expose_adapter_config(config_instance)
+      adapter_configs << config_instance
+
+      define_method(config_instance.identifier) do
+        config_instance
+      end
     end
 
     attr_accessor :api_base_url, :report_interval_seconds, :max_request_size_bytes, :logger
@@ -70,9 +80,7 @@ module Judoscale
       self.log_level = ENV["JUDOSCALE_LOG_LEVEL"]
       @logger = ::Logger.new($stdout)
 
-      self.class.adapter_configs.each do |identifier, config_class|
-        instance_variable_set(:"@#{identifier}", config_class.new)
-      end
+      self.class.adapter_configs.each(&:reset)
     end
 
     def dyno=(dyno_string)
@@ -84,9 +92,7 @@ module Judoscale
     end
 
     def as_json
-      adapter_configs_json = self.class.adapter_configs.each_key.with_object({}) do |identifier, hash|
-        hash[identifier] = public_send(identifier).as_json
-      end
+      adapter_configs_json = self.class.adapter_configs.reduce({}) { |hash, config| hash.merge!(config.as_json) }
 
       {
         log_level: log_level,

data/lib/judoscale/job_metrics_collector.rb

@@ -18,11 +18,11 @@ module Judoscale
     end
 
     def self.adapter_identifier
-      raise "Implement `self.adapter_identifier` in individual job metrics collectors."
+      adapter_config.identifier
     end
 
     def self.adapter_config
-      Config.instance.public_send(adapter_identifier)
+      raise "Implement `self.adapter_config` in individual job metrics collectors."
     end
 
     def initialize

data/lib/judoscale/report.rb

@@ -15,9 +15,7 @@ module Judoscale
         dyno: config.dyno,
         pid: Process.pid,
         config: config.as_json,
-        adapters: adapters.each_with_object({}) { |adapter, hash|
-          hash.merge!(adapter.as_json)
-        },
+        adapters: adapters.reduce({}) { |hash, adapter| hash.merge!(adapter.as_json) },
         metrics: metrics.map { |metric|
           [
             metric.time.to_i,

data/lib/judoscale/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Judoscale
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.0.rc2"
 end

data/lib/judoscale-ruby.rb

@@ -26,7 +26,8 @@ module Judoscale
     end
   end
 
-  def self.add_adapter(identifier, adapter_info, metrics_collector: nil)
+  def self.add_adapter(identifier, adapter_info, metrics_collector: nil, expose_config: nil)
+    Config.expose_adapter_config(expose_config) if expose_config
     @adapters << Adapter.new(identifier, adapter_info, metrics_collector)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judoscale-ruby
 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: []
 description:
 email:
@@ -46,7 +46,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-ruby` is deprecated! Please migrate to `rails-autoscale-core`.
+  See https://github.com/rails-autoscale/rails-autoscale-gems for the installation guide.
 rdoc_options: []
 require_paths:
 - lib
@@ -64,6 +66,6 @@ requirements: []
 rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
-summary: This gem works with the Judoscale Heroku add-on to automatically scale your
-  web and worker dynos.
+summary: This gem is deprecated. See https://github.com/rails-autoscale/rails-autoscale-gems
+  to integrate your Ruby app with the Judoscale Heroku add-on.
 test_files: []