neetodeploy-autoscale 2.0.9 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5064a81417af764a12450cf56db7a8dd1e6b15c784536808ffcb84be9603b255
-  data.tar.gz: d2bcff1b1bc78f3dc00996c3149d3cba1bd25b78bfbfc6ef8f08e66357464068
+  metadata.gz: 6fbdfc1d87b0053e4b1eb596ed2f5e80ab399d4594d7fb15dcb728cafb6d37ea
+  data.tar.gz: 04d5cb5480ee7f19eaba0aad33d3b3ebf8e1b92b467d360ddf1ec46d72556766
 SHA512:
-  metadata.gz: 738f8a948ac3a6767b200c41fe4175a17e5a57c253931cc50c0cc875115a9bc9decfe0851a28933254928107c7f7993b2825c735649f565d83358891bbe12acb
-  data.tar.gz: d631a416a5c2e441545081db9545eca86ebe52756e273bb6124083b05d77c9a4a5d8225f2bf80a5d951752fcb148b102fd182fd87a6f733fb4c0c5299c6a1613
+  metadata.gz: c70e22b853a98d042e1d3d5648b39c17c6a3fa090f6d61cfdb29978f4983c42cce612766c1728e19f0c4fecd1060262bfa5ded2dfcb2626470c5814f7fe9f8e5
+  data.tar.gz: f39de77eb99413829323bd4d9f1f0f7874f21804bda4e23c3dfa763ca0e41e3992b2ed7d359cf7a4ee8128106f8e1d27686f69e5de14449829bafe43ea0aeaec

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

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 require "neetodeploy/autoscale/config"
+require "neetodeploy/autoscale/logger"
 
 module Neetodeploy
   module Rails
     class Metrics
       def initialize(env, config = Config.instance)
         @config = config
-        @request_start_header = env["HTTP_X_REQUEST_START"].to_i
+        @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
       end
 
@@ -16,13 +18,26 @@ module Neetodeploy
       end
 
       def queue_time
-        return if @request_start_header.zero?
+        # Debug: Log if header is missing or invalid
+        if @request_start_header_raw.nil? || @request_start_header_raw.empty?
+          NeetoDeploy::Logger.logger.debug("X-Request-Start header missing or empty")
+          return nil
+        end
+
+        return nil if @request_start_header.zero?
 
         time_now = Time.now.to_f * 1000
 
         queue_time = (time_now - @request_start_header).round
         queue_time -= @network_time
 
+        # Log both values for debugging
+        NeetoDeploy::Logger.logger.debug(
+          "Queue time calculation: X-Request-Start=#{@request_start_header_raw} (#{@request_start_header}ms), " \
+          "puma.request_body_wait=#{@network_time}ms, time_now=#{time_now.round}ms, " \
+          "calculated_queue_time=#{queue_time}ms"
+        )
+
         queue_time.positive? ? queue_time : nil
       end
     end

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

@@ -74,11 +74,20 @@ module Neetodeploy
         sorted_data = data.sort
         size = sorted_data.size
 
+        # Calculate percentiles
+        p90 = percentile_value(sorted_data, size, 0.90)
+        p95 = percentile_value(sorted_data, size, 0.95)
+        p99 = percentile_value(sorted_data, size, 0.99)
+        avg = data.sum / data.size
+
+        # Log sample size and values for debugging
+        logger.debug("Calculated metrics from #{size} samples: avg=#{avg}, p90=#{p90}, p95=#{p95}, p99=#{p99}")
+
         metrics = [
-          { metric_name: "queue_time_p90", metric_value: percentile_value(sorted_data, size, 0.90) },
-          { metric_name: "queue_time_p95", metric_value: percentile_value(sorted_data, size, 0.95) },
-          { metric_name: "queue_time_p99", metric_value: percentile_value(sorted_data, size, 0.99) },
-          { metric_name: "queue_time", metric_value: data.sum / data.size }
+          { metric_name: "queue_time_p90", metric_value: p90 },
+          { metric_name: "queue_time_p95", metric_value: p95 },
+          { metric_name: "queue_time_p99", metric_value: p99 },
+          { metric_name: "queue_time", metric_value: avg }
         ]
 
         Reporter.report_batch(metrics, "web", nil, config)
@@ -90,7 +99,11 @@ module Neetodeploy
       end
 
       def percentile_value(sorted_data, size, percentile)
+        # Use nearest rank method: index = ceil(size * percentile) - 1
+        # For small samples, this ensures we get a valid index
         index = [(size * percentile).ceil - 1, 0].max
+        # Clamp index to valid range
+        index = [index, size - 1].min
         sorted_data[index]
       end
 

data/lib/neetodeploy/autoscale/reporter.rb

@@ -28,9 +28,9 @@ module Neetodeploy
       return if metrics.empty?
 
       payload = build_batch_payload(metrics, process_type, queue_name, config)
-      url = config.batch_processing_enabled? ? config.metrics_server_batch_url : config.metrics_server_url
+      url = config.metrics_server_batch_url
       
-      logger.info("Batch reporting #{metrics.size} metrics for #{process_type}")
+      NeetoDeploy::Logger.logger.info("Batch reporting #{metrics.size} metrics for #{process_type}")
       post_batch_request(url, payload, config)
     end
 
@@ -68,12 +68,12 @@ module Neetodeploy
       def self.post_batch_request(url, payload, config)
         uri = URI.parse(url)
         request = build_post_request(uri, config.metrics_server_auth_token)
-        request.body = encode_form_data(payload)
-        request["Content-Type"] = "application/x-www-form-urlencoded"
+        request.body = JSON.generate(payload)
+        request["Content-Type"] = "application/json"
         
         http_request(uri, request)
       rescue StandardError => e
-        logger.error("Error batch reporting metrics: #{e.message}")
+        NeetoDeploy::Logger.logger.error("Error batch reporting metrics: #{e.message}")
         raise
       end
 

data/lib/neetodeploy/autoscale/version.rb

@@ -2,6 +2,6 @@
 
 module Neetodeploy
   module Autoscale
-    VERSION = "2.0.9"
+    VERSION = "2.1.1"
   end
 end

metadata

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