judoscale-ruby 1.13.2 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e31c011abdc246927a3708a982069e0709d12d8b8a46d9c4b2c5cbc25f440ea2
-  data.tar.gz: 8f0d36db33954653851d9919e5061b947238a39181103754cc81281147d39fc2
+  metadata.gz: 6caa0ab33b7a1b3619b550e988eac92727046cf876aabcd3cb9a6c936c13a44c
+  data.tar.gz: bb5928ffa44bd5c2becf32672f310ec128eb90d20fed6dee870cae5d37113d4e
 SHA512:
-  metadata.gz: 619b623a687755a189cfba56296ab2060fd65befffa1c665fbcad4a91be96626506f3ebf9ca831b016349c3ac03ecee3fd28edd54f05542ad47197e8b1685b1d
-  data.tar.gz: 0d901557ad3122cf36392c18a665e518277db83beb06c2fec834da5aa38c41cbbfbc3d5aa1f8c7cbb4f907127f4a977f67963456092fb0e712b4628f1fae4299
+  metadata.gz: 836a7c518ea2c42148c2698a847fe1b3a5c7cb48131f06c0686fa764ce590010a517ae1dc4934cd2017a9d9c4097416487965e068320c15426ffe6dc58d0e9da
+  data.tar.gz: 7152b6fbf6a409307363516da0635c540d16e2f52b489c8e259ec3a3b60994c70340ae6aa75e6cfa68c678a95ee0a961517506aad768a037f0cefcc4950fa933

data/lib/judoscale/adapter_api.rb

@@ -9,7 +9,7 @@ module Judoscale
   class AdapterApi
     include Logger
 
-    SUCCESS = "success"
+    MAX_RETRIES = 3
     TRANSIENT_ERRORS = [
       Errno::ECONNREFUSED,
       Errno::ECONNRESET,
@@ -51,7 +51,7 @@ module Judoscale
       else FailureResponse.new([response.code, response.message].join(" - "))
       end
     rescue *TRANSIENT_ERRORS => ex
-      if attempts < 3
+      if attempts < MAX_RETRIES
         # TCP timeouts happen sometimes, but they can usually be successfully retried in a moment
         sleep 0.25 * (2**(attempts - 1))
         attempts += 1

data/lib/judoscale/config.rb

@@ -6,13 +6,14 @@ require "logger"
 module Judoscale
   class Config
     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
+      # Job metrics are collected from a single container per process type when we
+      # can identify the ordinal instance (Heroku "web.2", Scalingo "web-2").
+      # Opaque IDs (Render, ECS, Railway, etc.) are always non-redundant.
+      ORDINAL_CONTAINER = /\A[a-z_]+[.-](\d{1,3})\z/
+
       def redundant_instance?
-        instance_number = split(".")[1].to_i
-        instance_number > 1
+        match = match(ORDINAL_CONTAINER)
+        match ? match[1].to_i > 1 : false
       end
     end
 
@@ -125,6 +126,9 @@ module Judoscale
           RuntimeContainer.new ENV["FLY_MACHINE_ID"]
         elsif ENV.include?("RAILWAY_REPLICA_ID")
           RuntimeContainer.new ENV["RAILWAY_REPLICA_ID"]
+        elsif ENV.include?("CONTAINER")
+          # Scalingo exposes the container type and index (e.g. "web-1") via CONTAINER.
+          RuntimeContainer.new ENV["CONTAINER"]
         else
           # Unsupported platform...
           RuntimeContainer.new("")

data/lib/judoscale/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judoscale-ruby
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.13.3
 platform: ruby
 authors:
 - Adam McCrea