rails_autoscale_agent 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e36ab348752b0f7b470a47224ccfb8b8375a2355
-  data.tar.gz: 14d64ad0ed2114955d34f2e9e5a129c763d5ffb3
+  metadata.gz: a664bf586cfca775c6746bf7a9ec73ceacda9a35
+  data.tar.gz: 3851b8c106b566f8af42ad08bcb7481f07780f09
 SHA512:
-  metadata.gz: d68ddb62be312c4afd8ee376c249f9755472c04a90cb8a98409a8b9e806dafaa3ea909c2ff06e2a42c6b48d466b1af1dca134640eef7db0ae67df79251d7017e
-  data.tar.gz: 59fb44914ffc29746221370e8cbaf3397b5adb725a474905d20fcd42e36172fe0aa7b9736e3f5b354c16e92915040f8238fad0abf8f166c28cac5084019464af
+  metadata.gz: ddefca39f67065285ef5fc6fb04d9a1c7e5ed4b2a1f40ba7cd29aaaea1f086fc945e72c8aef4ee061a39d30509407f887968447e7d8af8b66c608c312bcda40e
+  data.tar.gz: 3fced23c559e9ef89306cf05d72f85d05c57a5bfc346ca38abefa782f0b00c8ed97a72ec564694b847d09a1c631ad5ae67f33cf9e03f672ff7c95f6130f44188

data/README.md

@@ -7,7 +7,7 @@ and periodically posts this data asynchronously to the Rails Autoscale service.
 
 ## Requirements
 
-We've tested this with Rails versions 3.2 through 5.0 and Ruby versions 1.9.3 through 2.3.1.
+We've tested this with Rails versions 3.2 and higher and Ruby versions 1.9.3 and higher.
 
 ## Getting Started
 

data/lib/rails_autoscale_agent/autoscale_api.rb

@@ -13,36 +13,51 @@ module RailsAutoscaleAgent
       @api_url_base = api_url_base
     end
 
-    def report_metrics!(report_params)
-      post '/reports', report: report_params
+    def report_metrics!(report_params, timings_csv)
+      query = URI.encode_www_form(report_params)
+      post_csv "/v2/reports?#{query}", timings_csv
     end
 
     def register_reporter!(registration_params)
-      post '/registrations', registration: registration_params
+      post_json '/registrations', registration: registration_params
     end
 
     private
 
-    def post(path, data)
-      header = {'Content-Type' => 'application/json'}
-      uri = URI.parse("#{@api_url_base}#{path}")
+    def post_json(path, data)
+      headers = {'Content-Type' => 'application/json'}
+      post_raw path: path, body: JSON.dump(data), headers: headers
+    end
+
+    def post_csv(path, data)
+      headers = {'Content-Type' => 'text/csv'}
+      post_raw path: path, body: data, headers: headers
+    end
+
+    def post_raw(options)
+      uri = URI.parse("#{@api_url_base}#{options.fetch(:path)}")
       ssl = uri.scheme == 'https'
 
       response = Net::HTTP.start(uri.host, uri.port, use_ssl: ssl) do |http|
-        request = Net::HTTP::Post.new(uri.request_uri, header)
-        request.body = JSON.dump(data)
+        request = Net::HTTP::Post.new(uri.request_uri, options[:headers] || {})
+        request.body = options.fetch(:body)
 
-        logger.debug "[AutoscaleApi] Posting to #{request.body.size} bytes to #{uri}"
+        logger.debug "Posting #{request.body.size} bytes to #{uri}"
         http.request(request)
       end
 
       case response.code.to_i
-      when 200...300 then SuccessResponse.new
+      when 200...300 then SuccessResponse.new(response.body)
       else FailureResponse.new(response.message)
       end
     end
 
-    class SuccessResponse
+    class SuccessResponse < Struct.new(:body)
+      def data
+        JSON.parse(body)
+      rescue TypeError
+        {}
+      end
     end
 
     class FailureResponse < Struct.new(:failure_message)

data/lib/rails_autoscale_agent/collector.rb

@@ -8,14 +8,13 @@ module RailsAutoscaleAgent
       if request.entered_queue_at
         if request.entered_queue_at < (Time.now - 60 * 10)
           # ignore unreasonable values
-          logger.debug "[Collector] request queued for more than 10 minutes... skipping collection"
+          logger.info "request queued for more than 10 minutes... skipping collection"
         else
-          queue_time_millis = (Time.now - request.entered_queue_at) * 1000
+          queue_time_millis = ((Time.now - request.entered_queue_at) * 1000).to_i
           queue_time_millis = 0 if queue_time_millis < 0
           store.push(queue_time_millis)
+          logger.info "Collected queue_time=#{queue_time_millis}ms request_id=#{request.id}"
         end
-      else
-        logger.debug "[Collector] no wait time data to collect"
       end
     end
 

data/lib/rails_autoscale_agent/config.rb

@@ -16,7 +16,7 @@ module RailsAutoscaleAgent
     end
 
     def to_s
-      "#{@dyno}-#{@pid}"
+      "#{@dyno}##{@pid}"
     end
   end
 end

data/lib/rails_autoscale_agent/middleware.rb

@@ -16,18 +16,14 @@ module RailsAutoscaleAgent
     def call(env)
       config = Config.new(ENV)
 
-      logger.tagged 'RailsAutoscaleAgent', config.to_s do
-        if config.api_base_url
-          request = Request.new(env, config)
-
-          logger.debug "[Middleware] enter middleware for #{request.fullpath}"
-
-          store = Store.instance
-          Reporter.start(config, store)
-          Collector.collect(request, store)
-        else
-          logger.info "[Middleware] RAILS_AUTOSCALE_URL is not set"
-        end
+      logger.tagged 'RailsAutoscale' do
+        request = Request.new(env, config)
+
+        logger.debug "Middleware entered - request_id=#{request.id} path=#{request.path}"
+
+        store = Store.instance
+        Reporter.start(config, store)
+        Collector.collect(request, store)
       end
 
       @app.call(env)

data/lib/rails_autoscale_agent/registration.rb

@@ -5,7 +5,8 @@ module RailsAutoscaleAgent
 
     def to_params
       {
-        pid: Process.pid,
+        dyno: config.dyno,
+        pid: config.pid,
         ruby_version: RUBY_VERSION,
         rails_version: Rails.version,
         gem_version: VERSION,

data/lib/rails_autoscale_agent/report.rb

@@ -1,17 +1,29 @@
 module RailsAutoscaleAgent
-  class Report < Struct.new(:time, :values)
+  class Report
 
-    def initialize(time, values = [])
-      super
+    attr_reader :measurements
+
+    def initialize
+      @measurements = []
     end
 
     def to_params(config)
       {
-        time: time.iso8601,
         dyno: config.dyno,
         pid: config.pid,
-        measurements: values,
       }
     end
+
+    def to_csv
+      ''.tap do |result|
+        @measurements.each do |measurement|
+          result << measurement.time.to_i.to_s
+          result << ','.freeze
+          result << measurement.value.to_s
+          result << "\n".freeze
+        end
+      end
+    end
+
   end
 end

data/lib/rails_autoscale_agent/reporter.rb

@@ -12,32 +12,32 @@ module RailsAutoscaleAgent
     include Logger
 
     def self.start(config, store)
-      instance.start!(config, store) unless instance.running?
+      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
     end
 
     def start!(config, store)
-      logger.info "[Reporter] starting reporter, will report every minute"
-
       @running = true
+      @report_interval = 60 # this default will be overwritten during #register!
 
       Thread.new do
-        register!(config)
-
-        loop do
-          beginning_of_next_minute = TimeRounder.beginning_of_minute(Time.now) + 60
-
-          # add 0-5 seconds to avoid slamming the API at one moment
-          next_report_time = beginning_of_next_minute + rand * 5
-
-          sleep next_report_time - Time.now
-
-          begin
-            report!(config, store)
-          rescue => ex
-            # 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] #{ex.inspect}"
-            logger.error ex.backtrace.join("\n")
+        logger.tagged 'RailsAutoscale' do
+          register!(config)
+
+          loop do
+            sleep @report_interval
+
+            begin
+              report!(config, store)
+            rescue => ex
+              # 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")
+            end
           end
         end
       end
@@ -48,29 +48,35 @@ module RailsAutoscaleAgent
     end
 
     def report!(config, store)
-      while report = store.pop_report
-        logger.info "[Reporter] reporting queue times for #{report.values.size} requests during minute #{report.time.iso8601}"
+      report = store.pop_report
+
+      if report.measurements.any?
+        logger.info "Reporting queue times for #{report.measurements.size} requests"
 
         params = report.to_params(config)
-        result = AutoscaleApi.new(config.api_base_url).report_metrics!(params)
+        result = AutoscaleApi.new(config.api_base_url).report_metrics!(params, report.to_csv)
 
         case result
         when AutoscaleApi::SuccessResponse
-          logger.info "[Reporter] reported successfully"
+          logger.info "Reported successfully"
         when AutoscaleApi::FailureResponse
-          logger.error "[Reporter] failed: #{result.failure_message}"
+          logger.error "Reporter failed: #{result.failure_message}"
         end
+      else
+        logger.debug "Reporter has nothing to report"
       end
-
-      logger.debug "[Reporter] nothing to report" unless result
     end
 
     def register!(config)
       params = Registration.new(config).to_params
       result = AutoscaleApi.new(config.api_base_url).register_reporter!(params)
 
-      if result.is_a? AutoscaleApi::FailureResponse
-        logger.error "[Reporter] failed to register: #{result.failure_message}"
+      case result
+      when AutoscaleApi::SuccessResponse
+        @report_interval = result.data['report_interval'] || @report_interval
+        logger.info "Reporter starting, will report every #{@report_interval} seconds"
+      when AutoscaleApi::FailureResponse
+        logger.error "Reporter failed to register: #{result.failure_message}"
       end
     end
 

data/lib/rails_autoscale_agent/request.rb

@@ -1,9 +1,10 @@
 module RailsAutoscaleAgent
   class Request
-    attr_reader :entered_queue_at, :fullpath
+    attr_reader :id, :entered_queue_at, :path
 
     def initialize(env, config)
-      @fullpath = "#{env['HTTP_HOST']}#{env['PATH_INFO']}"
+      @id = env['HTTP_X_REQUEST_ID']
+      @path = env['PATH_INFO']
       @entered_queue_at = if unix_millis = env['HTTP_X_REQUEST_START']
                             Time.at(unix_millis.to_f / 1000)
                           elsif config.fake_mode?

data/lib/rails_autoscale_agent/store.rb

@@ -1,5 +1,4 @@
 require 'singleton'
-require 'rails_autoscale_agent/logger'
 require 'rails_autoscale_agent/time_rounder'
 require 'rails_autoscale_agent/measurement'
 require 'rails_autoscale_agent/report'
@@ -7,34 +6,23 @@ require 'rails_autoscale_agent/report'
 module RailsAutoscaleAgent
   class Store
     include Singleton
-    include Logger
 
     def initialize
       @measurements = []
     end
 
     def push(value, time = Time.now)
-      logger.debug "[Collector] queue time: #{value}"
       @measurements << Measurement.new(time, value)
     end
 
     def pop_report
-      result = nil
-      boundary = TimeRounder.beginning_of_minute(Time.now)
+      report = Report.new
 
-      while @measurements[0] && @measurements[0].time < boundary
-        measurement = @measurements.shift
-
-        if result.nil?
-          report_time = TimeRounder.beginning_of_minute(measurement.time)
-          boundary = report_time + 60
-          result = Report.new(report_time)
-        end
-
-        result.values << measurement.value
+      while measurement = @measurements.shift
+        report.measurements << measurement
       end
 
-      result
+      report
     end
 
   end

data/lib/rails_autoscale_agent/version.rb

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

metadata

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