rails_autoscale_agent 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a664bf586cfca775c6746bf7a9ec73ceacda9a35
-  data.tar.gz: 3851b8c106b566f8af42ad08bcb7481f07780f09
+  metadata.gz: fe89dcd1aa0c7e2f91a0d1b28e245fe2069ceea2
+  data.tar.gz: 410d2bda04a6e08b32c346a5772f3d18497e5835
 SHA512:
-  metadata.gz: ddefca39f67065285ef5fc6fb04d9a1c7e5ed4b2a1f40ba7cd29aaaea1f086fc945e72c8aef4ee061a39d30509407f887968447e7d8af8b66c608c312bcda40e
-  data.tar.gz: 3fced23c559e9ef89306cf05d72f85d05c57a5bfc346ca38abefa782f0b00c8ed97a72ec564694b847d09a1c631ad5ae67f33cf9e03f672ff7c95f6130f44188
+  metadata.gz: daa65cd31e4b418a78672b36968a9dc5c9ec99e572f02fea091c22b01e656b5f21fd47b1c400f17edc2c75dbfce942f0847a147d3ebdff1b57a5ae9904cdebd6
+  data.tar.gz: 79205df8bc5d395ce86134af38c21e629a491dd95472bb2b46f7ab3f7448f92a6fd6b491b21d4c1735f423faa328386368ec22a87c306735d38ad8c26a82fb8f

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/log/

data/lib/rails_autoscale_agent/config.rb

@@ -1,22 +1,34 @@
+require 'singleton'
+
 module RailsAutoscaleAgent
   class Config
-    attr_reader :api_base_url, :dyno, :pid, :fake_mode
+    include Singleton
+
+    attr_reader :api_base_url, :dyno, :pid, :fake_mode, :max_request_size
+    attr_accessor :report_interval
     alias_method :fake_mode?, :fake_mode
 
-    def initialize(environment)
-      @api_base_url = environment['RAILS_AUTOSCALE_URL']
+    def initialize
+      @api_base_url = ENV['RAILS_AUTOSCALE_URL']
       @pid = Process.pid
-      @fake_mode = true if environment['RAILS_AUTOSCALE_FAKE_MODE'] == 'true'
+      @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!
+      @fake_mode = true if ENV['RAILS_AUTOSCALE_FAKE_MODE'] == 'true'
 
       if fake_mode?
         @dyno = 'web.123'
       else
-        @dyno = environment['DYNO']
+        @dyno = ENV['DYNO']
       end
     end
 
     def to_s
       "#{@dyno}##{@pid}"
     end
+
+    def ignore_large_requests?
+      @max_request_size.present?
+    end
+
   end
 end

data/lib/rails_autoscale_agent/middleware.rb

@@ -14,16 +14,15 @@ module RailsAutoscaleAgent
     end
 
     def call(env)
-      config = Config.new(ENV)
-
       logger.tagged 'RailsAutoscale' do
+        config = Config.instance
         request = Request.new(env, config)
 
-        logger.debug "Middleware entered - request_id=#{request.id} path=#{request.path}"
+        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)
-        Collector.collect(request, store)
+        Collector.collect(request, store) unless request.ignore?
       end
 
       @app.call(env)

data/lib/rails_autoscale_agent/reporter.rb

@@ -21,14 +21,13 @@ module RailsAutoscaleAgent
 
     def start!(config, store)
       @running = true
-      @report_interval = 60 # this default will be overwritten during #register!
 
       Thread.new do
         logger.tagged 'RailsAutoscale' do
           register!(config)
 
           loop do
-            sleep @report_interval
+            sleep config.report_interval
 
             begin
               report!(config, store)
@@ -73,8 +72,9 @@ module RailsAutoscaleAgent
 
       case result
       when AutoscaleApi::SuccessResponse
-        @report_interval = result.data['report_interval'] || @report_interval
-        logger.info "Reporter starting, will report every #{@report_interval} seconds"
+        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"
       when AutoscaleApi::FailureResponse
         logger.error "Reporter failed to register: #{result.failure_message}"
       end

data/lib/rails_autoscale_agent/request.rb

@@ -1,15 +1,23 @@
 module RailsAutoscaleAgent
   class Request
-    attr_reader :id, :entered_queue_at, :path
+    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'].size
       @entered_queue_at = if unix_millis = env['HTTP_X_REQUEST_START']
                             Time.at(unix_millis.to_f / 1000)
                           elsif config.fake_mode?
                             Time.now - rand(1000) / 1000.0 # 0-1000 ms ago
                           end
     end
+
+    def ignore?
+      @config.ignore_large_requests? && @size > @config.max_request_size
+    end
+
   end
 end

data/lib/rails_autoscale_agent/version.rb

@@ -1,3 +1,3 @@
 module RailsAutoscaleAgent
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_autoscale_agent
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Adam McCrea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport