rails-autoscale-core 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9577515e0476c286fa4733675f8814cfbdbbff2f1cfa8260ada7a7d58ad1e6d2
-  data.tar.gz: dbefa4da91b6369b437404c884b1720e4789621b0ed0fc1a3eb6d09f32fef955
+  metadata.gz: 3a22cddac1042235674c4791e42efaefc877d395b1f30d1be5cd41eea9f305e8
+  data.tar.gz: 40881260d060de8799c14ce08142eb6e3d524bc5f91f36157d3a5e4879e32e47
 SHA512:
-  metadata.gz: a8338c11578ac27afd667a42b5cee2469ce7011007fefed9573dad3617d60f2b79c6d4c7b6347a38ba9ca739bda122647e105dd1b4b31f47127cdb06e64a5a7a
-  data.tar.gz: e05183812d63c61837229b76ce119df860316e2dc44d5817720c71b778852e65ab0db3e9f28a21b0f33ac6c40eae64a08e9e1de8803c894e504581e67973a320
+  metadata.gz: 8cc88cc9824d09c1b4066d02ebf0dd8c8af4605e3d2fa2949523248494064f3f70fdf25e151674b85b6a71b3badeb7a8ddeb93c4cf00cb2d74db136f53817d49
+  data.tar.gz: ab01d857a7a2b9c244cced61071ac265e2a07929cba1042108f01b40af9fba182f5817bd877ef727ff6c6123528a28a1170ce559495f4d9fb3bd4630efcabde0

data/Gemfile

@@ -3,7 +3,6 @@ source "https://rubygems.org"
 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:
-    judoscale-ruby (1.4.0)
+    judoscale-ruby (1.5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -20,8 +20,6 @@ GEM
     minitest (5.17.0)
     public_suffix (5.0.1)
     rake (13.0.6)
-    rake-release (1.3.0)
-      bundler (>= 1.11, < 3)
     reline (0.3.2)
       io-console (~> 0.5)
     rexml (3.2.5)
@@ -33,6 +31,7 @@ GEM
 PLATFORMS
   arm64-darwin-20
   arm64-darwin-21
+  arm64-darwin-22
   x86_64-darwin-21
   x86_64-linux
 
@@ -41,7 +40,6 @@ DEPENDENCIES
   judoscale-ruby!
   minitest
   rake (>= 12.3.3)
-  rake-release
   webmock
 
 BUNDLED WITH

data/Rakefile

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

data/lib/judoscale/config.rb

@@ -5,35 +5,14 @@ require "logger"
 
 module Judoscale
   class Config
-    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
-        # 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
-
+    class RuntimeContainer < String
       # 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
+        instance_number = split(".")[1].to_i
+        instance_number > 1
       end
     end
 
@@ -106,14 +85,15 @@ module Judoscale
 
       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"]
+        @current_runtime_container = RuntimeContainer.new instance
         @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
+        @current_runtime_container = RuntimeContainer.new ENV["DYNO"]
+      elsif (metadata_uri = ENV["ECS_CONTAINER_METADATA_URI"])
+        @current_runtime_container = RuntimeContainer.new(metadata_uri.split("/").last)
       else
         # unsupported platform? Don't want to leave @current_runtime_container nil though
-        @current_runtime_container = RuntimeContainer.new
+        @current_runtime_container = RuntimeContainer.new("")
       end
     end
 

data/lib/judoscale/job_metrics_collector/active_record_helper.rb

@@ -12,6 +12,12 @@ module Judoscale
         sql
       end
 
+      def self.table_exists?(table_name)
+        ::ActiveRecord::Base.connection.table_exists?(table_name)
+      rescue ActiveRecord::NoDatabaseError
+        false
+      end
+
       private
 
       def run_silently(&block)

data/lib/judoscale/reporter.rb

@@ -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.debug "Reporter not started: JUDOSCALE_URL is not set"
         return
       end
 
@@ -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 in this process"
+        logger.debug "Reporter not started: no metrics need to be collected in this process"
         return
       end
 

data/lib/judoscale/version.rb

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

data/lib/judoscale/web_metrics_collector.rb

@@ -5,12 +5,6 @@ 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.current_runtime_container.web?
-    end
-
     def collect
       MetricsStore.instance.flush
     end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rails-autoscale-core
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Adam McCrea
 - Carlos Antonio da Silva
 - Jon Sullivan
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-21 00:00:00.000000000 Z
+date: 2023-07-21 00:00:00.000000000 Z
 dependencies: []
-description:
+description: 
 email:
 - hello@judoscale.com
 executables: []
@@ -49,7 +49,7 @@ 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: 
 rdoc_options: []
 require_paths:
 - lib
@@ -64,8 +64,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: This gem works with the Judoscale Heroku add-on to automatically scale your
   web and worker dynos.