autoscale-agent 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc5fb7bd79bb436a7f36d9c95b3f27f8a1437cc269da86c275cc00b434784ed2
-  data.tar.gz: 69057429ec9c74443d3b23a8fbe5ef2fd7b716fe414393d4e59eef5944b533d2
+  metadata.gz: 5e5fac211926fd32008d9b5a34821744f5641c8b8cb87d8eac252216120e4ff0
+  data.tar.gz: 4c18afc1684e781380dad1eefa25f1415b315659919138839d3e2b016042e5a9
 SHA512:
-  metadata.gz: 5379183c0664bb43b528c11d229f607328a1ce99a88865f4da0d4e955751c083bed3b57884bc85b915ed902c877199c853cd112214661dcd58e6a6e86596f2a7
-  data.tar.gz: 493b64a3a84714e14b840a24ccb0a3197c6f6d8adf17ca4802a49cd3692ec3448216a49047df321eba5b2e9b7e9148b3702378d1290817f53be55d2ae1ccd15f
+  metadata.gz: c907c30ca3ad52721dcc9d702c2f2afcea7c14ca3851c60f3983ad7256bca5068d98c24b92416263bbc83ed915a3d9be1377597c4f8d7070c09099c5ee9c9012
+  data.tar.gz: 28c7a7328a84a2e8c30a8b98fb21a873ae5702fd23733c87023a53b4d3ab0b149fa19e56ae89642ac0e194081ff0b52bfed4fce4883c6c065552ce04ba362b9a

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [0.2.1] - 2023-04-24
+
+- Don't run WorkerDispatchers#run in a separate thread
+
+
+## [0.2.0] - 2023-04-24
+
+- Change when and where dispatchers are run
+
+The WebDispatcher now runs in either the primary (sole) process, and
+otherwise one in each forked (worker) process.
+
+The WorkerDispatchers no longer automatically run
+post-configuration. Instead, they must be manually started.
+
+Note: WebDispatchers has been removed in favor of a single
+WebDispatcher.
+
 ## [0.1.0] - 2023-03-03
 
 - Initial release

data/README.md

@@ -38,6 +38,14 @@ See Rake for relevant tasks:
 
     bin/rake -T
 
+## Release
+
+1. Finalize CHANGELOG.md
+2. Update version.rb
+3. Run `bundle install`
+4. Commit
+5. Create and push a new tag (`v1.2.3`)
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/autoscale-app/ruby-agent

data/lib/autoscale/agent/configuration.rb

@@ -7,21 +7,8 @@ module Autoscale
 
       class InvalidPlatformError < StandardError; end
 
-      class << self
-        attr_writer :run
-
-        def run?
-          !defined?(@run) || @run == true
-        end
-      end
-
       def initialize(&block)
         instance_eval(&block)
-
-        if Configuration.run?
-          web_dispatchers.run
-          worker_dispatchers.run
-        end
       end
 
       def platform(value = nil)
@@ -32,9 +19,7 @@ module Autoscale
         end
       end
 
-      def web_dispatchers
-        @web_dispatchers ||= WebDispatchers.new
-      end
+      attr_reader :web_dispatcher
 
       def worker_dispatchers
         @worker_dispatchers ||= WorkerDispatchers.new
@@ -60,7 +45,7 @@ module Autoscale
       private
 
       def dispatch_web(token)
-        web_dispatchers.queue_time = WebDispatcher.new(token)
+        @web_dispatcher = WebDispatcher.new(token)
       end
 
       def dispatch_worker(token, &block)

data/lib/autoscale/agent/middleware.rb

@@ -28,12 +28,13 @@ module Autoscale
 
       def record_queue_time(env)
         return unless request_start_header(env)
-        return unless (dispatcher = Autoscale::Agent.configuration.web_dispatchers.queue_time)
+        return unless (dispatcher = Autoscale::Agent.configuration.web_dispatcher)
         current_time = (Time.now.to_f * 1000).to_i
         request_start_time = to_ms(request_start_header(env))
         elapsed_ms = current_time - request_start_time
         elapsed = (elapsed_ms < 0) ? 0 : elapsed_ms
         dispatcher.add(elapsed)
+        dispatcher.run
       end
 
       def request_start_header(env)

data/lib/autoscale/agent/util.rb

@@ -0,0 +1,16 @@
+module Autoscale
+  module Agent
+    module Util
+      module_function
+
+      def loop_with_interval(interval, &block)
+        loop do
+          start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          block.call
+          duration = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
+          sleep [0, interval - duration].max
+        end
+      end
+    end
+  end
+end

data/lib/autoscale/agent/version.rb

@@ -1,5 +1,5 @@
 module Autoscale
   module Agent
-    VERSION = "0.1.0".freeze
+    VERSION = "0.2.1".freeze
   end
 end

data/lib/autoscale/agent/web_dispatcher.rb

@@ -1,6 +1,7 @@
 module Autoscale
   module Agent
     class WebDispatcher
+      DISPATCH_INTERVAL = 15
       TTL = 30
 
       attr_reader :token
@@ -10,49 +11,68 @@ module Autoscale
         @token = token
         @buffer = {}
         @mutex = Mutex.new
+        @running = false
+        @running_lock = Mutex.new
       end
 
       def add(value, timestamp: Time.now.to_i)
         @mutex.synchronize do
-          @buffer[timestamp] ||= 0
-          @buffer[timestamp] = value if value > @buffer[timestamp]
-        end
-      end
-
-      def prune
-        @mutex.synchronize do
-          max_age = Time.now.to_i - TTL
-          @buffer.delete_if { |timestamp, _| timestamp < max_age }
+          add_unsafe(value, timestamp: timestamp)
         end
       end
 
       def dispatch
-        return unless (payload = build_payload)
+        payload = flush
+
+        return if payload.empty?
 
         body = MultiJson.dump(payload)
         response = Request.dispatch(body, token: token)
 
         unless response.is_a?(Net::HTTPOK)
-          revert_payload(payload)
+          revert(payload)
           error "Failed to dispatch (#{response.code}) #{response.body}"
         end
+      rescue => err
+        puts "Autoscale::Agent/WebDispatcher: #{err}\n#{err.backtrace.join("\n")}"
+      end
+
+      def run
+        @running_lock.synchronize do
+          return if @running
+          @running = true
+        end
+
+        Thread.new do
+          loop do
+            dispatch
+            sleep DISPATCH_INTERVAL
+          end
+        end
       end
 
       private
 
-      def build_payload
+      def add_unsafe(value, timestamp: Time.now.to_i)
+        if timestamp > Time.now.to_i - TTL
+          @buffer[timestamp] ||= 0
+          @buffer[timestamp] = value if value > @buffer[timestamp]
+        end
+      end
+
+      def flush
         @mutex.synchronize do
-          now = Time.now.to_i
-          keys = @buffer.each_key.select { |key| key < now }
-          payload = @buffer.slice(*keys)
-          keys.each { |key| @buffer.delete(key) }
-          payload if payload.any?
+          buffer = @buffer
+          @buffer = {}
+          buffer
         end
       end
 
-      def revert_payload(payload)
-        payload.each do |timestamp, value|
-          add(value, timestamp: timestamp)
+      def revert(payload)
+        @mutex.synchronize do
+          payload.each do |timestamp, value|
+            add_unsafe(value, timestamp: timestamp)
+          end
         end
       end
 

data/lib/autoscale/agent/worker_dispatchers.rb

@@ -26,12 +26,7 @@ module Autoscale
       end
 
       def run
-        Thread.new do
-          loop do
-            dispatch
-            sleep DISPATCH_INTERVAL
-          end
-        end
+        Util.loop_with_interval(DISPATCH_INTERVAL) { dispatch }
       end
     end
   end

data/lib/autoscale/agent.rb

@@ -4,10 +4,11 @@ require "multi_json"
 
 require_relative "agent/configuration"
 require_relative "agent/middleware"
+require_relative "agent/railtie" if defined?(Rails::Railtie)
 require_relative "agent/request"
+require_relative "agent/util"
 require_relative "agent/version"
 require_relative "agent/web_dispatcher"
-require_relative "agent/web_dispatchers"
 require_relative "agent/worker_dispatcher"
 require_relative "agent/worker_dispatchers"
 require_relative "agent/worker_server"
@@ -26,5 +27,3 @@ module Autoscale
     end
   end
 end
-
-require_relative "agent/railtie" if defined?(Rails::Railtie)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoscale-agent
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Michael R. van Rooijen
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -24,7 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-description:
+description: 
 email:
 - support@autoscale.app
 executables: []
@@ -40,9 +40,9 @@ files:
 - lib/autoscale/agent/middleware.rb
 - lib/autoscale/agent/railtie.rb
 - lib/autoscale/agent/request.rb
+- lib/autoscale/agent/util.rb
 - lib/autoscale/agent/version.rb
 - lib/autoscale/agent/web_dispatcher.rb
-- lib/autoscale/agent/web_dispatchers.rb
 - lib/autoscale/agent/worker_dispatcher.rb
 - lib/autoscale/agent/worker_dispatchers.rb
 - lib/autoscale/agent/worker_server.rb
@@ -57,7 +57,7 @@ metadata:
   changelog_uri: https://github.com/autoscale-app/ruby-agent/blob/master/CHANGELOG.md
   bug_tracker_uri: https://github.com/autoscale-app/ruby-agent/issues
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -72,8 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Provides Autoscale.app with the necessary metrics for autoscaling web and
   worker processes

data/lib/autoscale/agent/web_dispatchers.rb

@@ -1,47 +0,0 @@
-module Autoscale
-  module Agent
-    class WebDispatchers
-      class AlreadySetError < StandardError
-      end
-
-      include Enumerable
-
-      DISPATCH_INTERVAL = 15
-
-      attr_reader :queue_time
-
-      def initialize
-        @dispatchers = []
-      end
-
-      def queue_time=(dispatcher)
-        raise AlreadySetError if defined?(@queue_time)
-        @dispatchers << (@queue_time = dispatcher)
-      end
-
-      def each(&block)
-        @dispatchers.each(&block)
-      end
-
-      def prune
-        each(&:prune)
-      end
-
-      def dispatch
-        each(&:dispatch)
-      rescue => err
-        puts "Autoscale::Agent/WebDispatcher: #{err}\n#{err.backtrace.join("\n")}"
-      end
-
-      def run
-        Thread.new do
-          loop do
-            prune
-            dispatch
-            sleep DISPATCH_INTERVAL
-          end
-        end
-      end
-    end
-  end
-end