pg-locks-monitor 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 170cb606bd1459b6b1a7525ed08ce17f2aab0757703ec9a33f64dadeafdebf7c
-  data.tar.gz: 503f92da91e4ca9d03999c45abb50507f8888b209df33c4a0e8b87e4cfdcb6b5
+  metadata.gz: 609f63093dd3729e2b05577d39d55d13a09cfeb78dadc185e3cd1bbeff15a5eb
+  data.tar.gz: 29bb4e5292296c81338ac5250efbc8e85927cdb8ede8354f0e4300b96bca7528
 SHA512:
-  metadata.gz: 27d0ac7d4340b0de7739b6383ec203830ab92eb5b952cbc41b9447c6d41aa540d52522f067bd1cdd857802c6c8a49a16ddaff9b95f2c51beed0f3e3b8dae6022
-  data.tar.gz: b4594194b88910f3fcc2e9c7e79205147076ff0fcd6ccf79ca2bc0e7e4290a3d5167e041f7660e72ecdfff1e7fe598684f103256a976582c83c884b8639dc77d
+  metadata.gz: 50377aa6446f17e900a28d427a0c6fc734ab78e29934f73af50d7957d3f81228515abb236964c1b6d5e866c5fad001eda0853f13d5aeb0a3cb540d70c7cd0011
+  data.tar.gz: 782c10cf04da3cbf8ec325cb15680f90bbea646344df1e5e1a1e72125781279f98321f1cce41c6c5d7da60dd59cfaa04a04eadff3233ebe0a282202808fd308e

data/.github/workflows/ci.yml

@@ -48,7 +48,15 @@ jobs:
           docker run --env POSTGRES_USER=postgres \
             --env POSTGRES_DB=pg-locks-monitor-test \
             --env POSTGRES_PASSWORD=secret \
-            -d -p 5436:5432 postgres:15.1-alpine \
+            -d -p 5436:5432 postgres:15.8-alpine \
+            postgres -c shared_preload_libraries=pg_stat_statements
+          sleep 15
+      - name: Run PostgreSQL 16
+        run: |
+          docker run --env POSTGRES_USER=postgres \
+            --env POSTGRES_DB=pg-locks-monitor-test \
+            --env POSTGRES_PASSWORD=secret \
+            -d -p 5437:5432 postgres:16.4-alpine \
             postgres -c shared_preload_libraries=pg_stat_statements
           sleep 15
       - name: Set up Ruby ${{ matrix.ruby-version }}
@@ -73,17 +81,7 @@ jobs:
           POSTGRES_PASSWORD: secret
           DATABASE_URL: postgresql://postgres:secret@localhost:5432/pg-locks-monitor-test
         run: |
-          bundle exec rspec spec/
-      - name: Run tests for PG 11
-        env:
-          PG_VERSION: 11
-          POSTGRES_HOST: localhost
-          POSTGRES_USER: postgres
-          POSTGRES_DB: pg-locks-monitor-test
-          POSTGRES_PASSWORD: secret
-          DATABASE_URL: postgresql://postgres:secret@localhost:5432/pg-locks-monitor-test
-        run: |
-          bundle exec rake test_all
+          bundle exec rspec spec
       - name: Run tests for PG 12
         env:
           PG_VERSION: 12
@@ -93,7 +91,7 @@ jobs:
           POSTGRES_PASSWORD: secret
           DATABASE_URL: postgresql://postgres:secret@localhost:5433/pg-locks-monitor-test
         run: |
-          bundle exec rake test_all
+          bundle exec rspec spec
       - name: Run tests for PG 13
         env:
           PG_VERSION: 13
@@ -103,7 +101,7 @@ jobs:
           POSTGRES_PASSWORD: secret
           DATABASE_URL: postgresql://postgres:secret@localhost:5434/pg-locks-monitor-test
         run: |
-          bundle exec rake test_all
+          bundle exec rspec spec
       - name: Run tests for PG 14
         env:
           PG_VERSION: 14
@@ -113,7 +111,7 @@ jobs:
           POSTGRES_PASSWORD: secret
           DATABASE_URL: postgresql://postgres:secret@localhost:5435/pg-locks-monitor-test
         run: |
-          bundle exec rake test_all
+          bundle exec rspec spec
       - name: Run tests for PG 15
         env:
           PG_VERSION: 15
@@ -123,5 +121,17 @@ jobs:
           POSTGRES_PASSWORD: secret
           DATABASE_URL: postgresql://postgres:secret@localhost:5436/pg-locks-monitor-test
         run: |
-          bundle exec rake test_all
+          bundle exec rspec spec
+      - name: Run tests for PG 16
+        env:
+          PG_VERSION: 15
+          POSTGRES_HOST: localhost
+          POSTGRES_USER: postgres
+          POSTGRES_DB: pg-locks-monitor-test
+          POSTGRES_PASSWORD: secret
+          DATABASE_URL: postgresql://postgres:secret@localhost:5437/pg-locks-monitor-test
+        run: |
+          bundle exec rspec spec
+
+
 

data/Rakefile

@@ -5,5 +5,5 @@ RSpec::Core::RakeTask.new(:spec)
 
 desc "Test all PG versions"
 task :test_all do
-  system("PG_VERSION=11 bundle exec rspec spec/ && PG_VERSION=12 bundle exec rspec spec/ && PG_VERSION=13 bundle exec rspec spec/ && PG_VERSION=14 bundle exec rspec spec/")
+  system("PG_VERSION=11 bundle exec rspec spec && PG_VERSION=12 bundle exec rspec spec && PG_VERSION=13 bundle exec rspec spec && PG_VERSION=14 bundle exec rspec spec && PG_VERSION=16 bundle exec rspec spec && PG_VERSION=16 bundle exec rspec spec")
 end

data/docker-compose.yml.sample

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   postgres11:
     image: postgres:11.16-alpine

data/lib/pg-locks-monitor.rb

@@ -2,11 +2,12 @@
 
 require "uri"
 require "pg"
-require "ruby-pg-extras"
+require "rails-pg-extras"
+require "active_record"
 
 module PgLocksMonitor
   def self.snapshot!
-    locks = RubyPgExtras.locks(
+    locks = RailsPgExtras.locks(
       in_format: :hash,
     ).select do |lock|
       if (age = lock.fetch("age"))
@@ -19,14 +20,21 @@ module PgLocksMonitor
       configuration.notifier_class.call(locks)
     end
 
-    blocking = RubyPgExtras.blocking(in_format: :hash).select do |block|
-      (ActiveSupport::Duration.parse(block.fetch("blocking_duration")).to_f * 1000) > configuration.blocking_min_duration_ms
+    blocking = RailsPgExtras.blocking(in_format: :hash).select do |block|
+      if (age = block.fetch("blocking_duration"))
+        (ActiveSupport::Duration.parse(age).to_f * 1000) > configuration.locks_min_duration_ms
+      end
     end.select(&configuration.blocking_filter_proc)
       .first(configuration.locks_limit)
 
     if blocking.count > 0 && configuration.monitor_blocking
       configuration.notifier_class.call(blocking)
     end
+
+    {
+      locks: locks,
+      blocking: blocking,
+    }
   end
 
   def self.configuration
@@ -36,6 +44,22 @@ module PgLocksMonitor
   def self.configure
     yield(configuration)
   end
+
+  class DurationHelper
+    require "date"
+
+    def self.parse_to_ms(duration_str)
+      time = DateTime.strptime(duration_str, "%H:%M:%S.%N")
+      hours = time.hour
+      minutes = time.minute
+      seconds = time.second
+      nanoseconds = time.second_fraction * (10 ** 9)
+
+      total_ms = (hours * 3600 * 1000) + (minutes * 60 * 1000) + (seconds * 1000) + (nanoseconds / 1_000_000).to_i
+
+      total_ms
+    end
+  end
 end
 
 require "pg_locks_monitor/default_notifier"

data/lib/pg_locks_monitor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgLocksMonitor
-  VERSION = "0.2.2"
+  VERSION = "0.3.1"
 end

data/pg-locks-monitor.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(spec)/})
   s.require_paths = ["lib"]
   s.license = "MIT"
-  s.add_dependency "ruby-pg-extras"
+  s.add_dependency "rails-pg-extras"
   s.add_dependency "slack-notifier"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"

data/spec/default_notifier_spec.rb

@@ -3,14 +3,6 @@
 require "spec_helper"
 
 describe PgLocksMonitor::DefaultNotifier do
-  before do
-    # Mock Rails and its logger
-    Rails = nil
-    logger_double = double("Logger")
-    allow(logger_double).to receive(:info)
-    allow(Rails).to receive(:logger).and_return(logger_double)
-  end
-
   it "requires correct config if Slack notifications enabled" do
     expect {
       PgLocksMonitor::DefaultNotifier.call({})
@@ -24,14 +16,26 @@ describe PgLocksMonitor::DefaultNotifier do
     }.to raise_error(RuntimeError)
   end
 
-  it "sends the Slack notification if enabled" do
-    PgLocksMonitor.configure do |config|
-      config.notify_slack = true
-      config.slack_webhook_url = "https://hooks.slack.com/services/123456789/123456789/123456789"
-      config.slack_channel = "pg-locks-monitor"
+  describe "Slack notification enabled" do
+    before do
+      PgLocksMonitor.configure do |config|
+        config.notify_slack = true
+        config.slack_webhook_url = "https://hooks.slack.com/services/123456789/123456789/123456789"
+        config.slack_channel = "pg-locks-monitor"
+      end
     end
 
-    expect_any_instance_of(Slack::Notifier).to receive(:ping)
-    PgLocksMonitor::DefaultNotifier.call({ locks: "data" })
+    after do
+      PgLocksMonitor.configure do |config|
+        config.notify_slack = false
+        config.slack_webhook_url = nil
+        config.slack_channel = nil
+      end
+    end
+
+    it "sends the Slack notification" do
+      expect_any_instance_of(Slack::Notifier).to receive(:ping)
+      PgLocksMonitor::DefaultNotifier.call({ locks: "data" })
+    end
   end
 end

data/spec/smoke_spec.rb

@@ -3,11 +3,37 @@
 require "spec_helper"
 
 describe PgLocksMonitor do
+  def spawn_update
+    Thread.new do
+      conn = RailsPgExtras.connection
+      conn.execute("
+        BEGIN;
+        UPDATE pg_locks_monitor_users SET name = 'Updated';
+        select pg_sleep(2);
+        COMMIT;
+        ")
+    end
+  end
+
   describe "snapshot!" do
     it "works" do
       expect {
         PgLocksMonitor.snapshot!
       }.not_to raise_error
     end
+
+    it "returns correct locks data" do
+      spawn_update
+      spawn_update
+      result = PgLocksMonitor.snapshot!
+      expect(result.fetch(:locks).count).to eq(0)
+      expect(result.fetch(:blocking).count).to eq(0)
+
+      sleep 1
+
+      result = PgLocksMonitor.snapshot!
+      expect(result.fetch(:locks).count).to eq(5)
+      expect(result.fetch(:blocking).count).to eq(1)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -14,8 +14,36 @@ port = if pg_version == "11"
     "5434"
   elsif pg_version == "14"
     "5435"
+  elsif pg_version == "15"
+    "5436"
+  elsif pg_version == "16"
+    "5437"
   else
     "5432"
   end
 
 ENV["DATABASE_URL"] ||= "postgresql://postgres:secret@localhost:#{port}/pg-locks-monitor-test"
+
+RSpec.configure do |config|
+  Rails = {}
+
+  config.before(:each) do
+    # Mock Rails and its logger
+    logger_double = double("Logger")
+    allow(logger_double).to receive(:info)
+    allow(Rails).to receive(:logger).and_return(logger_double)
+  end
+
+  config.before(:suite) do
+    ActiveRecord::Base.establish_connection(ENV["DATABASE_URL"])
+    conn = RailsPgExtras.connection
+    conn.execute("CREATE TABLE IF NOT EXISTS pg_locks_monitor_users (id SERIAL PRIMARY KEY, name VARCHAR(255) NOT NULL);")
+    conn.execute("INSERT INTO pg_locks_monitor_users (name) VALUES ('Alice');")
+    conn.execute("INSERT INTO pg_locks_monitor_users (name) VALUES ('Bob');")
+  end
+
+  config.after(:suite) do
+    conn = RailsPgExtras.connection
+    conn.execute("DROP TABLE IF EXISTS pg_locks_monitor_users;")
+  end
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: pg-locks-monitor
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - pawurb
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-pg-extras
+  name: rails-pg-extras
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="