postgres-vacuum-monitor 0.14.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69b9ab0ab38b8ec69526528cb1893179203086c9e5e1859c261fc54fafb19c34
-  data.tar.gz: 386c009018d2c6490c500f1d440c09d95dd0c4547eccb7b4710b6769a43c192b
+  metadata.gz: 3d9e8b90692a2b1bbadc40202497aae4af9a3e088b8c5a47869396ba5d14e796
+  data.tar.gz: 7db2e649f6c350a613e6b765f0cf9fe4f10cae9a4b0aa05f47a585519a029ad3
 SHA512:
-  metadata.gz: '035934d78adbfcc04a56390b2ec94deccdc1a53c4bdaf6b6f138cb951e595f10e388bb7084bff3590943698e8d6c026cc2c2d22926adea3d4edf8df2a326c2c7'
-  data.tar.gz: 2d9864aecd3b5d70c2c00a47bc16eb054edc408e6e5a19402886584347545eedc4322b2165eb628f460f93baf1519c42279af970628cd591422e8d87095f265f
+  metadata.gz: 7668c76a3666dfa35a70c26a923b2a9aebd1f0d1d96c3f4f5fe868dcba9c6f2ec4e15edcf1dbba07b17ab460b04d898c3468709e0dfd54532d6b503ca02f63f7
+  data.tar.gz: 284047bdc67471afda8abc017e377d3536de6e1593bfcc9993bc8ff16d5be562194b4f552f36ef150259c51b34571fcfc5b6ada56767da6fb2469d48c50aeca0

data/.circleci/config.yml

@@ -38,12 +38,10 @@ jobs:
         type: string
       ruby_version:
         type: string
-      postgres_version:
-        type: string
     docker:
       - image: $SALSIFY_ECR_REPO/ruby_ci:<< parameters.ruby_version >>
         <<: *aws-auth
-      - image: cimg/postgres:<< parameters.postgres_version >>
+      - image: cimg/postgres:14.7
         environment:
           POSTGRES_USER: "circleci"
           POSTGRES_DB: "circle_test"
@@ -98,10 +96,8 @@ workflows:
               gemfile:
                 - "gemfiles/activerecord_6_1.gemfile"
                 - "gemfiles/activerecord_7_0.gemfile"
+                - "gemfiles/activerecord_7_1.gemfile"
               ruby_version:
                 - "3.0.6"
                 - "3.1.4"
                 - "3.2.2"
-              postgres_version:
-                - "12.9"
-                - "14.7"

data/.github/CODEOWNERS

@@ -1 +1 @@
-* @fgarces @will89
+* @salsify/pim-core-backend

data/Appraisals

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-appraise 'activerecord_6_0' do
-  gem 'activerecord', '~> 6.0.0'
-end
-
 appraise 'activerecord_6_1' do
-  gem 'activerecord', '~> 6.1.0'
+  gem 'activerecord', '~> 6.1.7.6'
 end
 
 appraise 'activerecord_7_0' do
-  gem 'activerecord', '~> 7.0.0'
+  gem 'activerecord', '~> 7.0.8'
+end
+
+appraise 'activerecord_7_1' do
+  gem 'activerecord', '~> 7.1.1'
 end

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # postgres-vacuum-monitor
 
+## 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
+  `monitor_max_run_time_seconds`, respectively.
+
+## v0.15.0
+- Add support for Rails 7.1
+
 ## v0.14.1
 - Requires activerecord >= 6.1
 

data/README.md

@@ -34,7 +34,11 @@ The job itself needs a class to report the information and can be configured by
 Postgres::Vacuum::Monitor.configure do |config|
   config.monitor_reporter_class_name = 'MetricsReporter'
   # Optionally change the default threshold of 5 minutes for reporting long running transactions
-  config.long_running_transaction_threshold_seconds = 10 * 60  
+  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)
+  config.monitor_max_run_time_seconds = 5
 end
 ```
 

data/gemfiles/activerecord_6_1.gemfile

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

data/gemfiles/activerecord_7_0.gemfile

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

data/gemfiles/{activerecord_6_0.gemfile → activerecord_7_1.gemfile}

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

data/lib/postgres/vacuum/configuration.rb

@@ -4,11 +4,19 @@ module Postgres
   module Vacuum
     class Configuration
       DEFAULT_LONG_RUNNING_TRANSACTION_THRESHOLD_SECONDS = 5 * 60
-      attr_accessor :monitor_reporter_class_name, :long_running_transaction_threshold_seconds
+      DEFAULT_MONITOR_MAX_RUN_TIME_SECONDS = 10
+      DEFAULT_MONITOR_MAX_ATTEMPTS = 1
+
+      attr_accessor :monitor_reporter_class_name,
+                    :long_running_transaction_threshold_seconds,
+                    :monitor_max_run_time_seconds,
+                    :monitor_max_attempts
 
       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
       end
     end
   end

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

@@ -11,6 +11,14 @@ module Postgres
         CONNECTION_STATE = 'ConnectionState'
         CONNECTION_IDLE_TIME = 'ConnectionIdleTime'
 
+        def max_run_time
+          Postgres::Vacuum::Monitor.configuration.monitor_max_run_time_seconds.seconds
+        end
+
+        def max_attempts
+          Postgres::Vacuum::Monitor.configuration.monitor_max_attempts
+        end
+
         def perform(*)
           with_each_db_name_and_connection do |name, connection|
             connection.execute(Postgres::Vacuum::Monitor::Query.long_running_transactions).each do |row|
@@ -89,11 +97,7 @@ module Postgres
         def with_each_db_name_and_connection
           databases = Set.new
           ActiveRecord::Base.connection_handler.connection_pools.map do |connection_pool|
-            db_name = if Postgres::Vacuum::Compatibility.pre_rails_6_1?
-                        connection_pool.spec.config[:database]
-                      else
-                        connection_pool.db_config.configuration_hash[:database]
-                      end
+            db_name = connection_pool.db_config.configuration_hash[:database]
 
             # activerecord allocates a connection pool per call to establish_connection
             # multiple pools might interact with the same database so we use the

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

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

data/lib/postgres/vacuum/monitor.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'active_record'
-require 'postgres/vacuum/compatibility'
 require 'postgres/vacuum/configuration'
 require 'postgres/vacuum/monitor/version'
 require 'postgres/vacuum/monitor/query'

data/postgres-vacuum-monitor.gemspec

@@ -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.1'
+  spec.add_dependency 'activerecord', '>= 6.1', '< 7.2'
   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.14.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Fernando Garces
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-28 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -131,7 +131,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,7 +141,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -184,10 +184,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- gemfiles/activerecord_6_0.gemfile
 - gemfiles/activerecord_6_1.gemfile
 - gemfiles/activerecord_7_0.gemfile
-- lib/postgres/vacuum/compatibility.rb
+- gemfiles/activerecord_7_1.gemfile
 - lib/postgres/vacuum/configuration.rb
 - lib/postgres/vacuum/jobs/monitor_job.rb
 - lib/postgres/vacuum/monitor.rb

data/lib/postgres/vacuum/compatibility.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Postgres
-  module Vacuum
-    class Compatibility
-      ACTIVE_RECORD_VERSION = ::Gem::Version.new(::ActiveRecord::VERSION::STRING).release
-      PRE_RAILS_6_1 = ACTIVE_RECORD_VERSION < ::Gem::Version.new('6.1.0')
-
-      def self.pre_rails_6_1?
-        PRE_RAILS_6_1
-      end
-
-    end
-  end
-end