prometheus_exporter 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bd1d7c955d48051b122205cd59d9700eace9c4b5ef1e38a87c9d4fbb14e8164
-  data.tar.gz: a44f8ab58e239550a0a75875dd4ad05c2f79769dcc781ad380afac7fac02d10b
+  metadata.gz: 2a7a452c5d92b7dbaca7f68ae2fa0553b5e280cd0b194f8ad0914d1e372c6b54
+  data.tar.gz: fdb40f93499fbc98cf4b94b2f52864fa1581df70b0dac448e06d8ebbf357f6f5
 SHA512:
-  metadata.gz: b5eedad2d76d14cfdaa6e693ba7862b82f3845e2136249bad6a879ec44bdff946c9ffc93f89448e1bdda1b2f673a5bc46df07266c2c8867247aa513250b5e79c
-  data.tar.gz: ae93f7dc838787cb72ae00037de19028f85d66ae7a71432fd74f064820ac3bc9664a27e64bfb0072fa41c195a1956007ffee3b629f80a882517248a4b21ff1bc
+  metadata.gz: 55eb9c1051984906ee30be3cbb2a9d4c3cb0c5f2fe58c9da0178b48187beb940a8314677052cf6b29bb0c2e5d6d364de30b36a32b56eb061065d48feab01e903
+  data.tar.gz: 794b19bab0a66404058ca2d550659d2fbca891e894a5b234db974eefc6b0652475c94d607b0be0b0f84f8d786bebf0a5b6d8721408c7e79ef18f031cd8466446

data/CHANGELOG

@@ -1,3 +1,8 @@
+2.0.6 - 2022-11-22
+
+- FIX: use user specified labels over default in merge conflict
+- FIX: sidekiq stats collector memory leak
+
 2.0.5 - 2022-11-15
 
 - FIX: regression :prepend style instrumentation not working correctly

data/lib/prometheus_exporter/metric/base.rb

@@ -75,7 +75,7 @@ module PrometheusExporter::Metric
     end
 
     def labels_text(labels)
-      labels = (labels || {}).merge(Base.default_labels)
+      labels = Base.default_labels.merge(labels || {})
       if labels && labels.length > 0
         s = labels.map do |key, value|
           value = value.to_s

data/lib/prometheus_exporter/server/sidekiq_stats_collector.rb

@@ -40,6 +40,9 @@ module PrometheusExporter::Server
     end
 
     def collect(object)
+      now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+      object['created_at'] = now
+      sidekiq_metrics.delete_if { |metric| metric['created_at'] + MAX_SIDEKIQ_METRIC_AGE < now }
       sidekiq_metrics << object
     end
   end

data/lib/prometheus_exporter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PrometheusExporter
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus_exporter
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webrick