pg-locks-monitor 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3bd2f4561c83a6d10a0120670bb89f8140f01f3afad7434fbea969e113cc542
-  data.tar.gz: 2fdb6e38890f1b085a32e72fee4d32eeb4e77e6a1f865737b2f3541d76d333ad
+  metadata.gz: 3c123754d01da5acc5a517511066987515ec3167c0063a59c67b272ba0fd39ac
+  data.tar.gz: c85d88f96b9593ebb04a849e6cc79958a3040eb119980d17585cb69fdea1733b
 SHA512:
-  metadata.gz: 1396e94b66ae62db3ee552855cfe8b2e7d10c5efdf87f323bc889c8fb17530cf9076e6239f2dc9713907f28ddbb5de602f4baa507b38621419534be545be83c6
-  data.tar.gz: a9bafef4918812b931737a0096cd2096181512e6eb5b35585b4e5caf50d7230f1dca4b8b2a37eeac7b521968577cf915cd97bff1f79b757dc909b5d1a4eb4f18
+  metadata.gz: b1f98b1c258f99a3943e178d81f370b664be38b1841edb302364f0796c06302b2487819bb09d66d3c6dd5161999af21ecb1e4e769f7ff0a3be287620774811f3
+  data.tar.gz: 340ae2e8bf451994e1f960a5c8196bd1739790b2e7634ded97c1990fb12d0c121078a301e8fcb9408a7bf63ce8f096730d8f038817fd18eb29a2114c7f6eeca0

data/README.md

@@ -232,9 +232,4 @@ PgLocksMonitor.configure do |config|
 
   config.notifier_class = PgLocksEmailNotifier
 end
-
 ```
-
-## Contributions
-
-This gem is in a very early stage of development so feedback and PRs are welcome.

data/lib/pg-locks-monitor.rb

@@ -2,25 +2,32 @@
 
 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"))
-        DurationHelper.parse_to_ms(age) > configuration.locks_min_duration_ms
+        (ActiveSupport::Duration.parse(age).to_f * 1000) > configuration.locks_min_duration_ms
       end
-    end.select(&configuration.locks_filter_proc)
+    end.select do |lock|
+      # meta locks with duplicate data
+      lock.fetch("locktype") != "virtualxid"
+    end
+      .select(&configuration.locks_filter_proc)
       .first(configuration.locks_limit)
 
     if locks.count > 0 && configuration.monitor_locks
       configuration.notifier_class.call(locks)
     end
 
-    blocking = RubyPgExtras.blocking(in_format: :hash).select do |block|
-      DurationHelper.parse_to_ms(block.fetch("blocking_duration")) > 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.blocking_min_duration_ms
+      end
     end.select(&configuration.blocking_filter_proc)
       .first(configuration.locks_limit)
 
@@ -41,22 +48,6 @@ 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.3.0"
+  VERSION = "0.3.2"
 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/smoke_spec.rb

@@ -5,8 +5,8 @@ require "spec_helper"
 describe PgLocksMonitor do
   def spawn_update
     Thread.new do
-      conn = PG.connect(ENV["DATABASE_URL"])
-      conn.exec("
+      conn = RailsPgExtras.connection
+      conn.execute("
         BEGIN;
         UPDATE pg_locks_monitor_users SET name = 'Updated';
         select pg_sleep(2);
@@ -25,6 +25,10 @@ describe PgLocksMonitor do
     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!

data/spec/spec_helper.rb

@@ -35,14 +35,15 @@ RSpec.configure do |config|
   end
 
   config.before(:suite) do
-    conn = RubyPgExtras.connection
-    conn.exec("CREATE TABLE IF NOT EXISTS pg_locks_monitor_users (id SERIAL PRIMARY KEY, name VARCHAR(255) NOT NULL);")
-    conn.exec("INSERT INTO pg_locks_monitor_users (name) VALUES ('Alice');")
-    conn.exec("INSERT INTO pg_locks_monitor_users (name) VALUES ('Bob');")
+    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 = RubyPgExtras.connection
-    conn.exec("DROP TABLE IF EXISTS pg_locks_monitor_users;")
+    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.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - pawurb
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-pg-extras
+  name: rails-pg-extras
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="