rails-autoscale-core 1.2.3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964dfef811345b3e60c86525ccf5cfa2ea6f8711e6e5a6361cfd61006421be06
-  data.tar.gz: eceabb91c0e13477bbe68371a0233b6bfa111e5a5048179f2484a37b54da026c
+  metadata.gz: 36c26aeba2eb5413f339a8c1c756632a4299b7c397a05cfbea325c01ee562c28
+  data.tar.gz: '039d32858527abd7b01b804491ed0296b19c77c91216cd7d5eec35b3ad90edf8'
 SHA512:
-  metadata.gz: a7b350c828704f4b4a7aec702e85e03bb49066516a198c4c94f4b1bfc5d8da70fc006ca437a7d0abf5511e24996e168850ffc2c271a0ac72386d41952f8c3e37
-  data.tar.gz: ae5f5739a1b7bdf62ba808dc27ebdcc3fc9208586d61dc12b181d1fcdc9a31b1090774560b43eabf283c74cd2c9d325366be5739bbb8794dcca5fc134afdec91
+  metadata.gz: dbefb2b2c8f48a7ffd4e6b4b2a51cf4b54c545fae1c5db55d9dff45b3e33338ee34507f2950d7ab7e1a60ba0606957f6b87ec1ccffeaae812a723a2fd9603d98
+  data.tar.gz: f2e0ae3ffd1af3b4afd841b73e3dc17128ee7937a3b5e56a6a20264c1b63b62bf5ea31593458f8595a083990f313402c524c8017b49695ffa3a21bfd4bc70bad

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    judoscale-ruby (1.2.3)
+    judoscale-ruby (1.3.1)
 
 GEM
   remote: https://rubygems.org/
@@ -10,19 +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)
     rake-release (1.3.0)
       bundler (>= 1.11, < 3)
-    reline (0.3.1)
+    reline (0.3.2)
       io-console (~> 0.5)
     rexml (3.2.5)
     webmock (3.18.1)

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/job_metrics_collector/active_record_helper.rb

@@ -14,14 +14,18 @@ module Judoscale
 
       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/judoscale/request_metrics.rb

@@ -18,11 +18,18 @@ module Judoscale
 
     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/judoscale/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-autoscale-core
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.1
 platform: ruby
 authors:
 - Adam McCrea
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-26 00:00:00.000000000 Z
+date: 2023-03-11 00:00:00.000000000 Z
 dependencies: []
 description:
 email: