judoscale-ruby 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34e63423106d499e2a555bf9343d38224e1eeb1e4f2fa2177d532ff33df3de81
-  data.tar.gz: 7efed4c6de8f587dac09c10ede982a67f73aba88e6ffeb3275db19dc968f1df7
+  metadata.gz: 5e8936dd7c732f65718653a778b6434e318dc5f32dec8210c2ac70d86065757b
+  data.tar.gz: 0f8fcec57301d504673d13d8c0af45f1f269d20dfcd1f7a4c40242faae0aa616
 SHA512:
-  metadata.gz: 2858316d5ec92aaca9b448a30699fb64dae7a970a97bf3bd4e54437d5ed5877782efd2b2c698e7c45e5f1c122b652c6463d26e98349c248cf580869bea974aa6
-  data.tar.gz: 659d23cad27612aff9c3653890758a40a315eaea4e3d319cbb0d36ada38568a00168e13601220ef06dcec7ed49dec325accd1fb844924665e031d7e32bfd4fa4
+  metadata.gz: d7f104f4d7bdda5123493df3481619982cbe81c3ccdd455c9e73ac5a7a643fed4f2b6af55db0b898f8675ee2d11684e5aa4d1511c89565ab41c184f17adfd246
+  data.tar.gz: b7480e12b5e6e06814a5838c912c1109f56f536dabe5674438cf11cc7b41b2c6a01253633b00c90ca3b4575f3c0bdad0cfa50878c31ac8deb3e873be479d9168

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, :allow_rake_tasks
+      :max_request_size_bytes, :logger, :log_tag, :current_runtime_container
     attr_reader :log_level
 
     def initialize
@@ -77,7 +77,6 @@ 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)

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

@@ -6,7 +6,11 @@ require "logger"
 module Judoscale
   module Logger
     def logger
-      @logger ||= LoggerProxy.new(Config.instance.logger, Config.instance.log_level)
+      if @logger && @logger.log_level == Config.instance.log_level
+        @logger
+      else
+        @logger = LoggerProxy.new(Config.instance.logger, Config.instance.log_level)
+      end
     end
   end
 

data/lib/judoscale/metric.rb

@@ -5,7 +5,7 @@ module Judoscale
     # No queue_name is assumed to be a web request metric
     # Metrics: qt = queue time (default), qd = queue depth, busy
     def initialize(identifier, value, time, queue_name = nil)
-      super identifier, value.to_i, time.utc, queue_name
+      super(identifier, value.to_i, time.utc, queue_name)
     end
   end
 end

data/lib/judoscale/metrics_collector.rb

@@ -3,22 +3,11 @@
 module Judoscale
   class MetricsCollector
     def self.collect?(config)
-      in_rake_task = defined?(::Rake) && Rake.respond_to?(:application) && Rake.application.top_level_tasks.any?
-
-      !in_rake_task || in_whitelisted_rake_tasks?(config.allow_rake_tasks)
+      true
     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

@@ -19,25 +19,24 @@ module Judoscale
     def start!(config, adapters)
       @pid = Process.pid
 
-      if !config.api_base_url
+      if config.api_base_url.nil? || config.api_base_url.strip.empty?
         logger.debug "Set api_base_url to enable metrics reporting"
         return
       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)
+        adapter.metrics_collector&.collect?(config)
       }
       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)
@@ -73,17 +72,26 @@ module Judoscale
       @_thread&.terminate
       @_thread = nil
       @pid = nil
+      @reported = false
     end
 
     private
 
     def report(config, metrics)
+      # Make sure we report at least once, even if there are no metrics,
+      # so Judoscale knows the adapter is installed and running.
+      if @reported && metrics.empty?
+        logger.debug "No metrics to report - skipping"
+        return
+      end
+
       report = Report.new(Judoscale.adapters, config, metrics)
       logger.info "Reporting #{report.metrics.size} metrics"
       result = AdapterApi.new(config).report_metrics(report.as_json)
 
       case result
       when AdapterApi::SuccessResponse
+        @reported = true
         logger.debug "Reported successfully"
       when AdapterApi::FailureResponse
         logger.error "Reporter failed: #{result.failure_message}"

data/lib/judoscale/version.rb

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

data/lib/judoscale-ruby.rb

@@ -20,7 +20,7 @@ module Judoscale
     attr_reader :adapters
   end
 
-  Adapter = Struct.new(:identifier, :adapter_info, :metrics_collector) do
+  class Adapter < Struct.new(:identifier, :adapter_info, :metrics_collector)
     def as_json
       {identifier => adapter_info}
     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.3
 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: 2024-01-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -20,7 +20,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - Rakefile
 - judoscale-ruby.gemspec
 - lib/judoscale-ruby.rb

data/Gemfile.lock

@@ -1,48 +0,0 @@
-PATH
-  remote: .
-  specs:
-    judoscale-ruby (1.5.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
-    crack (0.4.5)
-      rexml
-    debug (1.7.1)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
-    hashdiff (1.0.1)
-    io-console (0.6.0)
-    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)
-      io-console (~> 0.5)
-    rexml (3.2.5)
-    webmock (3.18.1)
-      addressable (>= 2.8.0)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-
-PLATFORMS
-  arm64-darwin-20
-  arm64-darwin-21
-  arm64-darwin-22
-  x86_64-darwin-21
-  x86_64-linux
-
-DEPENDENCIES
-  debug
-  judoscale-ruby!
-  minitest
-  minitest-stub-const
-  rake (>= 12.3.3)
-  webmock
-
-BUNDLED WITH
-   2.3.9