neetodeploy-autoscale 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27447ab3dd1a86114502dba20ac472fdbbc5de7c56e6d65bb9f4b5790c24a6cd
-  data.tar.gz: 8124289ad97a7ea6742af785d5c6183e2f2238faa65c7fb38a1275fe58fdeafc
+  metadata.gz: 5c7265603142b311a9ff85c2bb44678261113c889ef554399132dd6f4d41931d
+  data.tar.gz: 6ab7a1fc5cb14f7b2c7ebb93fea67266cbe9c34b41abd4d3bcf2e4c7ecd41c0f
 SHA512:
-  metadata.gz: 77e3bb73219f39f717511e3b9f860daf6cbc610b26f656061312a54095c2d6d62e894c8a44027c35fff37948edcada469bf4bfc5a33ede5deec5917320a9a1e2
-  data.tar.gz: f40763ca2219295b1a64c0f76addeeb8539493be1757bdec45ef7830f6379e1b741903ae5acc3894510a37d5dfd600103b25cabfabee2e960bf441332b7fd334
+  metadata.gz: 628156b95ff204ecbc18ca301c318618d474495c506896859ecdd3f53c93dcda4a3e7bf18dc4c69d1d4eb5db2dfdb99dd49a9d051bc3f856d9d58559f30a4e89
+  data.tar.gz: ac9de8142aa4599e664c4637ff3738dcbeb9888ec67c98029e0d1dbf734e050d4943cc5a60a1cca67e70b37b6823dacbfa4c7137387de795b7e1c60c66261205

data/lib/neetodeploy/autoscale/config.rb

@@ -3,7 +3,7 @@ module Neetodeploy
     include Singleton
 
     attr_accessor :disable_auto_scale_gem, :disable_sidekiq_metrics, :app_name, :metrics_server_url,
-                  :metrics_server_auth_token, :report_interval_seconds
+                  :metrics_server_auth_token, :report_interval_seconds, :use_puma_queue_size
 
     def initialize
       @disable_auto_scale_gem = ENV["DISABLE_NEETO_DEPLOY_AUTOSCALE"]
@@ -12,6 +12,7 @@ module Neetodeploy
       @metrics_server_url = "http://nd-queue-time-exporter-web-deployment:3000/metrics"
       @metrics_server_auth_token = "K0An3O3MSyEEMTCnRd1IHgGjdGQkzy"
       @report_interval_seconds = 10
+      @use_puma_queue_size = ENV["NEETODEPLOY_USE_PUMA_QUEUE_SIZE"] == "true"
     end
 
     def gem_disabled?
@@ -21,5 +22,9 @@ module Neetodeploy
     def sidekiq_metrics_disabled?
       disable_sidekiq_metrics == "true"
     end
+
+    def use_puma_queue_size?
+      use_puma_queue_size
+    end
   end
 end

data/lib/neetodeploy/autoscale/rails/metrics_collector.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 require "singleton"
-require "neetodeploy/autoscale/rails/metrics_store"
+require "json"
 require "neetodeploy/autoscale/reporter"
 require "neetodeploy/autoscale/logger"
+require "neetodeploy/autoscale/config"
+require "neetodeploy/autoscale/rails/metrics_store"
 
 module Neetodeploy
   module Rails
@@ -16,7 +18,9 @@ module Neetodeploy
       end
 
       def start!
-        logger.info("Starting background worker to collect metrics")
+        config = Config.instance
+        mode = config.use_puma_queue_size? ? "Puma queue size" : "response time"
+        logger.info("Starting background worker to collect #{mode} metrics")
         @pid = Process.pid
         start_thread_with_collector_loop
       end
@@ -28,27 +32,86 @@ module Neetodeploy
       end
 
       def running?
-        @pid == Process.pid and @thread.alive?
+        @pid == Process.pid and @thread&.alive?
       end
 
       def start_thread_with_collector_loop(config = Config.instance)
         @thread = Thread.new do
-          metrics_store = MetricsStore.instance
           loop do
-            run_metrics_collection(metrics_store)
-            multiplier = 1 - (rand / 4)
-            sleep config.report_interval_seconds * multiplier
+            begin
+              metrics_store = MetricsStore.instance unless config.use_puma_queue_size?
+              loop do
+                if config.use_puma_queue_size?
+                  run_puma_metrics_collection(config)
+                else
+                  run_queue_time_collection(metrics_store, config)
+                end
+                multiplier = 1 - (rand / 4)
+                sleep config.report_interval_seconds * multiplier
+              end
+            rescue StandardError => e
+              logger.error("Rails metrics collector thread terminated with error: #{e.message}")
+              logger.error(e.backtrace.join("\n")) if e.backtrace
+              
+              # Only restart if we're still the same process and thread should continue
+              break unless @pid == Process.pid && !@thread.nil?
+              
+              logger.info("Restarting Rails metrics collector thread")
+              sleep(5)
+            end
           end
         end
       end
 
-      def run_metrics_collection(metrics_store)
+      def run_queue_time_collection(metrics_store, config)
+        return if config.gem_disabled?
+
         data = metrics_store.flush
         return if data.empty?
 
         average_queue_time = data.sum / data.size
         Reporter.new(average_queue_time, "queue_time", "web").report
       end
+
+      def run_puma_metrics_collection(config)
+        return unless puma_available?
+        return if config.gem_disabled?
+
+        begin
+          queue_size = get_puma_queue_size
+          return if queue_size.nil?
+
+          Reporter.new(queue_size, "puma_queue_size", "web").report
+        rescue StandardError => e
+          logger.error("Error collecting Puma queue size metrics: #{e.message}")
+        end
+      end
+
+      private
+
+        def puma_available?
+          defined?(::Puma) && ::Puma.respond_to?(:stats)
+        end
+
+        def get_puma_queue_size
+          stats_json = ::Puma.stats
+          return nil if stats_json.nil? || stats_json.empty?
+
+          stats = JSON.parse(stats_json)
+
+          # For clustered mode (multiple workers)
+          if stats["worker_status"]
+            # Sum backlog from all workers
+            stats["worker_status"].sum do |worker|
+              worker.dig("last_status", "backlog") || 0
+            end
+          # For single mode
+          elsif stats["backlog"]
+            stats["backlog"]
+          else
+            nil
+          end
+        end
     end
   end
 end

data/lib/neetodeploy/autoscale/rails/middleware.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require "net/http"
-require "time"
 require "neetodeploy/autoscale/rails/metrics"
 require "neetodeploy/autoscale/rails/metrics_store"
 require "neetodeploy/autoscale/rails/metrics_collector"
+require "neetodeploy/autoscale/config"
 
 module Neetodeploy
   module Rails
@@ -14,13 +13,18 @@ module Neetodeploy
       end
 
       def call(env)
-        metrics = Metrics.new(env)
-        queue_time = metrics.queue_time unless metrics.ignore?
+        config = Config.instance
         MetricsCollector.start
 
-        if queue_time
-          store = MetricsStore.instance
-          store.push queue_time
+        # Only collect queue time per request if using the old response time method
+        unless config.use_puma_queue_size?
+          metrics = Metrics.new(env)
+          queue_time = metrics.queue_time unless metrics.ignore?
+
+          if queue_time
+            store = MetricsStore.instance
+            store.push queue_time
+          end
         end
 
         @app.call(env)

data/lib/neetodeploy/autoscale/reporter.rb

@@ -9,8 +9,8 @@ module Neetodeploy
   class Reporter
     include NeetoDeploy::Logger
 
-    def initialize(queue_time, metric_name, process_type, queue_name = nil, config = Config.instance)
-      @queue_time = queue_time.to_i
+    def initialize(metric_value, metric_name, process_type, queue_name = nil, config = Config.instance)
+      @metric_value = metric_value.to_i
       @config = config
       @metric_name = metric_name
       @queue_name = queue_name
@@ -21,7 +21,7 @@ module Neetodeploy
       params = common_params
       params[:queue_name] = @queue_name if @queue_name
       url = build_url(params)
-      logger.info("Reporting average queue time for #{@process_type} dyno: #{@queue_time}")
+      logger.info("Reporting #{@metric_name} for #{@process_type} dyno: #{@metric_value}")
 
       post_request(url)
     end
@@ -31,7 +31,7 @@ module Neetodeploy
     def common_params
       {
         app_name: @config.app_name,
-        queue_time: @queue_time,
+        queue_time: @metric_value, # Keep queue_time parameter name for backward compatibility with metrics server
         metric_name: @metric_name,
         process_type: @process_type
       }

data/lib/neetodeploy/autoscale/version.rb

@@ -2,6 +2,6 @@
 
 module Neetodeploy
   module Autoscale
-    VERSION = "2.0.3"
+    VERSION = "2.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neetodeploy-autoscale
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Sreeram Venkitesh
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-23 00:00:00.000000000 Z
+date: 2025-11-13 00:00:00.000000000 Z
 dependencies: []
 description: For automatically scaling your Rails application based on network metrics
 email:
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: neetoDeploy autoscaler gem