pgq_prometheus 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bfd83bd5e5c4ff547cc53f7424922ba0a25c957ede3a2b5564a91ecefb015f3
-  data.tar.gz: 88a8700c82abf2513a91a4c389831401e76f7f51c35f61b4c292c3dce816006a
+  metadata.gz: 217d7a6064aefef64ca6d358839134d52b8f56e7d3f33a69a8482ffc2d932919
+  data.tar.gz: 80bb1462baf09e5238a9537e916bba08f5242cbd242a77cb8b0b27ef43f8567e
 SHA512:
-  metadata.gz: fcd9e6f57018fd3e8451c35799e9f2d5c0d39871f177e24de8ebe65e7c7abc4f6d8329832033f0fb7ce442bde1342268c24f9a43448825216943e0f312db2f2b
-  data.tar.gz: 92174e946b347278960575e6bfb83a141e71b3df55f65b688866b1093e2994437c6b5a2b6ae4b4386c7d2b7a02f97eb33a537831f36c7dcd4fc7317a41be888a
+  metadata.gz: 8345be6719e9beb76924bfc8fcd712ad1622e4f56148e16d27301c360d91e4de617425aa968d039915f85a0b5070e3de0b3e469d7579bf17a789d955221fa3b3
+  data.tar.gz: b413e3ac7b3e2894d9a3b0175b9c2ffc9e45a2a9a2c30615251fe90fe496b785d2fb636fdc0e225663d491896dbeb1faf120a7d449a10fa4bf3d117cefd0f592

data/lib/pgq_prometheus/collector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'config'
 require 'prometheus_exporter/server'
 

data/lib/pgq_prometheus/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'prometheus_exporter/metric'
 
 module PgqPrometheus

data/lib/pgq_prometheus/processor.rb

@@ -1,48 +1,58 @@
+# frozen_string_literal: true
+
 require 'prometheus_exporter/client'
 
 module PgqPrometheus
   class Processor
     class << self
       attr_accessor :sql_caller, :logger, :on_error
-    end
-
-    def self.start(client: nil, frequency: 30, labels: nil)
-      raise ArgumentError, "#{name}.sql_caller must be defined" if sql_caller.nil?
-
-      client ||= PrometheusExporter::Client.default
-      metric_labels = labels&.dup || {}
-      process_collector = new(metric_labels)
 
-      stop if running?
-
-      @thread = Thread.new do
-        while true
-          begin
-            metrics = process_collector.collect
-            metrics.each do |metric|
-              client.send_json metric
+      def start(client: nil, frequency: 30, labels: nil)
+        raise ArgumentError, "#{name}.sql_caller must be defined" if sql_caller.nil?
+
+        stop
+
+        client ||= PrometheusExporter::Client.default
+        metric_labels = labels&.dup || {}
+        process_collector = new(metric_labels)
+
+        @thread = Thread.new do
+          wrap_thread_loop(name) do
+            sql_caller.release_connection
+            logger&.info { "Start #{name}" }
+            while true
+              begin
+                metrics = process_collector.collect
+                metrics.each do |metric|
+                  client.send_json metric
+                end
+              rescue => e
+                STDERR.puts "#{self.class} Failed To Collect Stats #{e.class} #{e.message}"
+                log(:error) { "#{e.class} #{e.message} #{e.backtrace.join("\n")}" }
+                on_error&.call(e)
+              end
+              sleep frequency
             end
-          rescue => e
-            STDERR.puts "#{self.class} Failed To Collect Stats #{e.class} #{e.message}"
-            logger&.error { "#{e.class} #{e.message} #{e.backtrace.join("\n")}" }
-            on_error&.call(e)
           end
-          sleep frequency
         end
+
+        true
       end
 
-      true
-    end
+      def stop
+        @thread&.kill
+        @thread = nil
+      end
 
-    def self.stop
-      return unless running?
+      def running?
+        defined?(@thread) && @thread
+      end
 
-      @thread.kill
-      @thread = nil
-    end
+      def wrap_thread_loop(*tags)
+        return yield if logger.nil? || !logger.respond_to?(:tagged)
 
-    def self.running?
-      defined?(@thread) && @thread
+        logger.tagged(*tags) { yield }
+      end
     end
 
     def initialize(labels = {})
@@ -51,10 +61,9 @@ module PgqPrometheus
 
     def collect
       metrics = []
+      sql_caller.with_connection do
 
-      within_logger_tags(self.class.name) do
-
-        self.class.sql_caller.queue_info.each do |queue_info|
+        sql_caller.queue_info.each do |queue_info|
           queue = queue_info[:queue_name]
 
           queue_metric_opts.each do |name, opts|
@@ -63,7 +72,7 @@ module PgqPrometheus
             metrics << format_metric(name, value, labels)
           end
 
-          self.class.sql_caller.consumer_info(queue).each do |consumer_info|
+          sql_caller.consumer_info(queue).each do |consumer_info|
             consumer = consumer_info[:consumer_name]
 
             consumer_metric_opts.each do |name, opts|
@@ -86,16 +95,14 @@ module PgqPrometheus
 
     private
 
-    def logger
-      self.class.logger
+    [:sql_caller, :logger].each do |meth|
+      define_method(meth) { |*args, &block| self.class.public_send(meth, *args, &block) }
     end
 
-    def within_logger_tags(*tags)
-      if logger.nil? || !logger.respond_to?(:tagged)
-        yield
-      else
-        logger.tagged(*tags) { yield }
-      end
+    def log(severity)
+      return yield if logger.nil?
+
+      logger.public_send(severity) { yield }
     end
 
     def queue_metric_opts

data/lib/pgq_prometheus/sql_caller/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PgqPrometheus
   module SqlCaller
     class ActiveRecord
@@ -38,6 +40,19 @@ module PgqPrometheus
         end
       end
 
+      # Releases active pg connection in thread.
+      # Do nothing if no connection captured.
+      def release_connection
+        model_class.release_connection
+      end
+
+      # Acquires pg connection during block execution.
+      # Release it after block executed.
+      # @yield
+      def with_connection
+        model_class.with_connection { yield }
+      end
+
       private
 
       def model_class

data/lib/pgq_prometheus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgq_prometheus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus_exporter