rails-autoscale-core 1.1.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50da5c684e5529550e1ca98e3fae5f691e6c570a22fcea50fa4c5835bd3f2b2b
-  data.tar.gz: d92402f06b3e9274a23edd96568977f9833d64577728b4cc14b5d504c9b822d9
+  metadata.gz: 0a26698eaf5edca75ec2e8fd7bf1b5035f9b697c1a94fd81a062a9dfec80c636
+  data.tar.gz: 30476ecf0afa5774c3773c2b2abbd7c258ef1256fe3e0d086d44a6cca07b69ff
 SHA512:
-  metadata.gz: 03d5797fd9590fb1588e7ccdb473643f03d306776d8d1a277557f9d2e8dd6b71b08155e6788f1de59cdcadb72d89f013ae32e114c28a7d5b1de1a8a5514df444
-  data.tar.gz: bf3710593737f7286c7b05959b518a634c0f94da406eeb98828d3be52876908213339c6eb133476a55690976890af92ef372fd61e64a5ba44502fa154c3f06d6
+  metadata.gz: ae8ddf51539fee0296c875b579dc7a01014fe2001393ea63c2c81da56e1ff008b154d51b60e0d86a42767908d030000d2441019a74380c48386742cb2e4f0e18
+  data.tar.gz: 5e75546db2c28f54781d03b9c791731408e45f21a5055cddfe03fac7625131f194a4873fb50bcc5bca194754e035b07b1e6c686bbd0b0d932e0419ca65ae511e

data/Gemfile

@@ -1,8 +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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails-autoscale-core (1.1.1)
+    judoscale-ruby (1.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -10,17 +10,19 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     crack (0.4.5)
       rexml
-    debug (1.4.0)
-      irb (>= 1.3.6)
-      reline (>= 0.2.7)
+    debug (1.7.1)
+      irb (>= 1.5.0)
+      reline (>= 0.3.1)
     hashdiff (1.0.1)
-    io-console (0.5.11)
-    irb (1.4.1)
+    io-console (0.6.0)
+    irb (1.6.2)
       reline (>= 0.3.0)
-    minitest (5.15.0)
-    public_suffix (5.0.0)
+    minitest (5.17.0)
+    public_suffix (5.0.1)
     rake (13.0.6)
-    reline (0.3.1)
+    rake-release (1.3.0)
+      bundler (>= 1.11, < 3)
+    reline (0.3.2)
       io-console (~> 0.5)
     rexml (3.2.5)
     webmock (3.18.1)
@@ -36,9 +38,10 @@ PLATFORMS
 
 DEPENDENCIES
   debug
+  judoscale-ruby!
   minitest
-  rails-autoscale-core!
   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/judoscale-ruby.gemspec

@@ -0,0 +1,27 @@
+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 works with the Judoscale Heroku add-on to automatically scale your web and worker dynos."
+  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"
+end

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

@@ -3,9 +3,9 @@
 require "net/http"
 require "uri"
 require "json"
-require "rails_autoscale/logger"
+require "judoscale/logger"
 
-module RailsAutoscale
+module Judoscale
   class AdapterApi
     include Logger
 

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

@@ -3,7 +3,7 @@
 require "singleton"
 require "logger"
 
-module RailsAutoscale
+module Judoscale
   class Config
     class Dyno
       attr_reader :name, :num
@@ -75,12 +75,12 @@ module RailsAutoscale
 
     def reset
       # Allow the API URL to be configured - needed for testing.
-      @api_base_url = ENV["RAILS_AUTOSCALE_URL"] || ENV["JUDOSCALE_URL"]
-      @log_tag = ENV["JUDOSCALE_URL"] ? "Judoscale" : "RailsAutoscale"
+      @api_base_url = ENV["JUDOSCALE_URL"] || ENV["RAILS_AUTOSCALE_URL"]
+      @log_tag = "Judoscale"
       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["RAILS_AUTOSCALE_LOG_LEVEL"] || ENV["JUDOSCALE_LOG_LEVEL"]
+      self.log_level = ENV["JUDOSCALE_LOG_LEVEL"] || ENV["RAILS_AUTOSCALE_LOG_LEVEL"]
       @logger = ::Logger.new($stdout)
 
       self.class.adapter_configs.each(&:reset)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module RailsAutoscale
+module Judoscale
   class JobMetricsCollector
     module ActiveRecordHelper
       # Cleanup any whitespace characters (including new lines) from the SQL for simpler logging.
@@ -14,14 +14,18 @@ module RailsAutoscale
 
       private
 
-      def select_rows_silently(sql)
+      def run_silently(&block)
         if Config.instance.log_level && ::ActiveRecord::Base.logger.respond_to?(:silence)
-          ::ActiveRecord::Base.logger.silence(Config.instance.log_level) { select_rows_tagged(sql) }
+          ::ActiveRecord::Base.logger.silence(Config.instance.log_level) { yield }
         else
-          select_rows_tagged(sql)
+          yield
         end
       end
 
+      def select_rows_silently(sql)
+        run_silently { select_rows_tagged(sql) }
+      end
+
       def select_rows_tagged(sql)
         if ActiveRecord::Base.logger.respond_to?(:tagged)
           ActiveRecord::Base.logger.tagged(Config.instance.log_tag) { select_rows(sql) }

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

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

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require "rails_autoscale/config"
+require "judoscale/config"
 require "logger"
 
-module RailsAutoscale
+module Judoscale
   module Logger
     def logger
       @logger ||= LoggerProxy.new(Config.instance.logger, Config.instance.log_level)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module RailsAutoscale
+module Judoscale
   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/{rails_autoscale → judoscale}/metrics_collector.rb

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module RailsAutoscale
+module Judoscale
   class RequestMetrics
     attr_reader :request_id, :size, :network_time
 
@@ -18,11 +18,18 @@ module RailsAutoscale
 
     def started_at
       if @request_start_header
-        # Heroku sets the header as an integer, measured in milliseconds.
-        # If nginx is involved, it might be in seconds with fractional milliseconds,
-        # and it might be preceeded by "t=". We can all cases by removing non-digits
-        # and treating as milliseconds.
-        Time.at(@request_start_header.gsub(/\D/, "").to_i / 1000.0)
+        # There are several variants of this header. We handle these:
+        #   - whole milliseconds (Heroku)
+        #   - whole nanoseconds (Render)
+        #   - fractional seconds (NGINX)
+        #   - preceeding "t=" (NGINX)
+        value = @request_start_header.gsub(/[^0-9.]/, "").to_f
+
+        case value
+        when 0..100_000_000_000 then Time.at(value)
+        when 100_000_000_000..100_000_000_000_000 then Time.at(value / 1000.0)
+        else Time.at(value / 1_000_000.0)
+        end
       end
     end
 

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

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

data/lib/judoscale/version.rb

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

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

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

data/lib/judoscale-ruby.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require "judoscale/config"
+require "judoscale/version"
+
+module Judoscale
+  # Allows configuring Rails Autoscale through a block, usually defined during application initialization.
+  #
+  # Example:
+  #
+  #    Judoscale.configure do |config|
+  #      config.logger = MyLogger.new
+  #    end
+  def self.configure
+    yield Config.instance
+  end
+
+  @adapters = []
+  class << self
+    attr_reader :adapters
+  end
+
+  Adapter = Struct.new(:identifier, :adapter_info, :metrics_collector) do
+    def as_json
+      {identifier => adapter_info}
+    end
+  end
+
+  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
+
+  add_adapter :"judoscale-ruby", {
+    adapter_version: VERSION,
+    language_version: RUBY_VERSION
+  }
+end
+
+RailsAutoscale = Judoscale

data/lib/rails-autoscale-core.rb

@@ -1,40 +1,3 @@
 # frozen_string_literal: true
 
-require "rails_autoscale/config"
-require "rails_autoscale/version"
-
-module RailsAutoscale
-  # Allows configuring Rails Autoscale through a block, usually defined during application initialization.
-  #
-  # Example:
-  #
-  #    RailsAutoscale.configure do |config|
-  #      config.logger = MyLogger.new
-  #    end
-  def self.configure
-    yield Config.instance
-  end
-
-  @adapters = []
-  class << self
-    attr_reader :adapters
-  end
-
-  Adapter = Struct.new(:identifier, :adapter_info, :metrics_collector) do
-    def as_json
-      {identifier => adapter_info}
-    end
-  end
-
-  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
-
-  add_adapter :"rails-autoscale-core", {
-    adapter_version: VERSION,
-    language_version: RUBY_VERSION
-  }
-end
-
-Judoscale = RailsAutoscale
+require "judoscale-ruby"

data/rails-autoscale-core.gemspec

@@ -1,23 +1,23 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "rails_autoscale/version"
+require "judoscale/version"
 
 Gem::Specification.new do |spec|
   spec.name = "rails-autoscale-core"
-  spec.version = RailsAutoscale::VERSION
+  spec.version = Judoscale::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.summary = "This gem works with the Judoscale Heroku add-on to automatically scale your web and worker dynos."
+  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)/}) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-autoscale-core
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Adam McCrea
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-14 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -21,31 +21,33 @@ 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://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:
@@ -64,6 +66,6 @@ requirements: []
 rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
-summary: This gem works with the Rails Autoscale Heroku add-on to automatically scale
-  your web and worker dynos.
+summary: This gem works with the Judoscale Heroku add-on to automatically scale your
+  web and worker dynos.
 test_files: []

data/lib/rails_autoscale/version.rb

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