rails_autoscale_agent 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3924fc840320be8327c183e1cb54055d8516d2fefee1cffbfa7092da39b05985
-  data.tar.gz: abd81e6c4c2dc3a65be7c426dda8742ec92b7c29c47a71eeb2566731436ce4e6
+  metadata.gz: cd7ffb8cd27de3a23d5e76bd9a9c7768ce1fd397389291285022523fb398ee45
+  data.tar.gz: d8cf3fa7ab2994ef196742fe872170c069dc6f14bc0490b595ff175e48ce59e6
 SHA512:
-  metadata.gz: 4867868c9e9e707d9e4afe46f20d19f600a87b26aabf5a96f4ad8ff91698d00b08f8a0566ef20fe8f3f1c036c9220b1034a92c70280a4cf29a6d5b5a728b4105
-  data.tar.gz: e2fbbc4afa90c0c636dddb3172d1164108e984f4c550739df552cd185a8a51d7255ff354debc658ecfa893fb4f87f53e6c298bfe4dddf2aa35615f7636e64420
+  metadata.gz: '0976e83784dd6a622b18a67491e727cbe9f0fb1a54e1974f50b61f441f642a296b5a4e3349e2f4d292acc35c844765527c16e097cf7ac914a7224b68e2ae8bd6'
+  data.tar.gz: 2de7d8a61d44fd408cfbab88b1be37327bd5836da8c125f4c61f80ac7503c0a44c5ee5f893919eb5487e4a34a817102a68aabd76699d34d6ce3086680b8aceb7

data/.vscode/tasks.json

@@ -6,7 +6,8 @@
     {
       "label": "test: all",
       "group": "test",
-      "command": "rspec",
+      "command": "bundle",
+      "args": ["exec", "rspec"],
       "runOptions": {
         "reevaluateOnRerun": false
       },
@@ -31,8 +32,8 @@
     {
       "label": "test: file",
       "group": "test",
-      "command": "rspec",
-      "args": ["${relativeFile}"],
+      "command": "bundle",
+      "args": ["exec", "rspec", "${relativeFile}"],
       "runOptions": {
         "reevaluateOnRerun": false
       },
@@ -57,8 +58,8 @@
     {
       "label": "test: line",
       "group": "test",
-      "command": "rspec",
-      "args": ["${relativeFile}:${lineNumber}"],
+      "command": "bundle",
+      "args": ["exec", "rspec", "${relativeFile}:${lineNumber}"],
       "runOptions": {
         "reevaluateOnRerun": false
       },

data/Gemfile

@@ -1,4 +1,16 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in rails_autoscale_agent.gemspec
 gemspec
+
+gem "rake", ">= 12.3.3"
+gem "rspec", ">= 3.0"
+gem "vcr", ">= 3.0"
+gem "webmock"
+gem "pry-byebug"
+gem "sidekiq", ">= 5.0"
+gem "delayed_job"
+gem "delayed_job_active_record"
+gem "que"
+gem "resque"
+gem "activesupport"
+gem "sqlite3", platforms: :ruby

data/README.md

@@ -24,16 +24,6 @@ The agent will only communicate with Rails Autoscale if a `RAILS_AUTOSCALE_URL`
 
 You'll need to insert the `RailsAutoscaleAgent::Middleware` manually. Insert it before `Rack::Runtime` to ensure accuracy of request queue timings.
 
-## Changing the logger
-
-The Rails logger is used by default.
-If you wish to use a different logger you can set it on the configuration object:
-
-```ruby
-# config/initializers/rails_autoscale_agent.rb
-RailsAutoscaleAgent::Config.instance.logger = MyLogger.new
-```
-
 ## What data is collected?
 
 The middleware agent runs in its own thread so your web requests are not impacted. The following data is submitted periodically to the Rails Autoscale API:
@@ -59,22 +49,44 @@ In production, run `heroku logs -t | grep RailsAutoscale`, and you should see so
 
 If you don't see either of these, try running `bundle` again and restarting your Rails application.
 
-You can see more detailed (debug) logging by setting the `RAILS_AUTOSCALE_DEBUG` env var on your Heroku app:
+You can see more detailed (debug) logging by setting `RAILS_AUTOSCALE_DEBUG` on your Heroku app:
 
 ```
 heroku config:add RAILS_AUTOSCALE_DEBUG=true
 ```
 
-Debug logs are silenced by default because Rails apps default to a DEBUG log level in production,
-and these can get very noisy with this gem.
+See more in the [logging](#logging) section below.
 
 Reach out to help@railsautoscale.com if you run into any other problems.
 
+## Logging
+
+The Rails logger is used by default.
+If you wish to use a different logger you can set it on the configuration object:
+
+```ruby
+# config/initializers/rails_autoscale_agent.rb
+RailsAutoscaleAgent::Config.instance.logger = MyLogger.new
+```
+
+Debug logs are silenced by default because Rails apps default to a DEBUG log level in production, and this gem has _very_ chatty debug logs. If you want to see the debug logs, set `RAILS_AUTOSCALE_DEBUG` on your Heroku app:
+
+```
+heroku config:add RAILS_AUTOSCALE_DEBUG=true
+```
+
+If you find the gem too chatty even without this, you can quiet it down further:
+
+```ruby
+# config/initializers/rails_autoscale_agent.rb
+RailsAutoscaleAgent::Config.instance.quiet = true
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, commit it, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/lib/rails_autoscale_agent/autoscale_api.rb

@@ -11,8 +11,8 @@ module RailsAutoscaleAgent
 
     SUCCESS = 'success'
 
-    def initialize(api_url_base)
-      @api_url_base = api_url_base
+    def initialize(config)
+      @config = config
     end
 
     def report_metrics!(report_params, timings_csv)
@@ -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)
@@ -37,9 +41,14 @@ module RailsAutoscaleAgent
     end
 
     def post_raw(options)
-      uri = URI.parse("#{@api_url_base}#{options.fetch(:path)}")
+      uri = URI.parse("#{@config.api_base_url}#{options.fetch(:path)}")
       ssl = uri.scheme == 'https'
 
+      if @config.dev_mode
+        logger.debug "[DEV_MODE] Skipping request to #{uri}"
+        return SuccessResponse.new('{}')
+      end
+
       response = Net::HTTP.start(uri.host, uri.port, use_ssl: ssl) do |http|
         request = Net::HTTP::Post.new(uri.request_uri, options[:headers] || {})
         request.body = options.fetch(:body)

data/lib/rails_autoscale_agent/config.rb

@@ -7,26 +7,30 @@ module RailsAutoscaleAgent
     include Singleton
 
     attr_accessor :report_interval, :logger, :api_base_url, :max_request_size,
-                  :dyno, :pid, :addon_name, :worker_adapters
+                  :dyno, :pid, :addon_name, :worker_adapters, :dev_mode, :debug, :quiet
 
     def initialize
       require 'rails_autoscale_agent/worker_adapters/sidekiq'
       require 'rails_autoscale_agent/worker_adapters/delayed_job'
       require 'rails_autoscale_agent/worker_adapters/que'
+      require 'rails_autoscale_agent/worker_adapters/resque'
       @worker_adapters = [
         WorkerAdapters::Sidekiq.instance,
         WorkerAdapters::DelayedJob.instance,
         WorkerAdapters::Que.instance,
+        WorkerAdapters::Resque.instance,
       ]
 
       # Allow the add-on name to be configured - needed for testing
       @addon_name = ENV['RAILS_AUTOSCALE_ADDON'] || 'RAILS_AUTOSCALE'
       @api_base_url = ENV["#{@addon_name}_URL"]
+      @dev_mode = ENV['RAILS_AUTOSCALE_DEV'] == 'true'
+      @debug = dev_mode? || ENV['RAILS_AUTOSCALE_DEBUG'] == 'true'
       @pid = Process.pid
       @max_request_size = 100_000 # ignore request payloads over 100k since they skew the queue times
-      @report_interval = 60 # this default will be overwritten during Reporter#register!
+      @report_interval = 10 # this default will be overwritten during Reporter#register!
       @logger ||= defined?(Rails) ? Rails.logger : ::Logger.new(STDOUT)
-      @dyno = ENV['DYNO']
+      @dyno = dev_mode? ? 'dev.1' : ENV['DYNO']
     end
 
     def to_s
@@ -37,5 +41,8 @@ module RailsAutoscaleAgent
       @max_request_size
     end
 
+    alias_method :dev_mode?, :dev_mode
+    alias_method :debug?, :debug
+    alias_method :quiet?, :quiet
   end
 end

data/lib/rails_autoscale_agent/logger.rb

@@ -13,26 +13,33 @@ module RailsAutoscaleAgent
   class LoggerProxy < Struct.new(:logger)
     TAG = '[RailsAutoscale]'
 
-    %w[info warn error].each do |name|
-      define_method name do |msg|
-        logger.send name, tag(msg)
-      end
+    def error(msg)
+      logger.error tag(msg)
+    end
+
+    def warn(msg)
+      logger.warn tag(msg)
+    end
+
+    def info(msg)
+      logger.info tag(msg) unless Config.instance.quiet?
     end
 
     def debug(msg)
       # Silence debug logs by default to avoiding being overly chatty (Rails logger defaults
-      # to DEBUG level in production).
-      # This uses a separate logger so that RAILS_AUTOSCALE_DEBUG
-      # shows debug logs regardless of Rails log level.
-      debug_logger.debug tag(msg) if ENV['RAILS_AUTOSCALE_DEBUG'] == 'true'
+      # to DEBUG level in production). Setting RAILS_AUTOSCALE_DEBUG=true enables debug logs,
+      # even if the underlying logger severity level is INFO.
+      if Config.instance.debug?
+        if logger.respond_to?(:debug?) && logger.debug?
+          logger.debug tag(msg)
+        elsif logger.respond_to?(:info?) && logger.info?
+          logger.info tag("[DEBUG] #{msg}")
+        end
+      end
     end
 
     private
 
-    def debug_logger
-      @debug_loggers ||= ::Logger.new(STDOUT)
-    end
-
     def tag(msg)
       "#{TAG} #{msg}"
     end

data/lib/rails_autoscale_agent/measurement.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 module RailsAutoscaleAgent
-  class Measurement < Struct.new(:time, :value, :queue_name)
-    def initialize(time, value, queue_name = nil)
-      super time.utc, value.to_i, queue_name
+  class Measurement < Struct.new(:time, :value, :queue_name, :metric)
+    # No queue_name is assumed to be a web request measurement
+    # Metrics: qt = queue time (default), qd = queue depth (needed for Resque support)
+    def initialize(time, value, queue_name = nil, metric = nil)
+      super time.utc, value.to_i, queue_name, metric
     end
   end
 end

data/lib/rails_autoscale_agent/registration.rb

@@ -3,7 +3,7 @@
 require 'rails_autoscale_agent/version'
 
 module RailsAutoscaleAgent
-  class Registration < Struct.new(:config)
+  class Registration < Struct.new(:config, :worker_adapters)
 
     def to_params
       {
@@ -12,6 +12,8 @@ module RailsAutoscaleAgent
         ruby_version: RUBY_VERSION,
         rails_version: defined?(Rails) && Rails.version,
         gem_version: VERSION,
+        # example: { worker_adapters: 'Sidekiq,Que' }
+        worker_adapters: worker_adapters.map { |o| o.class.name.split('::').last }.join(','),
       }
     end
   end

data/lib/rails_autoscale_agent/report.rb

@@ -19,14 +19,12 @@ module RailsAutoscaleAgent
     def to_csv
       String.new.tap do |result|
         @measurements.each do |measurement|
-          result << measurement.time.to_i.to_s
-          result << ','
-          result << measurement.value.to_s
-
-          if measurement.queue_name
-            result << ','
-            result << measurement.queue_name
-          end
+          result << [
+            measurement.time.to_i,
+            measurement.value,
+            measurement.queue_name,
+            measurement.metric,
+          ].join(',')
 
           result << "\n"
         end

data/lib/rails_autoscale_agent/reporter.rb

@@ -21,14 +21,14 @@ module RailsAutoscaleAgent
       @started = true
       @worker_adapters = config.worker_adapters.select(&:enabled?)
 
-      if !config.api_base_url
+      if !config.api_base_url && !config.dev_mode?
         logger.info "Reporter not started: #{config.addon_name}_URL is not set"
         return
       end
 
       Thread.new do
         loop do
-          register!(config) unless @registered
+          register!(config, @worker_adapters) unless @registered
 
           # Stagger reporting to spread out reports from many processes
           multiplier = 1 - (rand / 4) # between 0.75 and 1.0
@@ -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
@@ -58,7 +58,7 @@ module RailsAutoscaleAgent
         logger.info "Reporting #{report.measurements.size} measurements"
 
         params = report.to_params(config)
-        result = AutoscaleApi.new(config.api_base_url).report_metrics!(params, report.to_csv)
+        result = AutoscaleApi.new(config).report_metrics!(params, report.to_csv)
 
         case result
         when AutoscaleApi::SuccessResponse
@@ -71,16 +71,16 @@ module RailsAutoscaleAgent
       end
     end
 
-    def register!(config)
-      params = Registration.new(config).to_params
-      result = AutoscaleApi.new(config.api_base_url).register_reporter!(params)
+    def register!(config, worker_adapters)
+      params = Registration.new(config, worker_adapters).to_params
+      result = AutoscaleApi.new(config).register_reporter!(params)
 
       case result
       when AutoscaleApi::SuccessResponse
         @registered = true
         config.report_interval = result.data['report_interval'] if result.data['report_interval']
         config.max_request_size = result.data['max_request_size'] if result.data['max_request_size']
-        worker_adapters_msg = @worker_adapters.map { |a| a.class.name }.join(', ')
+        worker_adapters_msg = worker_adapters.map { |a| a.class.name }.join(', ')
         logger.info "Reporter starting, will report every #{config.report_interval} seconds or so. Worker adapters: [#{worker_adapters_msg}]"
       when AutoscaleApi::FailureResponse
         logger.error "Reporter failed to register: #{result.failure_message}"

data/lib/rails_autoscale_agent/request.rb

@@ -4,17 +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
 
-      if unix_millis = env['HTTP_X_REQUEST_START']
-        @entered_queue_at = Time.at(unix_millis.to_f / 1000)
+      @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 + @request_body_wait
       end
     end
 
@@ -23,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/store.rb

@@ -15,8 +15,8 @@ module RailsAutoscaleAgent
       @measurements = []
     end
 
-    def push(value, time = Time.now, queue_name = nil)
-      @measurements << Measurement.new(time, value, queue_name)
+    def push(value, time = Time.now, queue_name = nil, metric = nil)
+      @measurements << Measurement.new(time, value, queue_name, metric)
     end
 
     def pop_report

data/lib/rails_autoscale_agent/version.rb

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

data/lib/rails_autoscale_agent/worker_adapters/delayed_job.rb

@@ -2,63 +2,56 @@
 
 require 'rails_autoscale_agent/logger'
 
-module WorkerAdapters
-  class DelayedJob
-    include RailsAutoscaleAgent::Logger
-    include Singleton
-
-    class << self
-      attr_accessor :queues
-    end
-
-    def initialize
-      # Track the known queues so we can continue reporting on queues that don't
-      # currently have enqueued jobs.
-      self.class.queues = Set.new
-
-      install if enabled?
-    end
-
-    def enabled?
-      defined? ::Delayed
-    end
-
-    def collect!(store)
-      log_msg = String.new('DelayedJob latency ')
-      t = Time.now
-
-      # 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
-
-      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
-        store.push latency_ms, t, queue
-        log_msg << "#{queue}=#{latency_ms} "
+module RailsAutoscaleAgent
+  module WorkerAdapters
+    class DelayedJob
+      include RailsAutoscaleAgent::Logger
+      include Singleton
+
+      attr_writer :queues
+
+      def queues
+        # Track the known queues so we can continue reporting on queues that don't
+        # have enqueued jobs at the time of reporting.
+        # Assume a "default" queue so we always report *something*, even when nothing
+        # is enqueued.
+        @queues ||= Set.new(['default'])
       end
 
-      logger.debug log_msg
-    end
-
-    private
-
-    def install
-      plugin = Class.new(Delayed::Plugin) do
-        require 'delayed_job'
-
-        callbacks do |lifecycle|
-          lifecycle.before(:enqueue) do |job, &block|
-            queue = job.queue || 'default'
-            WorkerAdapters::DelayedJob.queues.add queue
-          end
+      def enabled?
+        if defined?(::Delayed::Job) && defined?(::Delayed::Backend::ActiveRecord)
+          logger.info "DelayedJob enabled (#{::ActiveRecord::Base.default_timezone})"
+          true
         end
       end
 
-      Delayed::Worker.plugins << plugin
+      def collect!(store)
+        log_msg = String.new
+        t = Time.now.utc
+        sql = <<~SQL
+          SELECT COALESCE(queue, 'default'), min(run_at)
+          FROM delayed_jobs
+          WHERE locked_at IS NULL
+          AND failed_at IS NULL
+          GROUP BY queue
+        SQL
+
+        run_at_by_queue = Hash[ActiveRecord::Base.connection.select_rows(sql)]
+        self.queues |= run_at_by_queue.keys
+
+        queues.each do |queue|
+          run_at = run_at_by_queue[queue]
+          # DateTime.parse assumes a UTC string
+          run_at = DateTime.parse(run_at) if run_at.is_a?(String)
+          latency_ms = run_at ? ((t - run_at)*1000).ceil : 0
+          latency_ms = 0 if latency_ms < 0
+
+          store.push latency_ms, t, queue
+          log_msg << "dj.#{queue}=#{latency_ms} "
+        end
+
+        logger.debug log_msg unless log_msg.empty?
+      end
     end
   end
 end

data/lib/rails_autoscale_agent/worker_adapters/que.rb

@@ -1,46 +1,57 @@
 # frozen_string_literal: true
 
 require 'rails_autoscale_agent/logger'
-require 'time'
 
-module WorkerAdapters
-  class Que
-    include RailsAutoscaleAgent::Logger
-    include Singleton
+module RailsAutoscaleAgent
+  module WorkerAdapters
+    class Que
+      include RailsAutoscaleAgent::Logger
+      include Singleton
 
-    DEFAULT_QUEUES = ['default']
+      attr_writer :queues
 
-    class << self
-      attr_accessor :queues
-    end
-
-    def initialize
-      self.class.queues = DEFAULT_QUEUES
-    end
-
-    def enabled?
-      defined? ::Que
-    end
+      def queues
+        # Track the known queues so we can continue reporting on queues that don't
+        # have enqueued jobs at the time of reporting.
+        # Assume a "default" queue so we always report *something*, even when nothing
+        # is enqueued.
+        @queues ||= Set.new(['default'])
+      end
 
-    def collect!(store)
-      log_msg = String.new('Que latency ')
-      t = Time.now
-
-      # Ignore failed jobs (they skew latency measurement due to the original run_at)
-      sql = 'SELECT queue, min(run_at) FROM que_jobs WHERE error_count = 0 GROUP BY queue'
-      run_at_by_queue = Hash[ActiveRecord::Base.connection.select_rows(sql)]
-      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
-        store.push latency_ms, t, queue
-        log_msg << "#{queue}=#{latency_ms} "
+      def enabled?
+        if defined?(::Que)
+          logger.info "Que enabled (#{::ActiveRecord::Base.default_timezone})"
+          true
+        end
       end
 
-      logger.debug log_msg
+      def collect!(store)
+        log_msg = String.new
+        t = Time.now.utc
+        sql = <<~SQL
+          SELECT queue, min(run_at)
+          FROM que_jobs
+          WHERE finished_at IS NULL
+          AND expired_at IS NULL
+          AND error_count = 0
+          GROUP BY 1
+        SQL
+
+        run_at_by_queue = Hash[ActiveRecord::Base.connection.select_rows(sql)]
+        self.queues |= run_at_by_queue.keys
+
+        queues.each do |queue|
+          run_at = run_at_by_queue[queue]
+          run_at = DateTime.parse(run_at) if run_at.is_a?(String)
+          latency_ms = run_at ? ((t - run_at)*1000).ceil : 0
+          latency_ms = 0 if latency_ms < 0
+
+          store.push latency_ms, t, queue
+          log_msg << "que.#{queue}=#{latency_ms} "
+        end
+
+        logger.debug log_msg unless log_msg.empty?
+      end
     end
   end
 end

data/lib/rails_autoscale_agent/worker_adapters/resque.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'rails_autoscale_agent/logger'
+
+module RailsAutoscaleAgent
+  module WorkerAdapters
+    class Resque
+      include RailsAutoscaleAgent::Logger
+      include Singleton
+
+      attr_writer :queues
+
+      def queues
+        @queues ||= ['default']
+      end
+
+      def enabled?
+        require 'resque'
+        logger.info "Resque enabled"
+        true
+      rescue LoadError
+        false
+      end
+
+      def collect!(store)
+        log_msg = String.new
+
+        # Ensure we continue to collect metrics for known queue names, even when nothing is
+        # enqueued at the time. Without this, it will appears that the agent is no longer reporting.
+        self.queues |= ::Resque.queues
+
+        queues.each do |queue|
+          next if queue.nil? || queue.empty?
+          depth = ::Resque.size(queue)
+          store.push depth, Time.now, queue, :qd
+          log_msg << "resque-qd.#{queue}=#{depth} "
+        end
+
+        logger.debug log_msg
+      end
+    end
+  end
+end

data/lib/rails_autoscale_agent/worker_adapters/sidekiq.rb

@@ -2,28 +2,49 @@
 
 require 'rails_autoscale_agent/logger'
 
-module WorkerAdapters
-  class Sidekiq
-    include RailsAutoscaleAgent::Logger
-    include Singleton
-
-    def enabled?
-      require 'sidekiq/api'
-      true
-    rescue LoadError
-      false
-    end
+module RailsAutoscaleAgent
+  module WorkerAdapters
+    class Sidekiq
+      include RailsAutoscaleAgent::Logger
+      include Singleton
+
+      attr_writer :known_queue_names
 
-    def collect!(store)
-      log_msg = String.new('Sidekiq latency ')
+      def known_queue_names
+        @known_queue_names ||= ['default']
+      end
 
-      ::Sidekiq::Queue.all.each do |queue|
-        latency_ms = (queue.latency * 1000).ceil
-        store.push latency_ms, Time.now, queue.name
-        log_msg << "#{queue.name}=#{latency_ms} "
+      def enabled?
+        require 'sidekiq/api'
+        logger.info "Sidekiq enabled"
+        true
+      rescue LoadError
+        false
       end
 
-      logger.debug log_msg
+      def collect!(store)
+        log_msg = String.new
+        queues_by_name = ::Sidekiq::Queue.all.each_with_object({}) do |queue, obj|
+          obj[queue.name] = queue
+        end
+
+        # Ensure we continue to collect metrics for known queue names, even when nothing is
+        # enqueued at the time. Without this, it will appears that the agent is no longer reporting.
+        known_queue_names.each do |queue_name|
+          queues_by_name[queue_name] ||= ::Sidekiq::Queue.new(queue_name)
+        end
+        self.known_queue_names = queues_by_name.keys
+
+        queues_by_name.each do |queue_name, queue|
+          latency_ms = (queue.latency * 1000).ceil
+          depth = queue.size
+          store.push latency_ms, Time.now, queue.name, :qt
+          store.push depth, Time.now, queue.name, :qd
+          log_msg << "sidekiq-qt.#{queue.name}=#{latency_ms} sidekiq-qd.#{queue.name}=#{depth} "
+        end
+
+        logger.debug log_msg
+      end
     end
   end
 end

data/rails_autoscale_agent.gemspec

@@ -15,16 +15,4 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 12.3.3"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "vcr", "~> 3.0"
-  spec.add_development_dependency "webmock"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "sidekiq", "~> 5.0"
-  spec.add_development_dependency "delayed_job"
-  spec.add_development_dependency "que"
-  spec.add_development_dependency "activesupport"
 end

metadata

@@ -1,169 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rails_autoscale_agent
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Adam McCrea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: delayed_job
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: que
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2020-07-13 00:00:00.000000000 Z
+dependencies: []
 description: 
 email:
 - adam@adamlogic.com
@@ -198,6 +44,7 @@ files:
 - lib/rails_autoscale_agent/version.rb
 - lib/rails_autoscale_agent/worker_adapters/delayed_job.rb
 - lib/rails_autoscale_agent/worker_adapters/que.rb
+- lib/rails_autoscale_agent/worker_adapters/resque.rb
 - lib/rails_autoscale_agent/worker_adapters/sidekiq.rb
 - log/.gitkeep
 - rails_autoscale_agent.gemspec
@@ -220,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 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