judoscale-rails 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5af8c7881148adca3b0b924b30918cc0a99962c71d02c54b4ea66a19313c3845
-  data.tar.gz: 061baca32fd8dc5f05ff67524e7147d9cb803c9a3966935ff764141215a2d382
+  metadata.gz: cd84a96b80ba7ac1ad9e1fbfd1150e3046c6a0985f4eb9aa947a85018d6fb11b
+  data.tar.gz: 6ff5e46eb8ef7733b883348cea95bdf4cb014e030993428aa7d565f21a76ddbf
 SHA512:
-  metadata.gz: 58163866506c2ef25a3306a344f96ffa41ce83c8d3802e249b4914601e2787eb160e3509507c10bd73da6a86fbde08212547875f7239526bb3fcc95aa0da7da8
-  data.tar.gz: 3de499c651b8744a05911834bcc40a85340ea2c4b6cbe7f480c6afd126bf5cc21996563b2e85c57109015c5f1e4a4be57fa4d2860f633891b72c84067c7b5f36
+  metadata.gz: fe7ed89ede18c54380c6e86d16a18f71196200f018c4c679b6a4af85b49df8f6ce096310233fecf200f3777b03ffeffc80f8fbbcaf7a0ab9b7aeb11eded5996b
+  data.tar.gz: 3a518c809357e5323d599982987d158368bd480ae0be3153cf82ff710d62e9485c57e367b3583a038e5a6fcfe619906777fc31d7d3366d2e5aa895ef56e82c21

data/lib/judoscale/rails/config.rb

@@ -3,15 +3,12 @@ require "judoscale/config"
 module Judoscale
   module Rails
     module Config
-      attr_accessor :start_reporter_after_initialize, :rake_task_ignore_regex, :utilization_enabled, :utilization_interval
+      attr_accessor :start_reporter_after_initialize, :rake_task_ignore_regex
 
       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,16 +1,20 @@
 # 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?
@@ -36,12 +40,6 @@ module Judoscale
         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"

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: judoscale-rails
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Adam McCrea
 - Carlos Antonio da Silva
 - Jon Sullivan
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-28 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.11.0
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 - !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,7 +49,6 @@ 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
@@ -61,7 +58,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
@@ -76,8 +72,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.9
 specification_version: 4
 summary: Autoscaling for Ruby on Rails applications.
 test_files: []

data/lib/judoscale/rails/utilization_middleware.rb

@@ -1,70 +0,0 @@
-# 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