rails-autoscale-core 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a22cddac1042235674c4791e42efaefc877d395b1f30d1be5cd41eea9f305e8
-  data.tar.gz: 40881260d060de8799c14ce08142eb6e3d524bc5f91f36157d3a5e4879e32e47
+  metadata.gz: 03aadf04a101c5dfdaf9a715a25f36d3304943833c4feeba551c11645590418c
+  data.tar.gz: 8e46c89f87301ff458ae77640ebf1dad10abf53ffde7110448d4c6c6ffafd5c0
 SHA512:
-  metadata.gz: 8cc88cc9824d09c1b4066d02ebf0dd8c8af4605e3d2fa2949523248494064f3f70fdf25e151674b85b6a71b3badeb7a8ddeb93c4cf00cb2d74db136f53817d49
-  data.tar.gz: ab01d857a7a2b9c244cced61071ac265e2a07929cba1042108f01b40af9fba182f5817bd877ef727ff6c6123528a28a1170ce559495f4d9fb3bd4630efcabde0
+  metadata.gz: 1a754daf2618a1e9d7a7dadd773b798493ecdbbfc27882231df528170ffa44e159941bd7f52ecf1878df53e50291abd9b00aafbe8938ae3f263aa1accb4fa700
+  data.tar.gz: f3b11817285f7afbc3c656419d06f797d75f829ec329cd6a526ec51ea2322fb4a060e3d9fe4c827eb89e03b99fc58999d01f794308d0aead18013b81cbded9db

data/Gemfile

@@ -4,5 +4,6 @@ gemspec name: "judoscale-ruby"
 
 gem "rake", ">= 12.3.3"
 gem "minitest"
+gem "minitest-stub-const"
 gem "webmock"
 gem "debug"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    judoscale-ruby (1.5.0)
+    judoscale-ruby (1.5.2)
 
 GEM
   remote: https://rubygems.org/
@@ -18,6 +18,7 @@ GEM
     irb (1.6.2)
       reline (>= 0.3.0)
     minitest (5.17.0)
+    minitest-stub-const (0.6)
     public_suffix (5.0.1)
     rake (13.0.6)
     reline (0.3.2)
@@ -39,6 +40,7 @@ DEPENDENCIES
   debug
   judoscale-ruby!
   minitest
+  minitest-stub-const
   rake (>= 12.3.3)
   webmock
 

data/lib/judoscale/config.rb

@@ -65,7 +65,7 @@ module Judoscale
     end
 
     attr_accessor :api_base_url, :report_interval_seconds,
-      :max_request_size_bytes, :logger, :log_tag, :current_runtime_container
+      :max_request_size_bytes, :logger, :log_tag, :current_runtime_container, :allow_rake_tasks
     attr_reader :log_level
 
     def initialize
@@ -77,6 +77,7 @@ module Judoscale
       @log_tag = "Judoscale"
       @max_request_size_bytes = 100_000 # ignore request payloads over 100k since they skew the queue times
       @report_interval_seconds = 10
+      @allow_rake_tasks = []
 
       self.log_level = ENV["JUDOSCALE_LOG_LEVEL"] || ENV["RAILS_AUTOSCALE_LOG_LEVEL"]
       @logger = ::Logger.new($stdout)
@@ -86,7 +87,9 @@ module Judoscale
       if ENV["RENDER_INSTANCE_ID"]
         instance = ENV["RENDER_INSTANCE_ID"].delete_prefix(ENV["RENDER_SERVICE_ID"]).delete_prefix("-")
         @current_runtime_container = RuntimeContainer.new instance
-        @api_base_url ||= "https://adapter.judoscale.com/api/#{ENV["RENDER_SERVICE_ID"]}"
+        # Allow a custom API base URL to be set for Render (for testing)
+        @api_base_url ||= "https://adapter.judoscale.com/api"
+        @api_base_url += "/#{ENV["RENDER_SERVICE_ID"]}"
       elsif ENV["DYNO"]
         @current_runtime_container = RuntimeContainer.new ENV["DYNO"]
       elsif (metadata_uri = ENV["ECS_CONTAINER_METADATA_URI"])

data/lib/judoscale/job_metrics_collector/active_record_helper.rb

@@ -12,6 +12,13 @@ module Judoscale
         sql
       end
 
+      # This will respect a multiple-database setup, unlike the `table_exists?` method.
+      def self.table_exists_for_model?(model)
+        model.connection.schema_cache.data_source_exists?(model.table_name)
+      rescue ActiveRecord::NoDatabaseError
+        false
+      end
+
       def self.table_exists?(table_name)
         ::ActiveRecord::Base.connection.table_exists?(table_name)
       rescue ActiveRecord::NoDatabaseError

data/lib/judoscale/job_metrics_collector.rb

@@ -9,7 +9,7 @@ module Judoscale
     include Judoscale::Logger
 
     def self.collect?(config)
-      !config.current_runtime_container.redundant_instance? && adapter_config.enabled
+      super && !config.current_runtime_container.redundant_instance? && adapter_config.enabled
     end
 
     def self.adapter_name

data/lib/judoscale/metrics_collector.rb

@@ -3,11 +3,23 @@
 module Judoscale
   class MetricsCollector
     def self.collect?(config)
-      true
+      in_rake_task = defined?(::Rake) && Rake.respond_to?(:application) && Rake.application.top_level_tasks.any?
+      in_generator = defined?(::Rails::Command::GenerateCommand)
+
+      !in_generator && (!in_rake_task || in_whitelisted_rake_tasks?(config.allow_rake_tasks))
     end
 
     def collect
       []
     end
+
+    def self.in_whitelisted_rake_tasks?(allowed_rake_tasks)
+      # Get the tasks that were invoked from the command line.
+      tasks = Rake.application.top_level_tasks
+
+      allowed_rake_tasks.any? do |task_regex|
+        tasks.any? { |task| task =~ task_regex }
+      end
+    end
   end
 end

data/lib/judoscale/reporter.rb

@@ -20,23 +20,26 @@ module Judoscale
       @pid = Process.pid
 
       if !config.api_base_url
-        logger.debug "Reporter not started: JUDOSCALE_URL is not set"
+        logger.debug "Set api_base_url to enable metrics reporting"
         return
       end
 
-      enabled_adapters = adapters.select { |adapter|
-        adapter.metrics_collector.nil? || adapter.metrics_collector.collect?(config)
+      enabled_adapters, skipped_adapters = adapters.partition { |adapter|
+        if adapter.metrics_collector&.collect?(config)
+          adapter.enabled = true
+        end
       }
       metrics_collectors_classes = enabled_adapters.map(&:metrics_collector)
-      metrics_collectors_classes.compact!
+      adapters_msg = enabled_adapters.map(&:identifier).concat(
+        skipped_adapters.map { |adapter| "#{adapter.identifier}[skipped]" }
+      ).join(", ")
 
       if metrics_collectors_classes.empty?
-        logger.debug "Reporter not started: no metrics need to be collected in this process"
+        logger.debug "No metrics need to be collected (adapters: #{adapters_msg})"
         return
       end
 
-      adapters_msg = enabled_adapters.map(&:identifier).join(", ")
-      logger.info "Reporter starting, will report every #{config.report_interval_seconds} seconds or so. Adapters: [#{adapters_msg}]"
+      logger.info "Reporter starting, will report every ~#{config.report_interval_seconds} seconds (adapters: #{adapters_msg})"
 
       metrics_collectors = metrics_collectors_classes.map(&:new)
 

data/lib/judoscale/version.rb

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

data/lib/judoscale-ruby.rb

@@ -20,9 +20,18 @@ module Judoscale
     attr_reader :adapters
   end
 
-  Adapter = Struct.new(:identifier, :adapter_info, :metrics_collector) do
+  class Adapter < Struct.new(:identifier, :adapter_info, :metrics_collector)
+    attr_accessor :enabled
+
+    def initialize(identifier, adapter_info, metrics_collector)
+      super
+      self.enabled = false
+    end
+
     def as_json
-      {identifier => adapter_info}
+      {
+        identifier => adapter_info.merge(enabled: enabled)
+      }
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-autoscale-core
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Adam McCrea
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-21 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: