pgq_prometheus 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 111af82c3aa1cbd83e1f176802001cb2c7b79daaa3ae7f327b72b96f362d6de2
-  data.tar.gz: ec0fc1d7f8f653ec2bedd062bb293807182af62b915162130dfe81724d551357
+  metadata.gz: 2ee74de1c1b67ad26f4b845c6f0b9a1d0404d848b7e20e29d34397ed3498bd57
+  data.tar.gz: d3c354ed2728b3bdaacfa56bbbeace43ad25e1c1a24d9bec1a9c7aea941aafd5
 SHA512:
-  metadata.gz: 737f11851a5781a25f42f3b702afcd27a88e2d5bbec7d8d389124995b99f99e82e8b0aafbb39e28bff155b12ce12565e02140e354b537e61eb97689573404373
-  data.tar.gz: 437da382c3917b97f065332c52c7d12169f2ea05832fb45e818558ac224e89ebca18095a6b250e584b3aed5fc3f54f6c16985c952281f704265ce02094e59122
+  metadata.gz: 07a8614b15adaa4878a33c6bd6542a6ce570c37a456655648a61300d7e7b579613af9516fb96072e4c51a56490ea6fd16ff15b9a4421e6bca3b1f004f8cdf814
+  data.tar.gz: a2d1edc34a27fb5156c7d2d0fd70ca30a24714bbbe39d5ed424efcd7b12cfaf18cfec946644bc6da63b7e17d0a51dde84e598835726781104409ecebd7f53e6c

data/Gemfile

@@ -6,4 +6,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'minitest', '~> 5.0'
-gem 'rake', '~> 12.0'
+gem 'rake', '~> 13.0'

data/lib/pgq_prometheus/collector.rb

@@ -8,6 +8,7 @@ module PgqPrometheus
     MAX_METRIC_AGE = 30
 
     def initialize
+      super
       @data = []
       @observers = {}
 
@@ -30,11 +31,7 @@ module PgqPrometheus
       metrics = {}
 
       @data.map do |obj|
-        labels = {}
-        # labels are passed by PgqPrometheus::Processor
-        labels.merge!(obj['metric_labels']) if obj['metric_labels']
-        # custom_labels are passed by PrometheusExporter::Client
-        labels.merge!(obj['custom_labels']) if obj['custom_labels']
+        labels = gather_labels(obj)
 
         @observers.each do |name, observer|
           name = name.to_s
@@ -56,5 +53,16 @@ module PgqPrometheus
       @data.delete_if { |m| m['created_at'] + MAX_METRIC_AGE < now }
       @data << obj
     end
+
+    private
+
+    def gather_labels(obj)
+      labels = {}
+      # labels are passed by PgqPrometheus::Processor
+      labels.merge!(obj['metric_labels']) if obj['metric_labels']
+      # custom_labels are passed by PrometheusExporter::Client
+      labels.merge!(obj['custom_labels']) if obj['custom_labels']
+      labels.to_h { |key, value| [key.to_s, value.to_s] }
+    end
   end
 end

data/lib/pgq_prometheus/config.rb

@@ -4,7 +4,7 @@ require 'prometheus_exporter/metric'
 
 module PgqPrometheus
   module Config
-    ALLOWED_FROM = [:queue, :consumer, nil]
+    ALLOWED_FROM = [:queue, :consumer, nil].freeze
 
     class << self
       attr_accessor :type, :_metrics
@@ -41,12 +41,12 @@ module PgqPrometheus
       end
 
       _metrics[name] = {
-          metric_class: metric_class,
-          help: help,
-          metric_args: options[:metric_args] || [],
-          labels: options[:labels] || {},
-          from: from,
-          apply: apply
+        metric_class: metric_class,
+        help: help,
+        metric_args: options[:metric_args] || [],
+        labels: options[:labels] || {},
+        from: from,
+        apply: apply
       }
     end
 

data/lib/pgq_prometheus/processor.rb

@@ -25,18 +25,7 @@ module PgqPrometheus
             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
+              run_once(process_collector:, client:)
               sleep frequency
             end
           end
@@ -45,6 +34,21 @@ module PgqPrometheus
         true
       end
 
+      def run_once(process_collector:, client:)
+        wrap_execution do
+          before_collect&.call
+          metrics = process_collector.collect
+          metrics.each do |metric|
+            client.send_json metric
+          end
+          after_collect&.call
+        rescue StandardError => e
+          warn "#{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
+      end
+
       def stop
         @thread&.kill
         @thread = nil
@@ -54,10 +58,20 @@ module PgqPrometheus
         defined?(@thread) && @thread
       end
 
-      def wrap_thread_loop(*tags)
+      def wrap_thread_loop(*tags, &block)
         return yield if logger.nil? || !logger.respond_to?(:tagged)
 
-        logger.tagged(*tags) { yield }
+        logger.tagged(*tags, &block)
+      end
+
+      def wrap_execution(&)
+        if defined?(Rails) && Rails.application
+          # When run inside Rails, this is a correct way to wrap app code
+          Rails.application.reloader.wrap(&)
+        else
+          # When using just ActiveRecord, with_connection will be enough
+          sql_caller.with_connection(&)
+        end
       end
     end
 
@@ -67,33 +81,30 @@ module PgqPrometheus
 
     def collect
       metrics = []
-      sql_caller.with_connection do
+      sql_caller.queue_info.each do |queue_info|
+        queue = queue_info[:queue_name]
 
-        sql_caller.queue_info.each do |queue_info|
-          queue = queue_info[:queue_name]
-
-          queue_metric_opts.each do |name, opts|
-            value = opts[:apply].call(queue_info)
-            labels = opts[:labels].merge(queue: queue)
-            metrics << format_metric(name, value, labels)
-          end
+        queue_metric_opts.each do |name, opts|
+          value = opts[:apply].call(queue_info)
+          labels = opts[:labels].merge(queue: queue)
+          metrics << format_metric(name, value, labels)
+        end
 
-          sql_caller.consumer_info(queue).each do |consumer_info|
-            consumer = consumer_info[:consumer_name]
+        sql_caller.consumer_info(queue).each do |consumer_info|
+          consumer = consumer_info[:consumer_name]
 
-            consumer_metric_opts.each do |name, opts|
-              value = opts[:apply].call(consumer_info, queue_info)
-              labels = opts[:labels].merge(queue: queue, consumer: consumer)
-              metrics << format_metric(name, value, labels)
-            end
+          consumer_metric_opts.each do |name, opts|
+            value = opts[:apply].call(consumer_info, queue_info)
+            labels = opts[:labels].merge(queue: queue, consumer: consumer)
+            metrics << format_metric(name, value, labels)
           end
         end
+      end
 
-        custom_metric_opts.each do |name, opts|
-          value, labels = opts[:apply].call
-          labels = (labels || {}).merge(opts[:labels])
-          metrics << format_metric(name, value, labels)
-        end
+      custom_metric_opts.each do |name, opts|
+        value, labels = opts[:apply].call
+        labels = (labels || {}).merge(opts[:labels])
+        metrics << format_metric(name, value, labels)
       end
 
       metrics
@@ -119,9 +130,9 @@ module PgqPrometheus
 
     def format_metric(name, value, labels)
       {
-          type: Config.type,
-          name => value,
-          metric_labels: labels.merge(@metric_labels)
+        type: Config.type,
+        name => value,
+        metric_labels: labels.merge(@metric_labels)
       }
     end
   end

data/lib/pgq_prometheus/sql_caller/active_record.rb

@@ -49,8 +49,8 @@ module PgqPrometheus
       # Acquires pg connection during block execution.
       # Release it after block executed.
       # @yield
-      def with_connection
-        model_class.connection_pool.with_connection { yield }
+      def with_connection(&)
+        model_class.connection_pool.with_connection(&)
       end
 
       private

data/lib/pgq_prometheus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgq_prometheus
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Denis Talakevich
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-07 00:00:00.000000000 Z
+date: 2026-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus_exporter
@@ -69,7 +69,7 @@ metadata:
   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: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -84,8 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.5.6
+signing_key:
 specification_version: 4
 summary: Prometheus metrics for PGQ postgres extension
 test_files: []