prometheus_exporter 2.0.4 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4f6fca67df8cdcd10a86edb00a89cc61a807af54f80794a6573bea5a8805bc0
-  data.tar.gz: 66e4867922235be2bb18df90b8ecbf3ad6b3d08d4ad92f62219ea26d80ca2515
+  metadata.gz: 2a7a452c5d92b7dbaca7f68ae2fa0553b5e280cd0b194f8ad0914d1e372c6b54
+  data.tar.gz: fdb40f93499fbc98cf4b94b2f52864fa1581df70b0dac448e06d8ebbf357f6f5
 SHA512:
-  metadata.gz: 7a31e11d9ba63709048ccebe7352f636f601800dd19d00aa3e29448a22d1e0de6436882d32ecb2e5911e16df0409acf1b1fb71d351f67afd38b3fb6e39976099
-  data.tar.gz: ba2c7fb01384299fa8f16656dd106ba99e82c721aca7d6442cd8f8a19a0b0ce82ff2b39935eeb0d8e19c096e5436c564ee1defe813dcf93bd3c41e6c0fc8dedc
+  metadata.gz: 55eb9c1051984906ee30be3cbb2a9d4c3cb0c5f2fe58c9da0178b48187beb940a8314677052cf6b29bb0c2e5d6d364de30b36a32b56eb061065d48feab01e903
+  data.tar.gz: 794b19bab0a66404058ca2d550659d2fbca891e894a5b234db974eefc6b0652475c94d607b0be0b0f84f8d786bebf0a5b6d8721408c7e79ef18f031cd8466446

data/CHANGELOG

@@ -1,3 +1,12 @@
+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
+
 2.0.4 - 2022-11-10
 
 - FIX/FEATURE: support for Redis 5 gem instrumentation

data/lib/prometheus_exporter/instrumentation/method_profiler.rb

@@ -64,9 +64,9 @@ class PrometheusExporter::Instrumentation::MethodProfiler
   end
 
   def self.patch_using_prepend(klass, methods, name)
-    prepend_instument = Module.new
-    define_methods_on_module(klass, methods, name)
-    klass.prepend(prepend_instument)
+    prepend_instrument = Module.new
+    define_methods_on_module(prepend_instrument, methods, name)
+    klass.prepend(prepend_instrument)
   end
 
   def self.patch_using_alias_method(klass, methods, name)

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.4'
+  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.4
+  version: 2.0.6
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2022-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webrick