postgres-vacuum-monitor 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d9e8b90692a2b1bbadc40202497aae4af9a3e088b8c5a47869396ba5d14e796
-  data.tar.gz: 7db2e649f6c350a613e6b765f0cf9fe4f10cae9a4b0aa05f47a585519a029ad3
+  metadata.gz: e48388bc503322ef09d9dc165846baf812303f134d1b6a21a27c5ddddf61e1e1
+  data.tar.gz: 47e0f3a4b1f889fae3e4a36d9e12609fe15ea66b24ed935f3d43493d37e55f74
 SHA512:
-  metadata.gz: 7668c76a3666dfa35a70c26a923b2a9aebd1f0d1d96c3f4f5fe868dcba9c6f2ec4e15edcf1dbba07b17ab460b04d898c3468709e0dfd54532d6b503ca02f63f7
-  data.tar.gz: 284047bdc67471afda8abc017e377d3536de6e1593bfcc9993bc8ff16d5be562194b4f552f36ef150259c51b34571fcfc5b6ada56767da6fb2469d48c50aeca0
+  metadata.gz: 771a3f359d8618df3b57e14fff6cfd744a1efe6da4324579713ad1d549f26a3fbfac9671ee86253f6a3b6e4572c45577862dabf4dc3c4fdbfcd5c77901fecc48
+  data.tar.gz: 61a8ba22eb3a71c4847a86e94ac2f5e0c2feb91b74dee2a32ae93f1d58272b76efc3cbff92269dead4a6aa35635faa6a30664a7d13e26d82d67fd3c7b3444daa

data/.circleci/config.yml

@@ -8,15 +8,15 @@ version: 2.1
 jobs:
   lint:
     docker:
-      - image: $SALSIFY_ECR_REPO/ruby_ci:3.0.6
+      - image: $SALSIFY_ECR_REPO/ruby_ci:3.2.8
         <<: *aws-auth
     working_directory: ~/postgres-vacuum-monitor
     steps:
       - checkout
       - restore_cache:
           keys:
-            - v1-gems-ruby-3.0.6-{{ checksum "postgres-vacuum-monitor.gemspec" }}-{{ checksum "Gemfile" }}
-            - v1-gems-ruby-3.0.6-
+            - v1-gems-ruby-3.2.8-{{ checksum "postgres-vacuum-monitor.gemspec" }}-{{ checksum "Gemfile" }}
+            - v1-gems-ruby-3.2.8-
       - run:
           name: Install Gems
           command: |
@@ -25,7 +25,7 @@ jobs:
               bundle clean
             fi
       - save_cache:
-          key: v1-gems-ruby-3.0.6-{{ checksum "postgres-vacuum-monitor.gemspec" }}-{{ checksum "Gemfile" }}
+          key: v1-gems-ruby-3.2.8-{{ checksum "postgres-vacuum-monitor.gemspec" }}-{{ checksum "Gemfile" }}
           paths:
             - "vendor/bundle"
             - "gemfiles/vendor/bundle"
@@ -94,10 +94,10 @@ workflows:
           matrix:
             parameters:
               gemfile:
-                - "gemfiles/activerecord_6_1.gemfile"
-                - "gemfiles/activerecord_7_0.gemfile"
-                - "gemfiles/activerecord_7_1.gemfile"
+                - gemfiles/activerecord_7_1.gemfile
+                - gemfiles/activerecord_7_2.gemfile
+                - gemfiles/activerecord_8_0.gemfile
               ruby_version:
-                - "3.0.6"
-                - "3.1.4"
-                - "3.2.2"
+                - 3.2.8
+                - 3.3.8
+                - 3.4.5

data/.rubocop.yml

@@ -2,7 +2,7 @@ inherit_gem:
   salsify_rubocop: conf/rubocop_rails.yml
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.2
   Exclude:
     - 'vendor/**/*'
     - 'gemfiles/**/*'

data/Appraisals

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-appraise 'activerecord_6_1' do
-  gem 'activerecord', '~> 6.1.7.6'
+appraise 'activerecord_7_1' do
+  gem 'activerecord', '~> 7.1.5'
 end
 
-appraise 'activerecord_7_0' do
-  gem 'activerecord', '~> 7.0.8'
+appraise 'activerecord_7_2' do
+  gem 'activerecord', '~> 7.2.2'
 end
 
-appraise 'activerecord_7_1' do
-  gem 'activerecord', '~> 7.1.1'
+appraise 'activerecord_8_0' do
+  gem 'activerecord', '~> 8.0.2'
 end

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # postgres-vacuum-monitor
 
+## v0.18.0
+- Add support for Rails 7.2 and 8.0.
+- Drop support for Rails 6.1 and 7.0.
+- Drop support for Ruby 3.0 and 3.1.
+
+## v0.17.0
+- Increased default `monitor_max_run_time_seconds` to 60 seconds.
+- Added `monitor_statement_timeout_seconds` (defaults to 10 seconds) to limit query runtime.
+- Eagerly clear connection pools when a `ActiveRecord::StatementInvalid` or `ActiveRecord::ConnectionTimeoutError`
+  is encountered to attempt to clear bad connections.
+
 ## v0.16.0
 - Add `max_attempts` and `max_run_time` to `Postgres::Vacuum::Jobs::MonitorJob` to avoid backing up the queue. The
   defaults are 1 attempt and 10 seconds, but they can be configured with `monitor_max_attempts` and

data/README.md

@@ -37,8 +37,10 @@ Postgres::Vacuum::Monitor.configure do |config|
   config.long_running_transaction_threshold_seconds = 10 * 60
   # Optionally change `max_attempts` of the monitor job (default 1)
   config.monitor_max_attempts = 3
-  # Optionally change `max_run_time` of the monitor job (default 10 seconds)
+  # Optionally change `max_run_time` of the monitor job (default 60 seconds)
   config.monitor_max_run_time_seconds = 5
+  # Optionally change the statement timeout of queries (default 10 seconds)
+  config.monitor_statement_timeout_seconds = 5
 end
 ```
 

data/Rakefile

@@ -2,7 +2,6 @@
 
 require 'bundler/gem_tasks'
 require 'bundler/setup'
-Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |task|

data/gemfiles/activerecord_7_1.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 7.1.1"
+gem "activerecord", "~> 7.1.5"
 
 gemspec path: "../"

data/gemfiles/{activerecord_7_0.gemfile → activerecord_7_2.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 7.0.8"
+gem "activerecord", "~> 7.2.2"
 
 gemspec path: "../"

data/gemfiles/{activerecord_6_1.gemfile → activerecord_8_0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.1.7.6"
+gem "activerecord", "~> 8.0.2"
 
 gemspec path: "../"

data/lib/postgres/vacuum/configuration.rb

@@ -4,19 +4,22 @@ module Postgres
   module Vacuum
     class Configuration
       DEFAULT_LONG_RUNNING_TRANSACTION_THRESHOLD_SECONDS = 5 * 60
-      DEFAULT_MONITOR_MAX_RUN_TIME_SECONDS = 10
+      DEFAULT_MONITOR_MAX_RUN_TIME_SECONDS = 60
       DEFAULT_MONITOR_MAX_ATTEMPTS = 1
+      DEFAULT_MONITOR_STATEMENT_TIMEOUT_SECONDS = 10
 
       attr_accessor :monitor_reporter_class_name,
                     :long_running_transaction_threshold_seconds,
                     :monitor_max_run_time_seconds,
-                    :monitor_max_attempts
+                    :monitor_max_attempts,
+                    :monitor_statement_timeout_seconds
 
       def initialize
         self.monitor_reporter_class_name = nil
         self.long_running_transaction_threshold_seconds = DEFAULT_LONG_RUNNING_TRANSACTION_THRESHOLD_SECONDS
         self.monitor_max_run_time_seconds = DEFAULT_MONITOR_MAX_RUN_TIME_SECONDS
         self.monitor_max_attempts = DEFAULT_MONITOR_MAX_ATTEMPTS
+        self.monitor_statement_timeout_seconds = DEFAULT_MONITOR_STATEMENT_TIMEOUT_SECONDS
       end
     end
   end

data/lib/postgres/vacuum/jobs/monitor_job.rb

@@ -98,14 +98,42 @@ module Postgres
           databases = Set.new
           ActiveRecord::Base.connection_handler.connection_pools.map do |connection_pool|
             db_name = connection_pool.db_config.configuration_hash[:database]
+            next unless databases.add?(db_name)
+
+            # ActiveRecord allocates a connection pool per call to `.establish_connection`
+            # As a result, multiple pools might interact with the same database, so we use
+            # the database name to dedupe.
+            connection_pool.with_connection do |connection|
+              original_timeout = statement_timeout(connection)
+              set_statement_timeout(connection, "#{configured_timeout_seconds}s")
+
+              yield(db_name, connection)
+            ensure
+              set_statement_timeout(connection, original_timeout)
+            end
 
-            # activerecord allocates a connection pool per call to establish_connection
-            # multiple pools might interact with the same database so we use the
-            # database name to dedup
-            connection_pool.with_connection { |conn| yield(db_name, conn) } if databases.add?(db_name)
+          # We want to avoid hanging onto a bad connection that would cause all future
+          # jobs to fail, so we eagerly clear the pool.
+          rescue ActiveRecord::StatementInvalid, ActiveRecord::ConnectionTimeoutError
+            connection_pool.disconnect!
+            raise
           end
         end
 
+        def statement_timeout(connection)
+          result = connection.execute('SHOW statement_timeout').first
+          result['statement_timeout'] if result.present?
+        end
+
+        def set_statement_timeout(connection, timeout)
+          query = ActiveRecord::Base.sanitize_sql(['SET statement_timeout = ?', timeout])
+          connection.execute(query)
+        end
+
+        def configured_timeout_seconds
+          Postgres::Vacuum::Monitor.configuration.monitor_statement_timeout_seconds
+        end
+
         ConfigurationError = Class.new(StandardError)
       end
     end

data/lib/postgres/vacuum/monitor/version.rb

@@ -3,7 +3,7 @@
 module Postgres
   module Vacuum
     module Monitor
-      VERSION = '0.16.0'
+      VERSION = '0.18.0'
     end
   end
 end

data/postgres-vacuum-monitor.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.2'
 
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'bundler'
@@ -40,6 +40,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'salsify_rubocop', '~> 1.42.1'
 
-  spec.add_dependency 'activerecord', '>= 6.1', '< 7.2'
+  spec.add_dependency 'activerecord', '>= 7.1', '< 8.1'
   spec.add_dependency 'pg', '>= 0.18', '< 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgres-vacuum-monitor
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Fernando Garces
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-15 00:00:00.000000000 Z
+date: 2025-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -128,20 +128,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -184,9 +184,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/activerecord_6_1.gemfile
-- gemfiles/activerecord_7_0.gemfile
 - gemfiles/activerecord_7_1.gemfile
+- gemfiles/activerecord_7_2.gemfile
+- gemfiles/activerecord_8_0.gemfile
 - lib/postgres/vacuum/configuration.rb
 - lib/postgres/vacuum/jobs/monitor_job.rb
 - lib/postgres/vacuum/monitor.rb
@@ -207,14 +207,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Simple stats collector for postgres auto vacuumer.