judoscale-ruby 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34e63423106d499e2a555bf9343d38224e1eeb1e4f2fa2177d532ff33df3de81
-  data.tar.gz: 7efed4c6de8f587dac09c10ede982a67f73aba88e6ffeb3275db19dc968f1df7
+  metadata.gz: a50732023524ca7f75f8a387dfde1cbd6080a43dbd102b45e2a6d0ab38a25e77
+  data.tar.gz: 82e3711577f958ffec7e5f9d8f56532381c1b3f56580c3657cda358028e6a01e
 SHA512:
-  metadata.gz: 2858316d5ec92aaca9b448a30699fb64dae7a970a97bf3bd4e54437d5ed5877782efd2b2c698e7c45e5f1c122b652c6463d26e98349c248cf580869bea974aa6
-  data.tar.gz: 659d23cad27612aff9c3653890758a40a315eaea4e3d319cbb0d36ada38568a00168e13601220ef06dcec7ed49dec325accd1fb844924665e031d7e32bfd4fa4
+  metadata.gz: 882aa3493ddf82b6af7c2a87700ada4f77a2b7f194cfc5663ff8b01da52ed2d088f820c611511f5642646d2f1be448f66d7bb7cfb416c6de7a6209f931e8212f
+  data.tar.gz: 30fa41c0e79a84c550dd6b9802167965b2650a73c97e3426576c9794dc743fd7a2000d08e919d4a5aa7132cbdc698c89bec99b4a105583a99c32966ae99fab60

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: judoscale-ruby
 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: