rails_autoscale_agent 0.9.0.beta.1 → 0.9.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37ecb709c866b3d831f79d8a15bd54cfcacfd00dc45ebf84ad5129c0d1206a3d
-  data.tar.gz: 373474c8d84bb5cbd026f792aef4eef4028d77b666d74ac4407cd7d4c603703d
+  metadata.gz: 998351ab2e804fc443d63825d3a71255d6539f225ef791a4819391d735d29e51
+  data.tar.gz: 83df02c312d3fd2a1504c782b699c6ac5e26444145ff885ecff808ebf2a9cfc3
 SHA512:
-  metadata.gz: cbe7b97077c907d45deba6cfa0dce814e8d5fff2339cdf8c81c7e96101d0e3cd8a1dcbcdd3474bcb8fe798ec7591f59b040a8e40d367fa11b32c4dbd6ead52f1
-  data.tar.gz: 2677393fb16bb0fb776c2325838074ed3c0c9c4d990d296e950ad83576456ac66b15765a96e84a1fefe26ff6696ca89e419e23db78a644e01054378c7dbf3cd1
+  metadata.gz: 6a34893873a4fc6b926e93d89002b3527f8adce615f97d1694753995df89666cfea3c37f55d435011edbe3e6c39928f835d7594c79cd310feb2267bfc1bbb1fa
+  data.tar.gz: 00b6943d706c93e1d93dc01259d6982618083b0d7359b212eb0187c26edac6f979a11c0c7a387671d60f80a6eb1ef13e74f5182b9f92b814dc01cd9d0f8c5b6b

data/lib/rails_autoscale_agent/autoscale_api.rb

@@ -24,6 +24,10 @@ module RailsAutoscaleAgent
       post_json '/registrations', registration: registration_params
     end
 
+    def report_exception!(ex)
+      post_json '/exceptions', message: ex.inspect, backtrace: ex.backtrace.join("\n")
+    end
+
     private
 
     def post_json(path, data)

data/lib/rails_autoscale_agent/reporter.rb

@@ -41,7 +41,7 @@ module RailsAutoscaleAgent
             # Exceptions in threads other than the main thread will fail silently
             # https://ruby-doc.org/core-2.2.0/Thread.html#class-Thread-label-Exception+handling
             logger.error "Reporter error: #{ex.inspect}"
-            logger.error ex.backtrace.join("\n")
+            AutoscaleApi.new(config.api_base_url).report_exception!(ex)
           end
         end
       end

data/lib/rails_autoscale_agent/request.rb

@@ -4,20 +4,17 @@ module RailsAutoscaleAgent
   class Request
     include Logger
 
-    attr_reader :id, :entered_queue_at, :path, :method, :size
-
     def initialize(env, config)
       @config = config
       @id = env['HTTP_X_REQUEST_ID']
-      @path = env['PATH_INFO']
-      @method = env['REQUEST_METHOD'].downcase
       @size = env['rack.input'].respond_to?(:size) ? env['rack.input'].size : 0
+      @request_body_wait = env['puma.request_body_wait'].to_i
 
       @entered_queue_at = if unix_millis = env['HTTP_X_REQUEST_START']
         Time.at(unix_millis.to_f / 1000)
       elsif config.dev_mode?
         # In dev mode, fake a queue time of 0-1000ms
-        Time.now - rand
+        Time.now - rand + @request_body_wait
       end
     end
 
@@ -26,12 +23,17 @@ module RailsAutoscaleAgent
     end
 
     def queue_time
-      if entered_queue_at
-        queue_time = ((Time.now - entered_queue_at) * 1000).to_i
-        queue_time = 0 if queue_time < 0
-        logger.debug "Collected queue_time=#{queue_time}ms request_id=#{id} request_size=#{size}"
+      if @entered_queue_at
+        queue_time = ((Time.now - @entered_queue_at) * 1000).to_i
+
+        # Subtract the time Puma spent waiting on the request body. It's irrelevant to capacity-related queue time.
+        # Without this, slow clients and large request payloads will skew queue time.
+        queue_time -= @request_body_wait
+
+        logger.debug "Request queue_time=#{queue_time}ms body_wait=#{@request_body_wait}ms request_id=#{@id} size=#{@size}"
 
-        queue_time
+        # Safeguard against negative queue times (should not happen in practice)
+        queue_time > 0 ? queue_time : 0
       end
     end
   end

data/lib/rails_autoscale_agent/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsAutoscaleAgent
-  VERSION = "0.9.0.beta.1"
+  VERSION = "0.9.0.beta.2"
 end

data/lib/rails_autoscale_agent/worker_adapters/delayed_job.rb

@@ -28,7 +28,8 @@ module RailsAutoscaleAgent
         log_msg = String.new
         t = Time.now
 
-        sql = 'SELECT queue, min(run_at) FROM delayed_jobs GROUP BY queue'
+        # Ignore failed jobs (they skew latency measurement due to the original run_at)
+        sql = 'SELECT queue, min(run_at) FROM delayed_jobs WHERE attempts = 0 GROUP BY queue'
         run_at_by_queue = Hash[ActiveRecord::Base.connection.select_rows(sql)]
         queues = self.class.queues | run_at_by_queue.keys
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_autoscale_agent
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta.1
+  version: 0.9.0.beta.2
 platform: ruby
 authors:
 - Adam McCrea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler