rails_autoscale_agent 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9599e5eb723b8e92f13eb6f820ce7f49f6af5ae946146eb140f13e42a465625a
-  data.tar.gz: 94eeec3ac6376605b5d0db1c8aa406c1f7101fddbf2f188e1cbb41c5f2f836bc
+  metadata.gz: 5d8c84bc0e74990ad310505abc8666c54de4de76d16c31c8435c495afc17dc8a
+  data.tar.gz: a46f8f5e0bb5c5683d10b175162fb4fb1911fbc5390ae80716054062c13604f7
 SHA512:
-  metadata.gz: c8d33309ab62d23341bc707e8b5e5da5158e21885911fd0418a58c5880b4fe24a309cabf3cd08513382e18570e7c28f8ff2fa1bb7362f040aac8f3210fdf306e
-  data.tar.gz: 41999dbec255f00d7f3369f97e81acae12c556b126050ea28a50816a8c91801a8dfa256cdfc14f8126c4ad175ecd9dc16fd3b8136aaf0c9805301a362cdf81de
+  metadata.gz: dc1afd33ac4589472ffea027d24b6ff0cc9ef8b91fcdc237191248c8245baeee7ead3550ec8c1826c0bcdd708cbb83fe91457c8240efead5fef94e9109daaad3
+  data.tar.gz: cd381c1dd165c3830fa22d412603a966b4ecff5ab04bf6d3b8fb846f4c3bc0cde324c0e1fd0b5964bab2a72500e7bc752b06cbd95bb1c40b1fba3abd2871ce54

data/lib/rails_autoscale_agent/logger.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
+require 'rails_autoscale_agent/config'
+
 module RailsAutoscaleAgent
   module Logger
     def logger
       @logger ||= Config.instance.logger.tap do |logger|
         logger.extend(FakeTaggedLogging) unless logger.respond_to?(:tagged)
+        logger.extend(ConditionalDebugLogging)
       end
     end
 
@@ -14,5 +17,13 @@ module RailsAutoscaleAgent
         yield self
       end
     end
+
+    module ConditionalDebugLogging
+      def debug(*args)
+        # Rails logger defaults to DEBUG level in production, but I don't want
+        # to be chatty by default.
+        super if ENV['RAILS_AUTOSCALE_LOG_LEVEL'] == 'DEBUG'
+      end
+    end
   end
 end

data/lib/rails_autoscale_agent/measurement.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module RailsAutoscaleAgent
-  class Measurement < Struct.new(:time, :value)
-    def initialize(time, value)
-      super time.utc, value.to_i
+  class Measurement < Struct.new(:time, :value, :queue_name)
+    def initialize(time, value, queue_name = nil)
+      super time.utc, value.to_i, queue_name
     end
   end
 end

data/lib/rails_autoscale_agent/middleware.rb

@@ -19,8 +19,6 @@ module RailsAutoscaleAgent
         config = Config.instance
         request = Request.new(env, config)
 
-        logger.debug "Middleware entered - request_id=#{request.id} path=#{request.path} method=#{request.method} request_size=#{request.size}"
-
         store = Store.instance
         Reporter.start(config, store)
 

data/lib/rails_autoscale_agent/report.rb

@@ -22,6 +22,12 @@ module RailsAutoscaleAgent
           result << measurement.time.to_i.to_s
           result << ','
           result << measurement.value.to_s
+
+          if measurement.queue_name
+            result << ','
+            result << measurement.queue_name
+          end
+
           result << "\n"
         end
       end

data/lib/rails_autoscale_agent/reporter.rb

@@ -5,6 +5,7 @@ require 'rails_autoscale_agent/logger'
 require 'rails_autoscale_agent/autoscale_api'
 require 'rails_autoscale_agent/time_rounder'
 require 'rails_autoscale_agent/registration'
+require 'rails_autoscale_agent/worker_adapters/sidekiq'
 
 # Reporter wakes up every minute to send metrics to the RailsAutoscale API
 
@@ -13,25 +14,34 @@ module RailsAutoscaleAgent
     include Singleton
     include Logger
 
+    WORKER_ADAPTERS = [
+      WorkerAdapters::Sidekiq.new,
+    ]
+
     def self.start(config, store)
-      if config.api_base_url
-        instance.start!(config, store) unless instance.running?
-      else
-        instance.logger.debug "Reporter not started: RAILS_AUTOSCALE_URL is not set"
-      end
+      instance.start!(config, store) unless instance.started?
     end
 
     def start!(config, store)
-      @running = true
+      @started = true
+      @worker_adapters = WORKER_ADAPTERS.select(&:enabled?)
+
+      if !config.api_base_url
+        logger.info "Reporter not started: RAILS_AUTOSCALE_URL is not set"
+        return
+      end
 
       Thread.new do
         logger.tagged 'RailsAutoscale' do
           register!(config)
 
           loop do
-            sleep config.report_interval
+            # Stagger reporting to spread out reports from many processes
+            multiplier = 1 - (rand / 4) # between 0.75 and 1.0
+            sleep config.report_interval * multiplier
 
             begin
+              @worker_adapters.map { |a| a.collect!(store) }
               report!(config, store)
             rescue => ex
               # Exceptions in threads other than the main thread will fail silently
@@ -44,15 +54,15 @@ module RailsAutoscaleAgent
       end
     end
 
-    def running?
-      @running
+    def started?
+      @started
     end
 
     def report!(config, store)
       report = store.pop_report
 
       if report.measurements.any?
-        logger.info "Reporting queue times for #{report.measurements.size} requests"
+        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)
@@ -76,7 +86,7 @@ module RailsAutoscaleAgent
       when AutoscaleApi::SuccessResponse
         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']
-        logger.info "Reporter starting, will report every #{config.report_interval} seconds"
+        logger.info "Reporter starting, will report every #{config.report_interval} seconds or so"
       when AutoscaleApi::FailureResponse
         logger.error "Reporter failed to register: #{result.failure_message}"
       end

data/lib/rails_autoscale_agent/request.rb

@@ -24,16 +24,11 @@ module RailsAutoscaleAgent
 
     def queue_time
       if entered_queue_at
-        if entered_queue_at < (Time.now - 60 * 10)
-          # ignore unreasonable values
-          logger.warn "request queued for more than 10 minutes... skipping collection"
-        else
-          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}"
+        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}"
 
-          queue_time
-        end
+        queue_time
       end
     end
   end

data/lib/rails_autoscale_agent/store.rb

@@ -9,12 +9,14 @@ module RailsAutoscaleAgent
   class Store
     include Singleton
 
+    attr_reader :measurements
+
     def initialize
       @measurements = []
     end
 
-    def push(value, time = Time.now)
-      @measurements << Measurement.new(time, value)
+    def push(value, time = Time.now, queue_name = nil)
+      @measurements << Measurement.new(time, value, queue_name)
     end
 
     def pop_report

data/lib/rails_autoscale_agent/version.rb

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

data/lib/rails_autoscale_agent/worker_adapters/sidekiq.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_autoscale_agent/logger'
+require 'sidekiq/api'
+
+module WorkerAdapters
+  class Sidekiq
+    include RailsAutoscaleAgent::Logger
+
+    def enabled?
+      defined?(::Sidekiq)
+    end
+
+    # TODO: specs
+    def collect!(store)
+      log_msg = String.new('Sidekiq latency ')
+
+      ::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} "
+      end
+
+      logger.debug log_msg
+    end
+  end
+end

data/rails_autoscale_agent.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "sidekiq", "~> 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_autoscale_agent
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Adam McCrea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !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'
 description: 
 email:
 - adam@adamlogic.com
@@ -153,6 +167,7 @@ files:
 - lib/rails_autoscale_agent/store.rb
 - lib/rails_autoscale_agent/time_rounder.rb
 - lib/rails_autoscale_agent/version.rb
+- lib/rails_autoscale_agent/worker_adapters/sidekiq.rb
 - log/.gitkeep
 - rails_autoscale_agent.gemspec
 homepage: https://github.com/adamlogic/rails_autoscale_agent