rails_autoscale_agent 0.9.0.beta.2 → 0.9.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 998351ab2e804fc443d63825d3a71255d6539f225ef791a4819391d735d29e51
-  data.tar.gz: 83df02c312d3fd2a1504c782b699c6ac5e26444145ff885ecff808ebf2a9cfc3
+  metadata.gz: 70253908c027308ec4d19c9b41eeed033759e6669eace3301925a65a64748447
+  data.tar.gz: 199e75a27f4708920b47964cbc75e2b705ddce88508c35fd614512bb9bfcfd5e
 SHA512:
-  metadata.gz: 6a34893873a4fc6b926e93d89002b3527f8adce615f97d1694753995df89666cfea3c37f55d435011edbe3e6c39928f835d7594c79cd310feb2267bfc1bbb1fa
-  data.tar.gz: 00b6943d706c93e1d93dc01259d6982618083b0d7359b212eb0187c26edac6f979a11c0c7a387671d60f80a6eb1ef13e74f5182b9f92b814dc01cd9d0f8c5b6b
+  metadata.gz: af5043f8402b40c15b5efe0be205e0e4c6107b8d05ea7126ccfa445c28679567c7e0f15e2a01eb2b7e107c95d3802543c48f428c31f70be823953173cd903ae1
+  data.tar.gz: 1fcfa15d0c76a8f1abf38653890d6b2157fd2e4edfc2ac072eb198897ab09029ea3f1c83ee11620e13a1a07a379695d7913c5bed89ce51e1907451367e61b1df

data/lib/rails_autoscale_agent/version.rb

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

data/lib/rails_autoscale_agent/worker_adapters/delayed_job.rb

@@ -8,6 +8,8 @@ module RailsAutoscaleAgent
       include RailsAutoscaleAgent::Logger
       include Singleton
 
+      UNNAMED_QUEUE = '[unnamed]'
+
       class << self
         attr_accessor :queues
       end
@@ -26,18 +28,20 @@ module RailsAutoscaleAgent
 
       def collect!(store)
         log_msg = String.new
-        t = Time.now
+        t = Time.now.utc
+        db_time = t.strftime('%Y-%m-%d %H:%M:%S')
 
         # 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'
+        sql = "SELECT queue, min(run_at) FROM delayed_jobs WHERE run_at < '#{db_time}' AND locked_at IS NULL AND failed_at IS NULL GROUP BY queue"
         run_at_by_queue = Hash[ActiveRecord::Base.connection.select_rows(sql)]
         queues = self.class.queues | run_at_by_queue.keys
 
         queues.each do |queue|
-          next if queue.nil? || queue.empty?
           run_at = run_at_by_queue[queue]
           run_at = Time.parse(run_at) if run_at.is_a?(String)
           latency_ms = run_at ? ((t - run_at)*1000).ceil : 0
+
+          queue = UNNAMED_QUEUE if queue.nil? || queue.empty?
           store.push latency_ms, t, queue
           log_msg << "dj.#{queue}=#{latency_ms} "
         end

data/lib/rails_autoscale_agent/worker_adapters/que.rb

@@ -9,6 +9,7 @@ module RailsAutoscaleAgent
       include RailsAutoscaleAgent::Logger
       include Singleton
 
+      UNNAMED_QUEUE = '[unnamed]'
       DEFAULT_QUEUES = ['default']
 
       class << self
@@ -33,10 +34,11 @@ module RailsAutoscaleAgent
         self.class.queues |= run_at_by_queue.keys
 
         self.class.queues.each do |queue|
-          next if queue.nil? || queue.empty?
           run_at = run_at_by_queue[queue]
           run_at = Time.parse(run_at) if run_at.is_a?(String)
           latency_ms = run_at ? ((t - run_at)*1000).ceil : 0
+
+          queue = UNNAMED_QUEUE if queue.nil? || queue.empty?
           store.push latency_ms, t, queue
           log_msg << "que.#{queue}=#{latency_ms} "
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_autoscale_agent
 version: !ruby/object:Gem::Version
-  version: 0.9.0.beta.2
+  version: 0.9.0.beta.4
 platform: ruby
 authors:
 - Adam McCrea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: This gem works with the Rails Autoscale Heroku add-on to automatically scale