pgq_prometheus 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c50481a86da83ef0d570c77a11d24caef01d0053e5414769ef2db57d6ce633b0
-  data.tar.gz: 1afe0060aa7fc70d8183b234e583cceac4cf7e9b9a938ed8f77a7caaa9fbad01
+  metadata.gz: 468cc359aeaedd54778017df1fb7a64e25219bd4f55f0c7e3250bcc214710895
+  data.tar.gz: 23d04244e7d7312a13a0ca17c11eed0c936a125f7358f90269f9f724a4bec74d
 SHA512:
-  metadata.gz: 988676417dfad5594adf5d356b3dccc5d5a9a4f4197b9b97b65bbe1fdb45a768120ef6cc5ce4ec81d9b09866c9ef0807114321f3c9ae7ce164ab550e868d82a2
-  data.tar.gz: 33d063934622c01cd674a957a09001e5428025159e14d7e15e41dce6472d6f992dcee6203c1288a4ba391f3234bf2bc42245429a20dafece24738108a9506cf8
+  metadata.gz: 4f8aeb11b67078828815e0632c9a8084886fefd187056f95d8d8b3f955cc97df3cc137768d2eedb3c2b56b825d73dbe53d5004408c0f3968dde476539e04782f
+  data.tar.gz: 4eb3946315b5d77c4563624eccb808729b506ce3eadc56e99bf2a153b8fb8b4c12c38d22e4b720d1f94d986bdbd58d701b872b847f5058fd8a527180edae8ca7

data/lib/pgq_prometheus/collector.rb

@@ -26,14 +26,11 @@ module PgqPrometheus
     def metrics
       return [] if @data.length == 0
 
+      @observers.each_value(&:reset!)
       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
@@ -55,5 +52,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/sql_caller/active_record.rb

@@ -63,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.2.2'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgq_prometheus
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Denis Talakevich
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2025-04-26 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.1.2
-signing_key: 
+rubygems_version: 3.5.6
+signing_key:
 specification_version: 4
 summary: Prometheus metrics for PGQ postgres extension
 test_files: []