judoscale-ruby 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5ca5d8a39c5ebac4175cf82ee527e731b3d2ca749b54ad39c1fb7901cabbc16
-  data.tar.gz: 3b33a3243e86bafbbe2f4c492a426ef12c45d46b14a34953e4fd4785a5884c9d
+  metadata.gz: a766d2886f2a830ffbb2f0e78ccf6a57340ad6bdc2a4321cba543c0a96eebc1c
+  data.tar.gz: 2ef0b540e8bb96756f3f4073f14a17617bf5059cdfc4ce79cc30e32e1ca745c4
 SHA512:
-  metadata.gz: 4fcb9704f24d532eda30e5c464428ae52bcdc1d41627da9c1d3408d9a04e099206c74d90c45456c676f33661805fa469cfa250313fbde9fce9fae6a2897ae75e
-  data.tar.gz: f7a8c075e63febeb03473ddeb4f3c6601916ff4208bfd5d5cf69f90056291d9fea7d2d3b7cc6fbadb6ce0db43958a751f6ad1f7fefd4f596c5ae38b208199567
+  metadata.gz: 4d626022cf870df05d6e3c858f8f2099f87b8f4012d6fcc00a5da751a28536cd5b9417154ab2158cfd8107707634be78d681c732c84f42f4fab4a1fc2d78bc1d
+  data.tar.gz: dc9a0959de8f65fe02547b7b1334d60bc4e28905b4942a3e6e07f2495059ddc773612f48c72d6d6f59302b73a1b52b8037f4053f4b508b7af5de316ee1970815

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    judoscale-ruby (1.4.1)
+    judoscale-ruby (1.5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -31,6 +31,7 @@ GEM
 PLATFORMS
   arm64-darwin-20
   arm64-darwin-21
+  arm64-darwin-22
   x86_64-darwin-21
   x86_64-linux
 

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Judoscale
-  VERSION = "1.4.1"
+  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: judoscale-ruby
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Adam McCrea
 - Carlos Antonio da Silva
 - Jon Sullivan
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-04 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.