rails-autoscale-core 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aea9f97efeaa39ee58923722220094d45ee721e925064f9f344e442cf839e10b
-  data.tar.gz: 2eb632696c60647be6af0023e3202007d1ef045f26a07ecc7d84b33db108efc6
+  metadata.gz: 03aadf04a101c5dfdaf9a715a25f36d3304943833c4feeba551c11645590418c
+  data.tar.gz: 8e46c89f87301ff458ae77640ebf1dad10abf53ffde7110448d4c6c6ffafd5c0
 SHA512:
-  metadata.gz: 80b2d814748d4ec90fce53a11f98a22e6ba4c17135798188742ce0b1b8a5a8ed5f4231ced13df03ce19fde892423e965ada294e287696b9d903860c178f562f4
-  data.tar.gz: d12cde36b76a75f737b1a1aab3e2959ab318e93c461680532905868de7d4a31503e401ae8544d989a2f2a5e3bdef3bd33854711220405ddd5815244ecc51bc52
+  metadata.gz: 1a754daf2618a1e9d7a7dadd773b798493ecdbbfc27882231df528170ffa44e159941bd7f52ecf1878df53e50291abd9b00aafbe8938ae3f263aa1accb4fa700
+  data.tar.gz: f3b11817285f7afbc3c656419d06f797d75f829ec329cd6a526ec51ea2322fb4a060e3d9fe4c827eb89e03b99fc58999d01f794308d0aead18013b81cbded9db

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    judoscale-ruby (1.5.1)
+    judoscale-ruby (1.5.2)
 
 GEM
   remote: https://rubygems.org/

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/metrics_collector.rb

@@ -4,8 +4,9 @@ module Judoscale
   class MetricsCollector
     def self.collect?(config)
       in_rake_task = defined?(::Rake) && Rake.respond_to?(:application) && Rake.application.top_level_tasks.any?
+      in_generator = defined?(::Rails::Command::GenerateCommand)
 
-      !in_rake_task || in_whitelisted_rake_tasks?(config.allow_rake_tasks)
+      !in_generator && (!in_rake_task || in_whitelisted_rake_tasks?(config.allow_rake_tasks))
     end
 
     def collect

data/lib/judoscale/reporter.rb

@@ -25,19 +25,20 @@ module Judoscale
       end
 
       enabled_adapters, skipped_adapters = adapters.partition { |adapter|
-        # judoscale-ruby adapter does not have a metrics collector
-        adapter.metrics_collector.nil? || adapter.metrics_collector.collect?(config)
+        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?
-        adapters_msg = skipped_adapters.map(&:identifier).join(", ")
         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 (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.1"
+  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.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Adam McCrea
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: