rails-autoscale-core 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a26698eaf5edca75ec2e8fd7bf1b5035f9b697c1a94fd81a062a9dfec80c636
-  data.tar.gz: 30476ecf0afa5774c3773c2b2abbd7c258ef1256fe3e0d086d44a6cca07b69ff
+  metadata.gz: 9577515e0476c286fa4733675f8814cfbdbbff2f1cfa8260ada7a7d58ad1e6d2
+  data.tar.gz: dbefa4da91b6369b437404c884b1720e4789621b0ed0fc1a3eb6d09f32fef955
 SHA512:
-  metadata.gz: ae8ddf51539fee0296c875b579dc7a01014fe2001393ea63c2c81da56e1ff008b154d51b60e0d86a42767908d030000d2441019a74380c48386742cb2e4f0e18
-  data.tar.gz: 5e75546db2c28f54781d03b9c791731408e45f21a5055cddfe03fac7625131f194a4873fb50bcc5bca194754e035b07b1e6c686bbd0b0d932e0419ca65ae511e
+  metadata.gz: a8338c11578ac27afd667a42b5cee2469ce7011007fefed9573dad3617d60f2b79c6d4c7b6347a38ba9ca739bda122647e105dd1b4b31f47127cdb06e64a5a7a
+  data.tar.gz: e05183812d63c61837229b76ce119df860316e2dc44d5817720c71b778852e65ab0db3e9f28a21b0f33ac6c40eae64a08e9e1de8803c894e504581e67973a320

data/Gemfile.lock

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

data/judoscale-ruby.gemspec

@@ -5,8 +5,8 @@ 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.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"]
+  spec.email = ["hello@judoscale.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"

data/lib/judoscale/adapter_api.rb

@@ -10,6 +10,13 @@ module Judoscale
     include Logger
 
     SUCCESS = "success"
+    TRANSIENT_ERRORS = [
+      Errno::ECONNREFUSED,
+      Errno::ECONNRESET,
+      Net::OpenTimeout,
+      Net::ReadTimeout,
+      OpenSSL::SSL::SSLError
+    ]
 
     def initialize(config)
       @config = config
@@ -43,14 +50,14 @@ module Judoscale
       when 200...300 then SuccessResponse.new(response.body)
       else FailureResponse.new([response.code, response.message].join(" - "))
       end
-    rescue Net::OpenTimeout
+    rescue *TRANSIENT_ERRORS => ex
       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}")
+        FailureResponse.new("Could not connect to #{uri.host}: #{ex.inspect}")
       end
     end
 

data/lib/judoscale/config.rb

@@ -5,16 +5,35 @@ require "logger"
 
 module Judoscale
   class Config
-    class Dyno
-      attr_reader :name, :num
-
-      def initialize(dyno_string)
-        @name, @num = dyno_string.to_s.split(".")
-        @num = @num.to_i
+    class RuntimeContainer
+      # E.g.:
+      # (Heroku) => "worker_fast", "3"
+      # (Render) => "srv-cfa1es5a49987h4vcvfg", "5497f74465-m5wwr", "web" (or "worker", "pserv", "cron", "static")
+      def initialize(service_name = nil, instance = nil, service_type = nil)
+        @service_name = service_name
+        @instance = instance
+        @service_type = service_type
       end
 
       def to_s
-        "#{name}.#{num}"
+        # heroku: 'worker_fast.5'
+        # render: 'srv-cfa1es5a49987h4vcvfg.5497f74465-m5wwr'
+        "#{@service_name}.#{@instance}"
+      end
+
+      def web?
+        # NOTE: Heroku isolates 'web' as the required _name_ for its web process
+        # type, Render exposes the actual service type more explicitly
+        @service_name == "web" || @service_type == "web"
+      end
+
+      # Since Heroku exposes ordinal dyno 'numbers', we can tell if the current
+      # instance is redundant (and thus skip collecting some metrics sometimes)
+      # We don't have a means of determining that on Render though — so every
+      # instance must be considered non-redundant
+      def redundant_instance?
+        instance_is_number = Integer(@instance, exception: false)
+        instance_is_number && instance_is_number != 1
       end
     end
 
@@ -66,28 +85,36 @@ module Judoscale
       end
     end
 
-    attr_accessor :api_base_url, :report_interval_seconds, :max_request_size_bytes, :logger, :log_tag
-    attr_reader :dyno, :log_level
+    attr_accessor :api_base_url, :report_interval_seconds,
+      :max_request_size_bytes, :logger, :log_tag, :current_runtime_container
+    attr_reader :log_level
 
     def initialize
       reset
     end
 
     def reset
-      # Allow the API URL to be configured - needed for testing.
       @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["JUDOSCALE_LOG_LEVEL"] || ENV["RAILS_AUTOSCALE_LOG_LEVEL"]
       @logger = ::Logger.new($stdout)
 
       self.class.adapter_configs.each(&:reset)
-    end
 
-    def dyno=(dyno_string)
-      @dyno = Dyno.new(dyno_string)
+      if ENV["RENDER_INSTANCE_ID"]
+        instance = ENV["RENDER_INSTANCE_ID"].delete_prefix(ENV["RENDER_SERVICE_ID"]).delete_prefix("-")
+        @current_runtime_container = RuntimeContainer.new ENV["RENDER_SERVICE_ID"], instance, ENV["RENDER_SERVICE_TYPE"]
+        @api_base_url ||= "https://adapter.judoscale.com/api/#{ENV["RENDER_SERVICE_ID"]}"
+      elsif ENV["DYNO"]
+        service_name, instance = ENV["DYNO"].split "."
+        @current_runtime_container = RuntimeContainer.new service_name, instance
+      else
+        # unsupported platform? Don't want to leave @current_runtime_container nil though
+        @current_runtime_container = RuntimeContainer.new
+      end
     end
 
     def log_level=(new_level)
@@ -105,10 +132,6 @@ module Judoscale
       }.merge!(adapter_configs_json)
     end
 
-    def to_s
-      "#{@dyno}##{Process.pid}"
-    end
-
     def ignore_large_requests?
       @max_request_size_bytes
     end

data/lib/judoscale/job_metrics_collector.rb

@@ -8,9 +8,8 @@ module Judoscale
   class JobMetricsCollector < MetricsCollector
     include Judoscale::Logger
 
-    # It's redundant to report these metrics from every dyno, so only report from the first one.
     def self.collect?(config)
-      config.dyno.num == 1 && adapter_config.enabled
+      !config.current_runtime_container.redundant_instance? && adapter_config.enabled
     end
 
     def self.adapter_name

data/lib/judoscale/report.rb

@@ -12,7 +12,7 @@ module Judoscale
 
     def as_json
       {
-        dyno: config.dyno,
+        container: config.current_runtime_container,
         pid: Process.pid,
         config: config.as_json,
         adapters: adapters.reduce({}) { |hash, adapter| hash.merge!(adapter.as_json) },

data/lib/judoscale/reporter.rb

@@ -31,7 +31,7 @@ module Judoscale
       metrics_collectors_classes.compact!
 
       if metrics_collectors_classes.empty?
-        logger.info "Reporter not started: no metrics need to be collected on this dyno"
+        logger.info "Reporter not started: no metrics need to be collected in this process"
         return
       end
 

data/lib/judoscale/request_metrics.rb

@@ -2,6 +2,10 @@
 
 module Judoscale
   class RequestMetrics
+    MILLISECONDS_CUTOFF = Time.new(2000, 1, 1).to_i * 1000
+    MICROSECONDS_CUTOFF = MILLISECONDS_CUTOFF * 1000
+    NANOSECONDS_CUTOFF = MICROSECONDS_CUTOFF * 1000
+
     attr_reader :request_id, :size, :network_time
 
     def initialize(env, config = Config.instance)
@@ -20,15 +24,23 @@ module Judoscale
       if @request_start_header
         # There are several variants of this header. We handle these:
         #   - whole milliseconds (Heroku)
+        #   - whole microseconds (???)
         #   - 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)
+        # `value` could be seconds, milliseconds, microseconds or nanoseconds.
+        # We use some arbitrary cutoffs to determine which one it is.
+
+        if value > NANOSECONDS_CUTOFF
+          Time.at(value / 1_000_000_000.0)
+        elsif value > MICROSECONDS_CUTOFF
+          Time.at(value / 1_000_000.0)
+        elsif value > MILLISECONDS_CUTOFF
+          Time.at(value / 1000.0)
+        else
+          Time.at(value)
         end
       end
     end

data/lib/judoscale/version.rb

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

data/lib/judoscale/web_metrics_collector.rb

@@ -5,8 +5,10 @@ require "judoscale/metrics_store"
 
 module Judoscale
   class WebMetricsCollector < MetricsCollector
+    # NOTE: We collect metrics on all running web processes since they
+    # all receive and handle requests independently
     def self.collect?(config)
-      config.dyno.name == "web"
+      config.current_runtime_container.web?
     end
 
     def collect

data/rails-autoscale-core.gemspec

@@ -5,8 +5,8 @@ require "judoscale/version"
 Gem::Specification.new do |spec|
   spec.name = "rails-autoscale-core"
   spec.version = Judoscale::VERSION
-  spec.authors = ["Adam McCrea", "Carlos Antonio da Silva"]
-  spec.email = ["adam@adamlogic.com"]
+  spec.authors = ["Adam McCrea", "Carlos Antonio da Silva", "Jon Sullivan"]
+  spec.email = ["hello@judoscale.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"

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rails-autoscale-core
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Adam McCrea
 - Carlos Antonio da Silva
+- Jon Sullivan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-09 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
-- adam@adamlogic.com
+- hello@judoscale.com
 executables: []
 extensions: []
 extra_rdoc_files: []