rails_autoscale_agent 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f313cab3eefd93584c9d2484698d836ad19467b2e03cd26623003edcd1c64ad5
-  data.tar.gz: d8b33799b6dc0c2e92b6fbe770de41ac7e104a8d887965cf35538ea9ab6b8acb
+  metadata.gz: 36f5471f01400a8db00951513b7387150c370c92ed968b1e2aea3c752e4e5006
+  data.tar.gz: a113b0ca9936451db2a05aa3c0792f100938baf4c036f1f87100ef991155d880
 SHA512:
-  metadata.gz: 3208e51e66e87a9c5e076322c04f7f3594295d11ad2e5c16cdea5600372e02b70e50e15138788fe5d59a7d6854a8c59c908db5cdb28878386989c7e8fb2d9049
-  data.tar.gz: 1b771752c5fde1c3cd534a4ef2aca0e5917d3343d10e97cfb5fdb64a89f72cd5343e4662af281c214a35459cb77759f7c19b5110fd8bed979b54ffeff97a1de0
+  metadata.gz: aa7ef93dbcb9ab8341b2d7f313428c6bf75908f0e5db40987463f811f33c9577c99e404dad94e423cd752bd31edb1196bfa41b7ec5ec3c5841c917deaf53b09c
+  data.tar.gz: 59893c8b34924505d1d954a60422b7e3c81feec1933616ccee1a6f717f696e8263397f2b95b178c9c340831e5e4fb469310efe92739751489c32c5759514d5f4

data/lib/rails_autoscale_agent/reporter.rb

@@ -78,6 +78,7 @@ module RailsAutoscaleAgent
         config.max_request_size = result.data['max_request_size'] if result.data['max_request_size']
         worker_adapters_msg = worker_adapters.map { |a| a.class.name }.join(', ')
         logger.info "Reporter starting, will report every #{config.report_interval} seconds or so. Worker adapters: [#{worker_adapters_msg}]"
+        logger.warn "[DEPRECATION WARNING] rails_autoscale_agent is no longer maintained. Please switch to rails-autoscale-web as soon as possible."
       when AutoscaleApi::FailureResponse
         logger.error "Reporter failed to register: #{result.failure_message}"
       end

data/lib/rails_autoscale_agent/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsAutoscaleAgent
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/lib/rails_autoscale_agent/worker_adapters/delayed_job.rb

@@ -12,7 +12,7 @@ module RailsAutoscaleAgent
 
       def enabled?
         if defined?(::Delayed::Job) && defined?(::Delayed::Backend::ActiveRecord)
-          log_msg = String.new("DelayedJob enabled (#{::ActiveRecord::Base.default_timezone})")
+          log_msg = String.new("DelayedJob enabled (#{default_timezone})")
           log_msg << " with long-running job support" if track_long_running_jobs?
           logger.info log_msg
           true
@@ -30,7 +30,7 @@ module RailsAutoscaleAgent
           GROUP BY queue
         SQL
 
-        run_at_by_queue = Hash[select_rows(sql)]
+        run_at_by_queue = Hash[select_rows_silently(sql)]
 
         # Don't collect worker metrics if there are unreasonable number of queues
         if run_at_by_queue.size > Config.instance.max_queues
@@ -50,7 +50,7 @@ module RailsAutoscaleAgent
             GROUP BY 1
           SQL
 
-          busy_count_by_queue = Hash[select_rows(sql)]
+          busy_count_by_queue = Hash[select_rows_silently(sql)]
           self.queues = queues | busy_count_by_queue.keys
         end
 
@@ -88,6 +88,24 @@ module RailsAutoscaleAgent
         Config.instance.track_long_running_jobs
       end
 
+      def default_timezone
+        if ::ActiveRecord.respond_to?(:default_timezone)
+          # Rails >= 7
+          ::ActiveRecord.default_timezone
+        else
+          # Rails < 7
+          ::ActiveRecord::Base.default_timezone
+        end
+      end
+
+      def select_rows_silently(sql)
+        if ::ActiveRecord::Base.logger.respond_to?(:silence)
+          ::ActiveRecord::Base.logger.silence { select_rows(sql) }
+        else
+          select_rows(sql)
+        end
+      end
+
       def select_rows(sql)
         # This ensures the agent doesn't hold onto a DB connection any longer than necessary
         ActiveRecord::Base.connection_pool.with_connection { |c| c.select_rows(sql) }

data/lib/rails_autoscale_agent/worker_adapters/que.rb

@@ -20,7 +20,7 @@ module RailsAutoscaleAgent
 
       def enabled?
         if defined?(::Que)
-          logger.info "Que enabled (#{::ActiveRecord::Base.default_timezone})"
+          logger.info "Que enabled (#{default_timezone})"
           true
         end
       end
@@ -37,7 +37,7 @@ module RailsAutoscaleAgent
           GROUP BY 1
         SQL
 
-        run_at_by_queue = Hash[select_rows(sql)]
+        run_at_by_queue = Hash[select_rows_silently(sql)]
 
         # Don't collect worker metrics if there are unreasonable number of queues
         if run_at_by_queue.size > Config.instance.max_queues
@@ -62,6 +62,24 @@ module RailsAutoscaleAgent
 
       private
 
+      def default_timezone
+        if ::ActiveRecord.respond_to?(:default_timezone)
+          # Rails >= 7
+          ::ActiveRecord.default_timezone
+        else
+          # Rails < 7
+          ::ActiveRecord::Base.default_timezone
+        end
+      end
+
+      def select_rows_silently(sql)
+        if ::ActiveRecord::Base.logger.respond_to?(:silence)
+          ::ActiveRecord::Base.logger.silence { select_rows(sql) }
+        else
+          select_rows(sql)
+        end
+      end
+
       def select_rows(sql)
         # This ensures the agent doesn't hold onto a DB connection any longer than necessary
         ActiveRecord::Base.connection_pool.with_connection { |c| c.select_rows(sql) }

data/rails_autoscale_agent.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Adam McCrea"]
   spec.email         = ["adam@adamlogic.com"]
 
-  spec.summary       = "This gem works with the Rails Autoscale Heroku add-on to automatically scale your web and worker dynos."
+  spec.summary       = "[DEPRECATED] Please use the rails-autoscale-web gem"
   spec.homepage      = "https://railsautoscale.com"
   spec.license       = "MIT"
 
@@ -17,12 +17,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = '>= 2.5.0'
+  spec.post_install_message  = <<~MSG
+    DEPRECATION WARNING: rails_autoscale_agent is no longer maintained.
+    Please install rails-autoscale-web instead.
+    See https://github.com/rails-autoscale/rails-autoscale-gems for more.
+  MSG
 
   spec.metadata = {
     "homepage_uri" => "https://railsautoscale.com",
-    "bug_tracker_uri" => "https://github.com/adamlogic/rails_autoscale_agent/issues",
+    "bug_tracker_uri" => "https://github.com/rails-autoscale/rails-autoscale-gems/issues",
     "documentation_uri" => "https://railsautoscale.com/docs",
-    "changelog_uri" => "https://github.com/adamlogic/rails_autoscale_agent/blob/master/CHANGELOG.md",
-    "source_code_uri" => "https://github.com/adamlogic/rails_autoscale_agent",
+    "changelog_uri" => "https://github.com/rails-autoscale/rails-autoscale-gems/blob/master/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/rails-autoscale/rails-autoscale-gems",
   }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_autoscale_agent
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Adam McCrea
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-05 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -53,11 +53,14 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://railsautoscale.com
-  bug_tracker_uri: https://github.com/adamlogic/rails_autoscale_agent/issues
+  bug_tracker_uri: https://github.com/rails-autoscale/rails-autoscale-gems/issues
   documentation_uri: https://railsautoscale.com/docs
-  changelog_uri: https://github.com/adamlogic/rails_autoscale_agent/blob/master/CHANGELOG.md
-  source_code_uri: https://github.com/adamlogic/rails_autoscale_agent
-post_install_message:
+  changelog_uri: https://github.com/rails-autoscale/rails-autoscale-gems/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/rails-autoscale/rails-autoscale-gems
+post_install_message: |
+  DEPRECATION WARNING: rails_autoscale_agent is no longer maintained.
+  Please install rails-autoscale-web instead.
+  See https://github.com/rails-autoscale/rails-autoscale-gems for more.
 rdoc_options: []
 require_paths:
 - lib
@@ -72,9 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
-summary: This gem works with the Rails Autoscale Heroku add-on to automatically scale
-  your web and worker dynos.
+summary: "[DEPRECATED] Please use the rails-autoscale-web gem"
 test_files: []