judoscale-rails 1.10.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8126459482ea24a61ab251dc19235c8c52f3087d9104ff68d1442e4fb73d4698
-  data.tar.gz: 3a25a9b8ced78ffdb8d21351085ccadfb533ecddda22b735b37c8d278977e88d
+  metadata.gz: 2c29391e2e1f325012b0a1597aa45800f4087bef039772e47bd2d06c91ea62ac
+  data.tar.gz: ed8f5d30b36a4241365a4cda20bc37960db8412f877af0a6d2848134ac6e30ff
 SHA512:
-  metadata.gz: b23c16010590b9270a1b1369e95b64eac963993391dfeb415a7e37544d2c06e199d562014b4aa9226087a5ae34c38ae60ba43d59e9455efa60789e71bcc4046c
-  data.tar.gz: a3af90edce5f9b7124dea6d4e599f2c1543f6655fe50cfe341ece06e15e9dd4738671f0886270fd2dd5f791165924018a3cd86da89c789ae4fab3cd861c81a8a
+  metadata.gz: c7ddebe2f73ba2f2848f7c998c9d03d452fba53dbf9149fee9240ae9d1a5db984a9c8a6187608bf5d38c0cf9a0f51fe832a2309d4317d01678b87c1bb47a657b
+  data.tar.gz: caecc435343f2db8606a20f2c22651f609103df1a21b93cbb080f6db886edb71843ddc68c4cb4f78ede83945ded3aa119564dd7c61faf11da5608355c3f099ad

data/lib/judoscale/rails/config.rb

@@ -3,12 +3,15 @@ require "judoscale/config"
 module Judoscale
   module Rails
     module Config
-      attr_accessor :start_reporter_after_initialize, :rake_task_ignore_regex
+      attr_accessor :start_reporter_after_initialize, :rake_task_ignore_regex, :utilization_enabled, :utilization_interval
 
       def reset
         super
         @start_reporter_after_initialize = true
         @rake_task_ignore_regex = /assets:|db:/
+
+        @utilization_enabled = ENV["JUDOSCALE_UTILIZATION_ENABLED"] == "true"
+        @utilization_interval = (ENV["JUDOSCALE_UTILIZATION_INTERVAL"] || 1.0).to_f
       end
     end
 

data/lib/judoscale/rails/railtie.rb

@@ -1,15 +1,21 @@
 # frozen_string_literal: true
 
 require "rails"
-require "rails/railtie"
+require "rails/engine"
 require "judoscale/request_middleware"
 require "judoscale/rails/config"
+require "judoscale/rails/utilization_middleware"
 require "judoscale/logger"
 require "judoscale/reporter"
 
 module Judoscale
   module Rails
-    class Railtie < ::Rails::Railtie
+    # Inherit from `Engine`, even though we use none its specific features (yet), so we can safely rely
+    # on `load_config_initializers` to setup our initializers and avoid loading `config/initializers/*`
+    # too early, otherwise we can run into initialization order conflicts with other libraries like
+    # `Sentry` and `Scout`, which patch Ruby classes in different ways (`prepend` vs `alias_method`),
+    # and may cause `stack level too deep` errors if they are loaded too early in the init process.
+    class Railtie < ::Rails::Engine
       include Judoscale::Logger
 
       def in_rails_console_or_runner?
@@ -27,14 +33,20 @@ module Judoscale
         ::Judoscale::Config.instance
       end
 
-      initializer "Judoscale.logger" do |app|
+      initializer "judoscale.logger" do |app|
         judoscale_config.logger = ::Rails.logger
       end
 
-      initializer "Judoscale.request_middleware" do |app|
+      initializer "judoscale.request_middleware" do |app|
         app.middleware.insert_before Rack::Runtime, RequestMiddleware
       end
 
+      initializer "judoscale.utilization_middleware", after: :load_config_initializers do |app|
+        if judoscale_config.utilization_enabled
+          app.middleware.insert_before RequestMiddleware, UtilizationMiddleware, interval: judoscale_config.utilization_interval
+        end
+      end
+
       config.after_initialize do
         if in_rails_console_or_runner?
           logger.debug "No reporting since we're in a Rails console or runner process"

data/lib/judoscale/rails/utilization_middleware.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require "singleton"
+require "concurrent"
+require "judoscale/metrics_store"
+
+module Judoscale
+  module Rails
+    class UtilizationMiddleware
+      def initialize(app, interval:)
+        @app = app
+        @interval = interval
+      end
+
+      def call(env)
+        tracker = UtilizationTracker.instance
+        tracker.start!(interval: @interval)
+        tracker.incr
+
+        @app.call(env)
+      ensure
+        tracker.decr
+      end
+    end
+
+    class UtilizationTracker
+      include Singleton
+
+      def initialize
+        @active_request_counter = Concurrent::AtomicFixnum.new(0)
+        @thread_ref = Concurrent::AtomicReference.new(nil)
+      end
+
+      def start!(interval:)
+        @thread_ref.update do |current_thread|
+          next current_thread if current_thread&.alive?
+
+          Thread.new do
+            # Advise multi-threaded app servers to ignore this thread for the purposes of fork safety warnings.
+            Thread.current.thread_variable_set(:fork_safe, true)
+
+            loop do
+              sleep interval
+              track_current_state
+            end
+          end
+        end
+      end
+
+      def incr
+        @active_request_counter.increment
+      end
+
+      def decr
+        @active_request_counter.decrement
+      end
+
+      def track_current_state
+        active_requests = @active_request_counter.value
+        active_processes = (active_requests > 0) ? 1 : 0
+        time = Time.now.utc
+
+        MetricsStore.instance.tap do |store|
+          store.push :pu, active_processes, time # pu = process utilization
+          store.push :ru, active_requests, time  # ru = request utilization
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: judoscale-rails
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Adam McCrea
 - Carlos Antonio da Silva
 - Jon Sullivan
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: judoscale-ruby
@@ -18,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email:
 - hello@judoscale.com
 executables: []
@@ -51,6 +49,7 @@ files:
 - lib/judoscale/rails.rb
 - lib/judoscale/rails/config.rb
 - lib/judoscale/rails/railtie.rb
+- lib/judoscale/rails/utilization_middleware.rb
 homepage: https://judoscale.com
 licenses:
 - MIT
@@ -60,7 +59,6 @@ metadata:
   documentation_uri: https://judoscale.com/docs
   changelog_uri: https://github.com/judoscale/judoscale-ruby/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/judoscale/judoscale-ruby
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -75,8 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Autoscaling for Ruby on Rails applications.
 test_files: []