judoscale-ruby 1.11.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5192702406f23c78767bff7115e3712caf53fbe74264323d3193ea839a9a8eab
-  data.tar.gz: 7c4f8968de82974e5a539eb8ad5964299f085db57f65f1ef53a7e941b167578e
+  metadata.gz: b13782a2f01364bfe80c362bd11233f13b8cd4379a9621e6659d7f0f9ad27064
+  data.tar.gz: a9a720064114643c543cbfe440656c727fa5992af8f3eab73975ce13eeb79250
 SHA512:
-  metadata.gz: c81912b9118149029a6f20fc287da0474f7178d984db83b96ab09c304dc9f9e2283926238c0522e7e76e63ba45daebe688f89badb9c55f65f17609660fe8eedb
-  data.tar.gz: 9531db90b50b05ea4978ba4edbf6386c552f0468e2e33adbdaea74c457b9251952580bd37f978102e8c260a54d9427734c283e090c15b037c2b07bed1b4131ba
+  metadata.gz: 4faf24acdbdfd11067b9591488ba6508f244ba50e79e25bf1e927193472051554694c6189c965bc5f8a28de1733aee0c2ae08c989544463cc8ab6f492e734aa6
+  data.tar.gz: a2178ef9d030c007ef4380216a93a660bbfe638cf1ea7114b6b478dca779710e2fbfd2174cf455fc8df18f43a2035772a6504d4438645dc2ea5c91e418b0a49d

data/lib/judoscale/reporter.rb

@@ -50,11 +50,11 @@ module Judoscale
         Thread.current.thread_variable_set(:fork_safe, true)
 
         loop do
-          run_metrics_collection(config, metrics_collectors)
-
           # Stagger reporting to spread out reports from many processes
           multiplier = 1 - (rand / 4) # between 0.75 and 1.0
           sleep config.report_interval_seconds * multiplier
+
+          run_metrics_collection(config, metrics_collectors)
         end
       end
     end

data/lib/judoscale/request_middleware.rb

@@ -4,6 +4,7 @@ require "judoscale/metrics_store"
 require "judoscale/reporter"
 require "judoscale/logger"
 require "judoscale/request_metrics"
+require "judoscale/utilization_tracker"
 
 module Judoscale
   class RequestMiddleware
@@ -14,6 +15,10 @@ module Judoscale
     end
 
     def call(env)
+      tracker = UtilizationTracker.instance
+      tracker.start!
+      tracker.incr
+
       request_metrics = RequestMetrics.new(env)
       store = MetricsStore.instance
       time = Time.now.utc
@@ -42,6 +47,8 @@ module Judoscale
       store.push :at, app_time, time
 
       response
+    ensure
+      tracker.decr
     end
   end
 end

data/lib/judoscale/utilization_tracker.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+require "singleton"
+
+module Judoscale
+  class UtilizationTracker
+    include Singleton
+
+    def initialize
+      @mutex = Mutex.new
+      @active_request_counter = 0
+      @started = false
+    end
+
+    def start!
+      @mutex.synchronize do
+        unless started?
+          @started = true
+          init_idle_report_cycle!
+        end
+      end
+    end
+
+    def started?
+      @started
+    end
+
+    def incr
+      @mutex.synchronize do
+        if @active_request_counter == 0 && @idle_started_at
+          # We were idle and now we're not - add to total idle time
+          @total_idle_time += get_current_time - @idle_started_at
+          @idle_started_at = nil
+        end
+
+        @active_request_counter += 1
+      end
+    end
+
+    def decr
+      @mutex.synchronize do
+        @active_request_counter -= 1
+
+        if @active_request_counter == 0
+          # We're now idle - start tracking idle time
+          @idle_started_at = get_current_time
+        end
+      end
+    end
+
+    def utilization_pct(reset: true)
+      @mutex.synchronize do
+        current_time = get_current_time
+        idle_ratio = get_idle_ratio(current_time: current_time)
+
+        reset_idle_report_cycle!(current_time: current_time) if reset
+
+        ((1.0 - idle_ratio) * 100.0).to_i
+      end
+    end
+
+    private
+
+    def get_current_time
+      Process.clock_gettime Process::CLOCK_MONOTONIC
+    end
+
+    def init_idle_report_cycle!
+      current_time = get_current_time
+      @idle_started_at = current_time
+      reset_idle_report_cycle! current_time: current_time
+    end
+
+    def reset_idle_report_cycle!(current_time:)
+      @total_idle_time = 0.0
+      @report_cycle_started_at = current_time
+    end
+
+    def get_idle_ratio(current_time: get_current_time)
+      return 0.0 if @report_cycle_started_at.nil?
+
+      total_report_cycle_time = current_time - @report_cycle_started_at
+
+      return 0.0 if total_report_cycle_time <= 0
+
+      # Capture remaining idle time
+      if @idle_started_at
+        @total_idle_time += current_time - @idle_started_at
+        @idle_started_at = current_time
+      end
+
+      @total_idle_time / total_report_cycle_time
+    end
+  end
+end

data/lib/judoscale/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Judoscale
-  VERSION = "1.11.1"
+  VERSION = "1.12.0"
 end

data/lib/judoscale/web_metrics_collector.rb

@@ -2,11 +2,20 @@
 
 require "judoscale/metrics_collector"
 require "judoscale/metrics_store"
+require "judoscale/utilization_tracker"
 
 module Judoscale
   class WebMetricsCollector < MetricsCollector
     def collect
-      MetricsStore.instance.flush
+      metrics = MetricsStore.instance.flush
+
+      # Only report utilization if a request has already started the tracker
+      if UtilizationTracker.instance.started?
+        utilization_pct = UtilizationTracker.instance.utilization_pct
+        metrics.push Metric.new(:up, utilization_pct, Time.now)
+      end
+
+      metrics
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judoscale-ruby
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.12.0
 platform: ruby
 authors:
 - Adam McCrea
@@ -30,6 +30,7 @@ files:
 - lib/judoscale/reporter.rb
 - lib/judoscale/request_metrics.rb
 - lib/judoscale/request_middleware.rb
+- lib/judoscale/utilization_tracker.rb
 - lib/judoscale/version.rb
 - lib/judoscale/web_metrics_collector.rb
 homepage: https://judoscale.com
@@ -55,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Autoscaling for Ruby.
 test_files: []