rails_autoscale_agent 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd7549c359dd5f45dbd5d44113c04413685c0cabc12836c1a88559404104ea8b
-  data.tar.gz: b193f06500d2d281e22b2684364e2aad7107dcd1713f8e30d98f2cc3a814a99f
+  metadata.gz: f313cab3eefd93584c9d2484698d836ad19467b2e03cd26623003edcd1c64ad5
+  data.tar.gz: d8b33799b6dc0c2e92b6fbe770de41ac7e104a8d887965cf35538ea9ab6b8acb
 SHA512:
-  metadata.gz: 0ecc593e4d6a404bbeb0d082047c87511e5be55daa77169a4159f0a96c8bc1bd7c5b78e09e712ec90119e0198c615849331de9b8ff1fd48e3f2ecf631e8395a5
-  data.tar.gz: b4802270f5a2ac21f5c8fee31c200dcd2fee5b8771591a3b9c9eb21b1a716ec59e56e24e958afbbc8ea5aa49670e0bf62dc64ad8d3670f8cb4ff7126afaf6f4f
+  metadata.gz: 3208e51e66e87a9c5e076322c04f7f3594295d11ad2e5c16cdea5600372e02b70e50e15138788fe5d59a7d6854a8c59c908db5cdb28878386989c7e8fb2d9049
+  data.tar.gz: 1b771752c5fde1c3cd534a4ef2aca0e5917d3343d10e97cfb5fdb64a89f72cd5343e4662af281c214a35459cb77759f7c19b5110fd8bed979b54ffeff97a1de0

data/CHANGELOG.md

@@ -1,10 +1,16 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/adamlogic/rails_autoscale_agent/compare/v0.10.2...master)
+## [Unreleased](https://github.com/adamlogic/rails_autoscale_agent/compare/v0.11.0...master)
 
 No currently unreleased changes.
 
+## [0.11.0](https://github.com/adamlogic/rails_autoscale_agent/compare/v0.10.2...v0.11.0)
+
+### Added
+
+- Add `RAILS_AUTOSCALE_MAX_QUEUES` config option. ([28738a5](https://github.com/adamlogic/rails_autoscale_agent/commit/28738a5dc4cd6b0a46e77459d6f98e6b33072da9))
+
 ## [0.10.2](https://github.com/adamlogic/rails_autoscale_agent/compare/v0.10.1...v0.10.2) - 2021-01-12
 
 ### Changed

data/README.md

@@ -43,8 +43,9 @@ Rails Autoscale aggregates and stores this information to power the autoscaling
 Most Rails Autoscale configurations are handled via the settings page on your Rails Autoscale dashboard, but there a few ways you can directly change the behavior of the agent via environment variables:
 
 - `RAILS_AUTOSCALE_DEBUG` - Enables debug logging. See more in the [logging](#logging) section below.
-- `RAILS_AUTOSCALE_WORKER_ADAPTER` - Overrides the available worker adapters. See more in the [worker adapters](#worker_adapters) section below.
+- `RAILS_AUTOSCALE_WORKER_ADAPTER` - Overrides the available worker adapters. See more in the [worker adapters](#worker-adapters) section below.
 - `RAILS_AUTOSCALE_LONG_JOBS` - Enables reporting for active workers. See [Handling Long-Running Background Jobs](https://railsautoscale.com/docs/long-running-jobs/) in the Rails Autoscale docs for more.
+- `RAILS_AUTOSCALE_MAX_QUEUES` - Worker metrics will only report up to 50 queues by default. If you have more than 50 queues, you'll need to configure this settings or reduce your number of queues.
 
 ## Worker adapters
 

data/lib/rails_autoscale_agent/config.rb

@@ -10,7 +10,7 @@ module RailsAutoscaleAgent
 
     attr_accessor :report_interval, :logger, :api_base_url, :max_request_size,
                   :dyno, :addon_name, :worker_adapters, :dev_mode, :debug, :quiet,
-                  :track_long_running_jobs,
+                  :track_long_running_jobs, :max_queues,
 
                   # legacy configs, no longer used
                   :sidekiq_latency_for_active_jobs, :latency_for_active_jobs
@@ -24,6 +24,7 @@ module RailsAutoscaleAgent
       @dev_mode = ENV['RAILS_AUTOSCALE_DEV'] == 'true'
       @debug = dev_mode? || ENV['RAILS_AUTOSCALE_DEBUG'] == 'true'
       @track_long_running_jobs = ENV['RAILS_AUTOSCALE_LONG_JOBS'] == 'true'
+      @max_queues = ENV.fetch('RAILS_AUTOSCALE_MAX_QUEUES', 50).to_i
       @max_request_size = 100_000 # ignore request payloads over 100k since they skew the queue times
       @report_interval = 10 # this default will be overwritten during Reporter#register!
       @logger ||= defined?(Rails) ? Rails.logger : ::Logger.new(STDOUT)

data/lib/rails_autoscale_agent/reporter.rb

@@ -6,8 +6,6 @@ require 'rails_autoscale_agent/autoscale_api'
 require 'rails_autoscale_agent/time_rounder'
 require 'rails_autoscale_agent/registration'
 
-# Reporter wakes up every minute to send metrics to the RailsAutoscale API
-
 module RailsAutoscaleAgent
   class Reporter
     include Singleton
@@ -56,20 +54,16 @@ module RailsAutoscaleAgent
     def report!(config, store)
       report = store.pop_report
 
-      if report.measurements.any?
-        logger.info "Reporting #{report.measurements.size} measurements"
+      logger.info "Reporting #{report.measurements.size} measurements"
 
-        params = report.to_params(config)
-        result = AutoscaleApi.new(config).report_metrics!(params, report.to_csv)
+      params = report.to_params(config)
+      result = AutoscaleApi.new(config).report_metrics!(params, report.to_csv)
 
-        case result
-        when AutoscaleApi::SuccessResponse
-          logger.debug "Reported successfully"
-        when AutoscaleApi::FailureResponse
-          logger.error "Reporter failed: #{result.failure_message}"
-        end
-      else
-        logger.debug "Reporter has nothing to report"
+      case result
+      when AutoscaleApi::SuccessResponse
+        logger.debug "Reported successfully"
+      when AutoscaleApi::FailureResponse
+        logger.error "Reporter failed: #{result.failure_message}"
       end
     end
 

data/lib/rails_autoscale_agent/store.rb

@@ -13,6 +13,7 @@ module RailsAutoscaleAgent
 
     def initialize
       @measurements = []
+      @last_pop = Time.now
     end
 
     def push(value, time = Time.now, queue_name = nil, metric = nil)

data/lib/rails_autoscale_agent/version.rb

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

data/lib/rails_autoscale_agent/worker_adapters/delayed_job.rb

@@ -33,8 +33,8 @@ module RailsAutoscaleAgent
         run_at_by_queue = Hash[select_rows(sql)]
 
         # Don't collect worker metrics if there are unreasonable number of queues
-        if run_at_by_queue.size > 50
-          logger.debug "Skipping DelayedJob metrics - #{run_at_by_queue.size} queues"
+        if run_at_by_queue.size > Config.instance.max_queues
+          logger.warn "Skipping DelayedJob metrics - #{run_at_by_queue.size} queues exceeds the #{Config.instance.max_queues} queue limit"
           return
         end
 

data/lib/rails_autoscale_agent/worker_adapters/que.rb

@@ -40,8 +40,8 @@ module RailsAutoscaleAgent
         run_at_by_queue = Hash[select_rows(sql)]
 
         # Don't collect worker metrics if there are unreasonable number of queues
-        if run_at_by_queue.size > 50
-          logger.debug "Skipping Que metrics - #{run_at_by_queue.size} queues"
+        if run_at_by_queue.size > Config.instance.max_queues
+          logger.warn "Skipping Que metrics - #{run_at_by_queue.size} queues exceeds the #{Config.instance.max_queues} queue limit"
           return
         end
 

data/lib/rails_autoscale_agent/worker_adapters/resque.rb

@@ -27,8 +27,8 @@ module RailsAutoscaleAgent
         current_queues = ::Resque.queues
 
         # Don't collect worker metrics if there are unreasonable number of queues
-        if current_queues.size > 50
-          logger.debug "Skipping Resque metrics - #{current_queues.size} queues"
+        if current_queues.size > Config.instance.max_queues
+          logger.warn "Skipping Resque metrics - #{current_queues.size} queues exceeds the #{Config.instance.max_queues} queue limit"
           return
         end
 

data/lib/rails_autoscale_agent/worker_adapters/sidekiq.rb

@@ -29,8 +29,8 @@ module RailsAutoscaleAgent
         end
 
         # Don't collect worker metrics if there are unreasonable number of queues
-        if queues_by_name.size > 50
-          logger.debug "Skipping Sidekiq metrics - #{queues_by_name.size} queues"
+        if queues_by_name.size > Config.instance.max_queues
+          logger.warn "Skipping Sidekiq metrics - #{queues_by_name.size} queues exceeds the #{Config.instance.max_queues} queue limit"
           return
         end
 

data/rails_autoscale_agent.gemspec

@@ -9,12 +9,20 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Adam McCrea"]
   spec.email         = ["adam@adamlogic.com"]
 
-  spec.summary       = "This gem works with the Rails Autoscale Heroku add-on to automatically scale your web dynos."
-  spec.homepage      = "https://github.com/adamlogic/rails_autoscale_agent"
+  spec.summary       = "This gem works with the Rails Autoscale Heroku add-on to automatically scale your web and worker dynos."
+  spec.homepage      = "https://railsautoscale.com"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.5.0'
+
+  spec.metadata = {
+    "homepage_uri" => "https://railsautoscale.com",
+    "bug_tracker_uri" => "https://github.com/adamlogic/rails_autoscale_agent/issues",
+    "documentation_uri" => "https://railsautoscale.com/docs",
+    "changelog_uri" => "https://github.com/adamlogic/rails_autoscale_agent/blob/master/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/adamlogic/rails_autoscale_agent",
+  }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_autoscale_agent
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Adam McCrea
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -19,7 +19,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-version"
 - ".travis.yml"
 - ".vscode/tasks.json"
 - CHANGELOG.md
@@ -49,10 +48,15 @@ files:
 - lib/rails_autoscale_agent/worker_adapters/sidekiq.rb
 - log/.gitkeep
 - rails_autoscale_agent.gemspec
-homepage: https://github.com/adamlogic/rails_autoscale_agent
+homepage: https://railsautoscale.com
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://railsautoscale.com
+  bug_tracker_uri: https://github.com/adamlogic/rails_autoscale_agent/issues
+  documentation_uri: https://railsautoscale.com/docs
+  changelog_uri: https://github.com/adamlogic/rails_autoscale_agent/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/adamlogic/rails_autoscale_agent
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -61,16 +65,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: This gem works with the Rails Autoscale Heroku add-on to automatically scale
-  your web dynos.
+  your web and worker dynos.
 test_files: []

data/.ruby-version

@@ -1 +0,0 @@
-2.6.5