judoscale-ruby 1.0.0.rc2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ec3b89458d553902b60287bec9c3d5a86db77bc17d525264733e35da6bc4447
-  data.tar.gz: ce7fa95c5d69b38f84afe75bb24ab51f07687299eadd112945d2eed75d7c2607
+  metadata.gz: 06d6051251ff5f628677d931e240a35ce4f93ec8409d3e9ba8e539ec300a96d6
+  data.tar.gz: ce94920cc35eff9f6cf328df39c84e2f0a25bd681422ab8111434311ba33cbc4
 SHA512:
-  metadata.gz: 01bc6d8713dec20c578fdcbf3dd91cbcf3cf6c1894e7431773d26b4f1fc63fd8b45d5170e8ad47a43b905d0a56f53e0c1f8ab7192056ac10f1bcd11b9d809b44
-  data.tar.gz: 227e0a5a91a4f7389d72a0b34fb8b19627616c3f8e772bf05c921f2ed761233e1ff0ff4d4cc937993c35fa92fff660252bd743202a690a4460050df34277c142
+  metadata.gz: 21110c610a6619f3750901aade4e3a2bef813d16cfb78956225972d7b57f5769769419dcd0bf2a5d1933bf8e0760601ae35cc81d0b84078bd4232f4fadacca1d
+  data.tar.gz: f5f7f33785b2f0554907abce78bc0e6e10dd1e2ebf773e2b5ae9fb366fa30a024de89477ee542b43c2ac09e7fcae49db944bfe879529ae0beb2dbc652f4051c5

data/Gemfile

@@ -1,7 +1,9 @@
 source "https://rubygems.org"
 
-gemspec
+gemspec name: "judoscale-ruby"
 
 gem "rake", ">= 12.3.3"
+gem "rake-release"
 gem "minitest"
 gem "webmock"
+gem "debug"

data/Gemfile.lock

@@ -1,21 +1,31 @@
 PATH
   remote: .
   specs:
-    judoscale-ruby (1.0.0.rc2)
+    judoscale-ruby (1.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     crack (0.4.5)
       rexml
+    debug (1.4.0)
+      irb (>= 1.3.6)
+      reline (>= 0.2.7)
     hashdiff (1.0.1)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
     minitest (5.15.0)
-    public_suffix (4.0.6)
+    public_suffix (5.0.0)
     rake (13.0.6)
+    rake-release (1.3.0)
+      bundler (>= 1.11, < 3)
+    reline (0.3.1)
+      io-console (~> 0.5)
     rexml (3.2.5)
-    webmock (3.14.0)
+    webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -27,9 +37,11 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  debug
   judoscale-ruby!
   minitest
   rake (>= 12.3.3)
+  rake-release
   webmock
 
 BUNDLED WITH

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/lib/{judoscale-ruby.rb → rails-autoscale-core.rb}

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require "judoscale/config"
-require "judoscale/version"
+require "rails_autoscale/config"
+require "rails_autoscale/version"
 
-module Judoscale
-  # Allows configuring Judoscale through a block, usually defined during application initialization.
+module RailsAutoscale
+  # Allows configuring Rails Autoscale through a block, usually defined during application initialization.
   #
   # Example:
   #
-  #    Judoscale.configure do |config|
+  #    RailsAutoscale.configure do |config|
   #      config.logger = MyLogger.new
   #    end
   def self.configure
@@ -31,8 +31,10 @@ module Judoscale
     @adapters << Adapter.new(identifier, adapter_info, metrics_collector)
   end
 
-  add_adapter :"judoscale-ruby", {
+  add_adapter :"rails-autoscale-core", {
     adapter_version: VERSION,
     language_version: RUBY_VERSION
   }
 end
+
+Judoscale = RailsAutoscale

data/lib/{judoscale → rails_autoscale}/adapter_api.rb

@@ -3,9 +3,9 @@
 require "net/http"
 require "uri"
 require "json"
-require "judoscale/logger"
+require "rails_autoscale/logger"
 
-module Judoscale
+module RailsAutoscale
   class AdapterApi
     include Logger
 
@@ -27,6 +27,7 @@ module Judoscale
     end
 
     def post_raw(options)
+      attempts ||= 1
       uri = URI.parse("#{@config.api_base_url}#{options.fetch(:path)}")
       ssl = uri.scheme == "https"
 
@@ -42,6 +43,15 @@ module Judoscale
       when 200...300 then SuccessResponse.new(response.body)
       else FailureResponse.new([response.code, response.message].join(" - "))
       end
+    rescue Net::OpenTimeout
+      if attempts < 3
+        # TCP timeouts happen sometimes, but they can usually be successfully retried in a moment
+        sleep 0.01
+        attempts += 1
+        retry
+      else
+        FailureResponse.new("Timeout while obtaining TCP connection to #{uri.host}")
+      end
     end
 
     class SuccessResponse < Struct.new(:body)

data/lib/{judoscale → rails_autoscale}/config.rb

@@ -3,7 +3,7 @@
 require "singleton"
 require "logger"
 
-module Judoscale
+module RailsAutoscale
   class Config
     class Dyno
       attr_reader :name, :num
@@ -31,10 +31,12 @@ module Judoscale
 
       def reset
         @enabled = true
-        @max_queues = 20
         @queues = []
         @queue_filter = DEFAULT_QUEUE_FILTER
-        @track_busy_jobs = false
+
+        # Support for deprecated legacy env var configs.
+        @max_queues = (ENV["RAILS_AUTOSCALE_MAX_QUEUES"] || 20).to_i
+        @track_busy_jobs = ENV["RAILS_AUTOSCALE_LONG_JOBS"] == "true"
       end
 
       def as_json
@@ -64,7 +66,7 @@ module Judoscale
       end
     end
 
-    attr_accessor :api_base_url, :report_interval_seconds, :max_request_size_bytes, :logger
+    attr_accessor :api_base_url, :report_interval_seconds, :max_request_size_bytes, :logger, :log_tag
     attr_reader :dyno, :log_level
 
     def initialize
@@ -73,11 +75,12 @@ module Judoscale
 
     def reset
       # Allow the API URL to be configured - needed for testing.
-      @api_base_url = ENV["JUDOSCALE_URL"]
+      @api_base_url = ENV["RAILS_AUTOSCALE_URL"] || ENV["JUDOSCALE_URL"]
+      @log_tag = ENV["JUDOSCALE_URL"] ? "Judoscale" : "RailsAutoscale"
       self.dyno = ENV["DYNO"]
       @max_request_size_bytes = 100_000 # ignore request payloads over 100k since they skew the queue times
       @report_interval_seconds = 10
-      self.log_level = ENV["JUDOSCALE_LOG_LEVEL"]
+      self.log_level = ENV["RAILS_AUTOSCALE_LOG_LEVEL"] || ENV["JUDOSCALE_LOG_LEVEL"]
       @logger = ::Logger.new($stdout)
 
       self.class.adapter_configs.each(&:reset)

data/lib/{judoscale → rails_autoscale}/job_metrics_collector/active_record_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Judoscale
+module RailsAutoscale
   class JobMetricsCollector
     module ActiveRecordHelper
       # Cleanup any whitespace characters (including new lines) from the SQL for simpler logging.
@@ -24,7 +24,7 @@ module Judoscale
 
       def select_rows_tagged(sql)
         if ActiveRecord::Base.logger.respond_to?(:tagged)
-          ActiveRecord::Base.logger.tagged(Judoscale::LoggerProxy::TAG) { select_rows(sql) }
+          ActiveRecord::Base.logger.tagged(Config.instance.log_tag) { select_rows(sql) }
         else
           select_rows(sql)
         end

data/lib/{judoscale → rails_autoscale}/job_metrics_collector.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 require "set"
-require "judoscale/metrics_collector"
-require "judoscale/logger"
+require "rails_autoscale/metrics_collector"
+require "rails_autoscale/logger"
 
-module Judoscale
+module RailsAutoscale
   class JobMetricsCollector < MetricsCollector
-    include Judoscale::Logger
+    include RailsAutoscale::Logger
 
     # It's redundant to report these metrics from every dyno, so only report from the first one.
     def self.collect?(config)

data/lib/{judoscale → rails_autoscale}/logger.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "judoscale/config"
+require "rails_autoscale/config"
 require "logger"
 
-module Judoscale
+module RailsAutoscale
   module Logger
     def logger
       @logger ||= LoggerProxy.new(Config.instance.logger, Config.instance.log_level)
@@ -11,19 +11,20 @@ module Judoscale
   end
 
   class LoggerProxy < Struct.new(:logger, :log_level)
-    TAG = "Judoscale"
-
-    %w[ERROR WARN INFO DEBUG].each do |severity_name|
+    %w[ERROR WARN INFO DEBUG FATAL].each do |severity_name|
       severity_level = ::Logger::Severity.const_get(severity_name)
 
       define_method(severity_name.downcase) do |*messages|
         if log_level.nil?
-          logger.add(severity_level) { tag(messages) }
+          logger.public_send(severity_name.downcase) { tag(messages) }
         elsif severity_level >= log_level
           if severity_level >= logger.level
-            logger.add(severity_level) { tag(messages) }
+            logger.public_send(severity_name.downcase) { tag(messages) }
           else
-            logger.add(logger.level) { tag(messages, tag_level: severity_name) }
+            # Our logger proxy is configured with a lower severity level than the underlying logger,
+            # so send this message using the underlying logger severity instead of the actual severity.
+            logger_severity_name = ::Logger::SEV_LABEL[logger.level].downcase
+            logger.public_send(logger_severity_name) { tag(messages, tag_level: severity_name) }
           end
         end
       end
@@ -32,7 +33,7 @@ module Judoscale
     private
 
     def tag(msgs, tag_level: nil)
-      tag = +"[#{TAG}]"
+      tag = +"[#{Config.instance.log_tag}]"
       tag << " [#{tag_level}]" if tag_level
       msgs.map { |msg| "#{tag} #{msg}" }.join("\n")
     end

data/lib/{judoscale → rails_autoscale}/metric.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Judoscale
+module RailsAutoscale
   class Metric < Struct.new(:identifier, :value, :time, :queue_name)
     # No queue_name is assumed to be a web request metric
     # Metrics: qt = queue time (default), qd = queue depth, busy

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Judoscale
+module RailsAutoscale
   class MetricsCollector
     def self.collect?(config)
       true

data/lib/{judoscale → rails_autoscale}/metrics_store.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require "singleton"
-require "judoscale/metric"
-require "judoscale/report"
+require "rails_autoscale/metric"
+require "rails_autoscale/report"
 
-module Judoscale
+module RailsAutoscale
   class MetricsStore
     include Singleton
 

data/lib/{judoscale → rails_autoscale}/report.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Judoscale
+module RailsAutoscale
   class Report
     attr_reader :adapters, :config, :metrics
 

data/lib/{judoscale → rails_autoscale}/reporter.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
 require "singleton"
-require "judoscale/config"
-require "judoscale/logger"
-require "judoscale/adapter_api"
-require "judoscale/job_metrics_collector"
-require "judoscale/web_metrics_collector"
+require "rails_autoscale/config"
+require "rails_autoscale/logger"
+require "rails_autoscale/adapter_api"
+require "rails_autoscale/job_metrics_collector"
+require "rails_autoscale/web_metrics_collector"
 
-module Judoscale
+module RailsAutoscale
   class Reporter
     include Singleton
     include Logger
 
-    def self.start(config = Config.instance, adapters = Judoscale.adapters)
+    def self.start(config = Config.instance, adapters = RailsAutoscale.adapters)
       instance.start!(config, adapters) unless instance.started?
     end
 
@@ -20,7 +20,7 @@ module Judoscale
       @pid = Process.pid
 
       if !config.api_base_url
-        logger.info "Reporter not started: JUDOSCALE_URL is not set"
+        logger.info "Reporter not started: RAILS_AUTOSCALE_URL is not set"
         return
       end
 
@@ -76,7 +76,7 @@ module Judoscale
     private
 
     def report(config, metrics)
-      report = Report.new(Judoscale.adapters, config, metrics)
+      report = Report.new(RailsAutoscale.adapters, config, metrics)
       logger.info "Reporting #{report.metrics.size} metrics"
       result = AdapterApi.new(config).report_metrics(report.as_json)
 

data/lib/{judoscale → rails_autoscale}/request_metrics.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Judoscale
+module RailsAutoscale
   class RequestMetrics
     attr_reader :request_id, :size, :network_time
 
@@ -36,7 +36,7 @@ module Judoscale
       queue_time -= network_time
 
       # Safeguard against negative queue times (should not happen in practice)
-      queue_time > 0 ? queue_time : 0
+      (queue_time > 0) ? queue_time : 0
     end
   end
 end

data/lib/{judoscale → rails_autoscale}/request_middleware.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "judoscale/metrics_store"
-require "judoscale/reporter"
-require "judoscale/logger"
-require "judoscale/request_metrics"
+require "rails_autoscale/metrics_store"
+require "rails_autoscale/reporter"
+require "rails_autoscale/logger"
+require "rails_autoscale/request_metrics"
 
-module Judoscale
+module RailsAutoscale
   class RequestMiddleware
     include Logger
 
@@ -27,11 +27,11 @@ module Judoscale
         store = MetricsStore.instance
 
         # NOTE: Expose queue time to the app
-        env["judoscale.queue_time"] = queue_time
+        env["rails_autoscale.queue_time"] = queue_time
         store.push :qt, queue_time
 
         unless network_time.zero?
-          env["judoscale.network_time"] = network_time
+          env["rails_autoscale.network_time"] = network_time
           store.push :nt, network_time
         end
 

data/lib/rails_autoscale/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module RailsAutoscale
+  VERSION = "1.1.1"
+end

data/lib/{judoscale → rails_autoscale}/web_metrics_collector.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "judoscale/metrics_collector"
-require "judoscale/metrics_store"
+require "rails_autoscale/metrics_collector"
+require "rails_autoscale/metrics_store"
 
-module Judoscale
+module RailsAutoscale
   class WebMetricsCollector < MetricsCollector
     def self.collect?(config)
       config.dyno.name == "web"

data/rails-autoscale-core.gemspec

@@ -0,0 +1,27 @@
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "rails_autoscale/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "rails-autoscale-core"
+  spec.version = RailsAutoscale::VERSION
+  spec.authors = ["Adam McCrea", "Carlos Antonio da Silva"]
+  spec.email = ["adam@adamlogic.com"]
+
+  spec.summary = "This gem works with the Rails Autoscale Heroku add-on to automatically scale your web and worker dynos."
+  spec.homepage = "https://railsautoscale.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"
+  }
+
+  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"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judoscale-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.1.1
 platform: ruby
 authors:
 - Adam McCrea
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-07 00:00:00.000000000 Z
+date: 2022-11-23 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -21,34 +21,32 @@ files:
 - Gemfile
 - Gemfile.lock
 - Rakefile
-- judoscale-ruby.gemspec
-- lib/judoscale-ruby.rb
-- lib/judoscale/adapter_api.rb
-- lib/judoscale/config.rb
-- lib/judoscale/job_metrics_collector.rb
-- lib/judoscale/job_metrics_collector/active_record_helper.rb
-- lib/judoscale/logger.rb
-- lib/judoscale/metric.rb
-- lib/judoscale/metrics_collector.rb
-- lib/judoscale/metrics_store.rb
-- lib/judoscale/report.rb
-- lib/judoscale/reporter.rb
-- lib/judoscale/request_metrics.rb
-- lib/judoscale/request_middleware.rb
-- lib/judoscale/version.rb
-- lib/judoscale/web_metrics_collector.rb
+- lib/rails-autoscale-core.rb
+- lib/rails_autoscale/adapter_api.rb
+- lib/rails_autoscale/config.rb
+- lib/rails_autoscale/job_metrics_collector.rb
+- lib/rails_autoscale/job_metrics_collector/active_record_helper.rb
+- lib/rails_autoscale/logger.rb
+- lib/rails_autoscale/metric.rb
+- lib/rails_autoscale/metrics_collector.rb
+- lib/rails_autoscale/metrics_store.rb
+- lib/rails_autoscale/report.rb
+- lib/rails_autoscale/reporter.rb
+- lib/rails_autoscale/request_metrics.rb
+- lib/rails_autoscale/request_middleware.rb
+- lib/rails_autoscale/version.rb
+- lib/rails_autoscale/web_metrics_collector.rb
+- rails-autoscale-core.gemspec
 homepage: https://judoscale.com
 licenses:
 - MIT
 metadata:
   homepage_uri: https://judoscale.com
   bug_tracker_uri: https://github.com/judoscale/judoscale-ruby/issues
-  documentation_uri: https://judoscale.com/docs
+  documentation_uri: https://railsautoscale.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: |
-  `judoscale-ruby` is deprecated! Please migrate to `rails-autoscale-core`.
-  See https://github.com/rails-autoscale/rails-autoscale-gems for the installation guide.
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -59,13 +57,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
-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.
+summary: This gem works with the Judoscale Heroku add-on to automatically scale your
+  web and worker dynos.
 test_files: []

data/judoscale-ruby.gemspec

@@ -1,32 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "judoscale/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "judoscale-ruby"
-  spec.version = Judoscale::VERSION
-  spec.authors = ["Adam McCrea", "Carlos Antonio da Silva"]
-  spec.email = ["adam@adamlogic.com"]
-
-  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"
-
-  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.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/version.rb

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