pgq_prometheus 0.1.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bfd83bd5e5c4ff547cc53f7424922ba0a25c957ede3a2b5564a91ecefb015f3
-  data.tar.gz: 88a8700c82abf2513a91a4c389831401e76f7f51c35f61b4c292c3dce816006a
+  metadata.gz: 111af82c3aa1cbd83e1f176802001cb2c7b79daaa3ae7f327b72b96f362d6de2
+  data.tar.gz: ec0fc1d7f8f653ec2bedd062bb293807182af62b915162130dfe81724d551357
 SHA512:
-  metadata.gz: fcd9e6f57018fd3e8451c35799e9f2d5c0d39871f177e24de8ebe65e7c7abc4f6d8329832033f0fb7ce442bde1342268c24f9a43448825216943e0f312db2f2b
-  data.tar.gz: 92174e946b347278960575e6bfb83a141e71b3df55f65b688866b1093e2994437c6b5a2b6ae4b4386c7d2b7a02f97eb33a537831f36c7dcd4fc7317a41be888a
+  metadata.gz: 737f11851a5781a25f42f3b702afcd27a88e2d5bbec7d8d389124995b99f99e82e8b0aafbb39e28bff155b12ce12565e02140e354b537e61eb97689573404373
+  data.tar.gz: 437da382c3917b97f065332c52c7d12169f2ea05832fb45e818558ac224e89ebca18095a6b250e584b3aed5fc3f54f6c16985c952281f704265ce02094e59122

data/README.md

@@ -1,6 +1,6 @@
 # PgqPrometheus
 
-[![Build Status](https://travis-ci.com/senid231/pgq_prometheus.svg?branch=master)](https://travis-ci.com/senid231/pgq_prometheus)
+[![Build Status](https://travis-ci.org/didww/pgq_prometheus.svg?branch=master)](https://travis-ci.org/didww/pgq_prometheus)
 
 Highly configurable Prometheus metrics for PGQ postgres extension
 
@@ -105,7 +105,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/senid231/pgq_prometheus. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/senid231/pgq_prometheus/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/didww/pgq_prometheus. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/didww/pgq_prometheus/blob/master/CODE_OF_CONDUCT.md).
 
 
 ## License
@@ -114,4 +114,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the PgqPrometheus project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/senid231/pgq_prometheus/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the PgqPrometheus project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/didwwpgq_prometheus/blob/master/CODE_OF_CONDUCT.md).

data/lib/pgq_prometheus/collector.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require_relative 'config'
 require 'prometheus_exporter/server'
 
 module PgqPrometheus
   class Collector < PrometheusExporter::Server::TypeCollector
+    MAX_METRIC_AGE = 30
 
     def initialize
       @data = []
@@ -23,6 +26,7 @@ module PgqPrometheus
     def metrics
       return [] if @data.length == 0
 
+      @observers.each_value(&:reset!)
       metrics = {}
 
       @data.map do |obj|
@@ -46,6 +50,10 @@ module PgqPrometheus
     end
 
     def collect(obj)
+      now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+
+      obj['created_at'] = now
+      @data.delete_if { |m| m['created_at'] + MAX_METRIC_AGE < now }
       @data << obj
     end
   end

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,64 @@
+# 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
+      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?
+
+        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
+                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}"
+                logger&.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 +67,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 +78,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 +101,8 @@ module PgqPrometheus
 
     private
 
-    def logger
-      self.class.logger
-    end
-
-    def within_logger_tags(*tags)
-      if logger.nil? || !logger.respond_to?(:tagged)
-        yield
-      else
-        logger.tagged(*tags) { yield }
-      end
+    [:sql_caller, :logger].each do |meth|
+      define_method(meth) { |*args, &block| self.class.public_send(meth, *args, &block) }
     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.connection_pool.release_connection
+      end
+
+      # Acquires pg connection during block execution.
+      # Release it after block executed.
+      # @yield
+      def with_connection
+        model_class.connection_pool.with_connection { yield }
+      end
+
       private
 
       def model_class
@@ -48,9 +63,16 @@ module PgqPrometheus
         sql = model_class.send :sanitize_sql_array, bindings.unshift(sql) unless bindings.empty?
         result = model_class.connection.select_all(sql)
         result.map do |row|
-          row.map { |k, v| [k.to_sym, result.column_types[k].deserialize(v)] }.to_h
+          row.map { |k, v| [k.to_sym, deserialize_value(result, k, v)] }.to_h
         end
       end
+
+      def deserialize_value(result, key, value)
+        pg_type = result.column_types[key]
+        return value if pg_type.nil?
+
+        pg_type.deserialize(value)
+      end
     end
   end
 end

data/lib/pgq_prometheus/version.rb

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

data/pgq_prometheus_metrics.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Prometheus metrics for PGQ postgres extension'
   spec.description   = 'Prometheus metrics for PGQ postgres extension'
-  spec.homepage      = 'https://github.com/senid231/pgq_prometheus'
+  spec.homepage      = 'https://github.com/didww/pgq_prometheus'
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgq_prometheus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus_exporter
@@ -62,13 +62,13 @@ files:
 - lib/pgq_prometheus/sql_caller/active_record.rb
 - lib/pgq_prometheus/version.rb
 - pgq_prometheus_metrics.gemspec
-homepage: https://github.com/senid231/pgq_prometheus
+homepage: https://github.com/didww/pgq_prometheus
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/senid231/pgq_prometheus
-  source_code_uri: https://github.com/senid231/pgq_prometheus
-  changelog_uri: https://github.com/senid231/pgq_prometheus
+  homepage_uri: https://github.com/didww/pgq_prometheus
+  source_code_uri: https://github.com/didww/pgq_prometheus
+  changelog_uri: https://github.com/didww/pgq_prometheus
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Prometheus metrics for PGQ postgres extension