judoscale-ruby 1.9.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89e1c234767f82a457f3e3d9ddc185fb7229e0f4e8de84fd9861c51c07e27b9c
-  data.tar.gz: 3f899a16cb1454e3720468702db0401c17f684a5b8d7263b3830e97038cfea37
+  metadata.gz: 92983f008bba242830346f573d60a9c7302c794cac38afbc0e78b359e4dd09e2
+  data.tar.gz: 0c7971f58dab5fa1c17b43e14f25db639d5d81b2b0b2dc60e123e6951f0f645c
 SHA512:
-  metadata.gz: 8183357c4717a609224e3bf8a15ef567d19e71d1b5de1027faa25e0480af7870eb44290a02929352a29d1c5b8581345218cc1bdd264ccf5cdf91eae0e5fa5ede
-  data.tar.gz: 71b1c714b3c1979394d39237873c28f40c2881151c53fac0f23a42d225686d3f76f31a10bbf792d6f31aac0e40a6d2e32eb064bb156cbbb9aeee9fa92a29dfc5
+  metadata.gz: f5452b651fe1582de5c6ae1c96f78738b30d2090635df3701a1e8d987f19ac0c6d9cb6a408cafcea62e0208616a5a11680919cb42695ef01023887980a4fa71c
+  data.tar.gz: c63a089e0f391605166f7c65b2b0afd457bb05fde10a7c9cd1a1cf67641f67721f5a08f5005c38b8057ac4a7877738917506b2e724ff40a728263613f70f6888

data/lib/judoscale/config.rb

@@ -35,8 +35,8 @@ module Judoscale
         @queue_filter = DEFAULT_QUEUE_FILTER
 
         # Support for deprecated legacy env var configs.
-        @max_queues = (ENV["RAILS_AUTOSCALE_MAX_QUEUES"] || 20).to_i
-        self.track_busy_jobs = ENV["RAILS_AUTOSCALE_LONG_JOBS"] == "true"
+        @max_queues = (ENV["JUDOSCALE_MAX_QUEUES"] || ENV["RAILS_AUTOSCALE_MAX_QUEUES"] || 20).to_i
+        self.track_busy_jobs = (ENV["JUDOSCALE_LONG_JOBS"] || ENV["RAILS_AUTOSCALE_LONG_JOBS"]) == "true"
       end
 
       def track_busy_jobs=(value)
@@ -105,6 +105,8 @@ module Judoscale
         elsif ENV.include?("ECS_CONTAINER_METADATA_URI")
           instance = ENV["ECS_CONTAINER_METADATA_URI"].split("/").last
           RuntimeContainer.new instance
+        elsif ENV.include?("FLY_MACHINE_ID")
+          RuntimeContainer.new ENV["FLY_MACHINE_ID"]
         elsif ENV.include?("RAILWAY_REPLICA_ID")
           RuntimeContainer.new ENV["RAILWAY_REPLICA_ID"]
         else

data/lib/judoscale/request_metrics.rb

@@ -16,39 +16,12 @@ module Judoscale
       @request_start_header = env["HTTP_X_REQUEST_START"]
     end
 
-    def ignore?
-      @config.ignore_large_requests? && @size > @config.max_request_size_bytes
-    end
-
-    def started_at
-      if @request_start_header
-        # There are several variants of this header. We handle these:
-        #   - whole milliseconds (Heroku)
-        #   - whole microseconds (???)
-        #   - whole nanoseconds (Render)
-        #   - fractional seconds (NGINX)
-        #   - preceeding "t=" (NGINX)
-        value = @request_start_header.gsub(/[^0-9.]/, "").to_f
-
-        # `value` could be seconds, milliseconds, microseconds or nanoseconds.
-        # We use some arbitrary cutoffs to determine which one it is.
-
-        if value > NANOSECONDS_CUTOFF
-          Time.at(value / 1_000_000_000.0)
-        elsif value > MICROSECONDS_CUTOFF
-          Time.at(value / 1_000_000.0)
-        elsif value > MILLISECONDS_CUTOFF
-          Time.at(value / 1000.0)
-        else
-          Time.at(value)
-        end
-      end
+    def track_queue_time?
+      @request_start_header && !ignore_large_request?
     end
 
     def queue_time(now = Time.now)
-      return if started_at.nil?
-
-      queue_time = ((now - started_at) * 1000).to_i
+      queue_time = ((now.utc - started_at.utc) * 1000).to_i
 
       # Subtract the time Puma spent waiting on the request body, i.e. the network time. It's irrelevant to
       # capacity-related queue time. Without this, slow clients and large request payloads will skew queue time.
@@ -57,5 +30,42 @@ module Judoscale
       # Safeguard against negative queue times (should not happen in practice)
       (queue_time > 0) ? queue_time : 0
     end
+
+    def elapsed_time
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      response = yield
+      finish = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+      elapsed = ((finish - start) * 1000).to_i
+      [elapsed, response]
+    end
+
+    private
+
+    def ignore_large_request?
+      @config.ignore_large_requests? && @size > @config.max_request_size_bytes
+    end
+
+    def started_at
+      # There are several variants of this header. We handle these:
+      #   - whole milliseconds (Heroku)
+      #   - whole microseconds (???)
+      #   - whole nanoseconds (Render)
+      #   - fractional seconds (NGINX)
+      #   - preceeding "t=" (NGINX)
+      value = @request_start_header.gsub(/[^0-9.]/, "").to_f
+
+      # `value` could be seconds, milliseconds, microseconds or nanoseconds.
+      # We use some arbitrary cutoffs to determine which one it is.
+      if value > NANOSECONDS_CUTOFF
+        Time.at(value / 1_000_000_000.0)
+      elsif value > MICROSECONDS_CUTOFF
+        Time.at(value / 1_000_000.0)
+      elsif value > MILLISECONDS_CUTOFF
+        Time.at(value / 1000.0)
+      else
+        Time.at(value)
+      end
+    end
   end
 end

data/lib/judoscale/request_middleware.rb

@@ -15,30 +15,33 @@ module Judoscale
 
     def call(env)
       request_metrics = RequestMetrics.new(env)
+      store = MetricsStore.instance
+      time = Time.now.utc
 
-      unless request_metrics.ignore?
-        queue_time = request_metrics.queue_time
+      if request_metrics.track_queue_time?
+        queue_time = request_metrics.queue_time(time)
         network_time = request_metrics.network_time
-      end
-
-      Reporter.start
-
-      if queue_time
-        store = MetricsStore.instance
 
         # NOTE: Expose queue time to the app
         env["judoscale.queue_time"] = queue_time
-        store.push :qt, queue_time
+        store.push :qt, queue_time, time
 
         unless network_time.zero?
           env["judoscale.network_time"] = network_time
-          store.push :nt, network_time
+          store.push :nt, network_time, time
         end
 
         logger.debug "Request queue_time=#{queue_time}ms network_time=#{network_time}ms request_id=#{request_metrics.request_id} size=#{request_metrics.size}"
       end
 
-      @app.call(env)
+      Reporter.start
+
+      app_time, response = request_metrics.elapsed_time do
+        @app.call(env)
+      end
+      store.push :at, app_time, time
+
+      response
     end
   end
 end

data/lib/judoscale/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: judoscale-ruby
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Adam McCrea
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-17 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies: []
 description:
 email: