pgq_prometheus 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 217d7a6064aefef64ca6d358839134d52b8f56e7d3f33a69a8482ffc2d932919
-  data.tar.gz: 80bb1462baf09e5238a9537e916bba08f5242cbd242a77cb8b0b27ef43f8567e
+  metadata.gz: a79fefae7129536931c001b64ac33fb5b90408c3fc49438e34f010eaf29008e0
+  data.tar.gz: 1920f31e7dc66ab9475a8e983c1ab56dcff685c2c108bad680b01134211f2d6e
 SHA512:
-  metadata.gz: 8345be6719e9beb76924bfc8fcd712ad1622e4f56148e16d27301c360d91e4de617425aa968d039915f85a0b5070e3de0b3e469d7579bf17a789d955221fa3b3
-  data.tar.gz: b413e3ac7b3e2894d9a3b0175b9c2ffc9e45a2a9a2c30615251fe90fe496b785d2fb636fdc0e225663d491896dbeb1faf120a7d449a10fa4bf3d117cefd0f592
+  metadata.gz: 5a64ec99b4f27f44308a264aa46cf566b9076ca7e1ee5d183471025c97d2c9677bd85b0a7eface7bf00d0412fdb33416829426d0471829f0268c3d36d98c8eea
+  data.tar.gz: fdeafb8d1d3659a9922ced4af5f20710775d52577557d7881bc8357e9e67bcf70fc7953c9f8729973b74d908af3580b9ec0d0aa8be41a88111e4c3c3d078640c

data/lib/pgq_prometheus/processor.rb

@@ -5,7 +5,11 @@ require 'prometheus_exporter/client'
 module PgqPrometheus
   class Processor
     class << self
-      attr_accessor :sql_caller, :logger, :on_error
+      attr_accessor :sql_caller,
+                    :logger,
+                    :on_error,
+                    :before_collect,
+                    :after_collect
 
       def start(client: nil, frequency: 30, labels: nil)
         raise ArgumentError, "#{name}.sql_caller must be defined" if sql_caller.nil?
@@ -22,13 +26,15 @@ module PgqPrometheus
             logger&.info { "Start #{name}" }
             while true
               begin
+                before_collect&.call
                 metrics = process_collector.collect
                 metrics.each do |metric|
                   client.send_json metric
                 end
+                after_collect&.call
               rescue => e
                 STDERR.puts "#{self.class} Failed To Collect Stats #{e.class} #{e.message}"
-                log(:error) { "#{e.class} #{e.message} #{e.backtrace.join("\n")}" }
+                logger&.error { "#{e.class} #{e.message} #{e.backtrace.join("\n")}" }
                 on_error&.call(e)
               end
               sleep frequency
@@ -99,12 +105,6 @@ module PgqPrometheus
       define_method(meth) { |*args, &block| self.class.public_send(meth, *args, &block) }
     end
 
-    def log(severity)
-      return yield if logger.nil?
-
-      logger.public_send(severity) { yield }
-    end
-
     def queue_metric_opts
       Config._metrics.select { |_, opts| opts[:from] == :queue }
     end

data/lib/pgq_prometheus/sql_caller/active_record.rb

@@ -43,14 +43,14 @@ module PgqPrometheus
       # Releases active pg connection in thread.
       # Do nothing if no connection captured.
       def release_connection
-        model_class.release_connection
+        model_class.connection_pool.release_connection
       end
 
       # Acquires pg connection during block execution.
       # Release it after block executed.
       # @yield
       def with_connection
-        model_class.with_connection { yield }
+        model_class.connection_pool.with_connection { yield }
       end
 
       private

data/lib/pgq_prometheus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgqPrometheus
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgq_prometheus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Denis Talakevich