neetodeploy-autoscale 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c7841930ad563bfa0d372de339715f70ba9dba99e0ef61ec09fcc9f0624a683
-  data.tar.gz: 1134df572ad17a7a6678770ac3a63227e4544f7d9b195489070ae14f3fead18d
+  metadata.gz: cdd8f665987aa730bfca4343fea2b9ae6f93bc5a4d6dcbc4152a7fb879165703
+  data.tar.gz: e0390da1428e2fa58547fc8045b7c769c824c502e37db945732833f2d3beb2b8
 SHA512:
-  metadata.gz: 3a6eb8853074dc0029d1c8dbab103916fda6f1719206dc966d3dcd5f2ea43250ec8762e52c00a2b32efa2071af3b3e7e3d7ea35cc07a664e69383e354ee0a61f
-  data.tar.gz: 55374376294d4c77f712423b16d5df3d9b5755ca99210697f225904a3d952dae6930e277d7ab2c8a3261d9cef978990943ffda50c95cfbb8e04b3d4440520a64
+  metadata.gz: a7e6a766486c6785ff2f53d7f0759bfaa1738b416c0f679df970ad2bcee1de9a1b1e97f0fedc61a6f94625ef30d14f7fdf5081eae0cb37bf1005a85b057bb34e
+  data.tar.gz: 2d843f184f0f3ba6acf8f0823e04860ded3c9e76fe6a1d512592e154507890c66021283a2087775387cdb153511412f3382fa0d0f83a47e124307616f1a898bf

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

@@ -8,12 +8,13 @@ module Neetodeploy
     class Metrics
       def initialize(env, config = Config.instance)
         @config = config
+        @env = env
         @request_start_header_raw = env["HTTP_X_REQUEST_START"]
         @request_start_header = @request_start_header_raw.to_i
         @network_time = env["puma.request_body_wait"].to_i
         
-        # Debug: Log all HTTP headers to help diagnose
-        if @request_start_header_raw.nil? || @request_start_header_raw.empty?
+        # Debug: Log all HTTP headers to help diagnose (only for non-health-check requests)
+        if (@request_start_header_raw.nil? || @request_start_header_raw.empty?) && !health_check_request?(env)
           # Get all HTTP_* headers (these are the request headers)
           http_headers = env.keys.grep(/^HTTP_/)
           
@@ -32,7 +33,14 @@ module Neetodeploy
       end
 
       def ignore?
-        @config.gem_disabled?
+        @config.gem_disabled? || health_check_request?(@env)
+      end
+
+      def health_check_request?(env = @env)
+        # Ignore health check endpoints that don't go through Traefik
+        # These typically come from Kubernetes liveness/readiness probes
+        path = env["PATH_INFO"] || env["REQUEST_PATH"] || ""
+        path.match?(%r{/health_check|/health|/up|/ready|/live})
       end
 
       def queue_time

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

@@ -1,29 +1,69 @@
 # frozen_string_literal: true
 
 require "singleton"
+require "neetodeploy/autoscale/logger"
 
 module Neetodeploy
   module Rails
     class MetricsStore
       include Singleton
 
+      # Use sliding window: keep last 2 minutes of data (120 seconds)
+      # At 2s reporting interval, this gives us ~60 samples per window
+      # This ensures percentiles work correctly even with low traffic
+      WINDOW_SIZE_SECONDS = 120
+      MAX_SAMPLES = 1000  # Safety limit to prevent memory bloat
+
       attr_reader :metrics
 
       def initialize
-        @metrics = []
+        @metrics = []  # Array of {time: timestamp, value: queue_time}
         @mutex = Mutex.new
       end
 
       def push(queue_time)
         @mutex.synchronize do
-          @metrics << queue_time
+          now = Time.now.to_f
+          @metrics << { time: now, value: queue_time }
+          
+          # Remove old data outside window
+          cutoff = now - WINDOW_SIZE_SECONDS
+          @metrics.reject! { |m| m[:time] < cutoff }
+          
+          # Safety limit: keep only most recent samples
+          if @metrics.size > MAX_SAMPLES
+            @metrics = @metrics.last(MAX_SAMPLES)
+          end
+          
+          # Log high queue times to help debug
+          if queue_time > 500
+            NeetoDeploy::Logger.logger.debug("MetricsStore: Pushed high queue_time=#{queue_time}ms (total in window: #{@metrics.size})")
+          end
+        end
+      end
+
+      # Get recent samples from the sliding window (last N seconds)
+      def get_recent(seconds = WINDOW_SIZE_SECONDS)
+        @mutex.synchronize do
+          cutoff = Time.now.to_f - seconds
+          @metrics.select { |m| m[:time] >= cutoff }.map { |m| m[:value] }
         end
       end
 
+      # Flush: return all values in window, but DON'T clear (sliding window)
+      # This allows high values to persist across multiple reporting cycles
       def flush
         @mutex.synchronize do
-          result = @metrics
-          @metrics = []
+          # Clean up old data first
+          cutoff = Time.now.to_f - WINDOW_SIZE_SECONDS
+          @metrics.reject! { |m| m[:time] < cutoff }
+          
+          result = @metrics.map { |m| m[:value] }
+          size = result.size
+          max_val = result.max if result.any?
+          NeetoDeploy::Logger.logger.debug("MetricsStore: Reporting from sliding window: #{size} values, max=#{max_val}ms") if result.any?
+          
+          # Return values but keep them in the window for next cycle
           result
         end
       end

data/lib/neetodeploy/autoscale/version.rb

@@ -2,6 +2,6 @@
 
 module Neetodeploy
   module Autoscale
-    VERSION = "2.1.2"
+    VERSION = "2.1.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neetodeploy-autoscale
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors:
 - Sreeram Venkitesh