prometheus_exporter 2.0.5 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bd1d7c955d48051b122205cd59d9700eace9c4b5ef1e38a87c9d4fbb14e8164
-  data.tar.gz: a44f8ab58e239550a0a75875dd4ad05c2f79769dcc781ad380afac7fac02d10b
+  metadata.gz: 25775f350202635101e313a78e969a076259861a993349069a2dad9af6090304
+  data.tar.gz: 403ea5cec32df2025140379fe44a4bb7a1850dfadb639c04de65f8d2f5589f79
 SHA512:
-  metadata.gz: b5eedad2d76d14cfdaa6e693ba7862b82f3845e2136249bad6a879ec44bdff946c9ffc93f89448e1bdda1b2f673a5bc46df07266c2c8867247aa513250b5e79c
-  data.tar.gz: ae93f7dc838787cb72ae00037de19028f85d66ae7a71432fd74f064820ac3bc9664a27e64bfb0072fa41c195a1956007ffee3b629f80a882517248a4b21ff1bc
+  metadata.gz: c03b38725cef3d3d37d9b11106980d0861892fa225d4e0ffdfcdc0178eda80902e7b89f29955b978bdc58fe496059a42a99504b29a8bc9acb4227c0661f62031
+  data.tar.gz: fd06bd579d2bcfdb702d40e3f2e13c33a2edfb909e938dc52b26160b5e65b5f96f1ffcd53b22e80c289f2cae013630e5017bd6e93f8b9a7cf5de3da983fae823

data/CHANGELOG

@@ -1,3 +1,14 @@
+2.0.7 - 2023-01-13
+
+- FEATURE: allow binding server to both ipv4 and v6
+- FIX: expire stale sidekiq metrics
+
+
+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/README.md

@@ -857,6 +857,9 @@ prometheus_exporter -p 8080 \
                     --prefix 'foo_'
 ```
 
+You can use `-b` option to bind the `prometheus_exporter` web server to any IPv4 interface with `-b 0.0.0.0`, 
+any IPv6 interface with `-b ::`, or `-b ANY` to any IPv4/IPv6 interfaces available on your host system.
+
 #### Enabling Basic Authentication
 
 If you desire authentication on your `/metrics` route, you can enable basic authentication with the `--auth` option.

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/metrics_container.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module PrometheusExporter::Server
+  class MetricsContainer
+    METRIC_MAX_AGE = 60
+    METRIC_EXPIRE_ATTR = "_expire_at"
+
+    attr_reader :data, :ttl
+    attr_accessor :filter
+
+    def initialize(ttl: METRIC_MAX_AGE, expire_attr: METRIC_EXPIRE_ATTR, filter: nil)
+      @data          = []
+      @ttl           = ttl
+      @expire_attr   = expire_attr
+      @filter        = filter
+    end
+
+    def <<(obj)
+      now = get_time
+      obj[@expire_attr] = now + @ttl
+
+      expire(time: now, new_metric: obj)
+
+      @data << obj
+      @data
+    end
+
+    def [](key)
+      @data.tap { expire }[key]
+    end
+
+    def size(&blk)
+      wrap_expire(:size, &blk)
+    end
+    alias_method :length, :size
+
+    def map(&blk)
+      wrap_expire(:map, &blk)
+    end
+
+    def each(&blk)
+      wrap_expire(:each, &blk)
+    end
+
+    def expire(time: nil, new_metric: nil)
+      time ||= get_time
+
+      @data.delete_if do |metric|
+        expired = metric[@expire_attr] < time
+        expired ||= filter.call(new_metric, metric) if @filter && new_metric
+        expired
+      end
+    end
+
+    private
+
+    def get_time
+      ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+    end
+
+    def wrap_expire(method_name, &blk)
+      expire
+      @data.public_send(method_name, &blk)
+    end
+  end
+end

data/lib/prometheus_exporter/server/puma_collector.rb

@@ -14,7 +14,10 @@ module PrometheusExporter::Server
     }
 
     def initialize
-      @puma_metrics = []
+      @puma_metrics = MetricsContainer.new
+      @puma_metrics.filter = -> (new_metric, old_metric) do
+        new_metric["pid"] == old_metric["pid"] && new_metric["hostname"] == old_metric["hostname"]
+      end
     end
 
     def type
@@ -51,15 +54,6 @@ module PrometheusExporter::Server
     end
 
     def collect(obj)
-      now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-
-      obj["created_at"] = now
-
-      @puma_metrics.delete_if do |current|
-        (obj["pid"] == current["pid"] && obj["hostname"] == current["hostname"]) ||
-          (current["created_at"] + MAX_PUMA_METRIC_AGE < now)
-      end
-
       @puma_metrics << obj
     end
   end

data/lib/prometheus_exporter/server/sidekiq_process_collector.rb

@@ -12,7 +12,7 @@ module PrometheusExporter::Server
     attr_reader :sidekiq_metrics, :gauges
 
     def initialize
-      @sidekiq_metrics = []
+      @sidekiq_metrics = MetricsContainer.new(ttl: MAX_SIDEKIQ_METRIC_AGE)
       @gauges = {}
     end
 
@@ -21,6 +21,8 @@ module PrometheusExporter::Server
     end
 
     def metrics
+      SIDEKIQ_PROCESS_GAUGES.each_key { |name| gauges[name]&.reset! }
+
       sidekiq_metrics.map do |metric|
         labels = metric.fetch('labels', {})
         SIDEKIQ_PROCESS_GAUGES.map do |name, help|
@@ -35,12 +37,7 @@ module PrometheusExporter::Server
     end
 
     def collect(object)
-      now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-      process = object['process']
-
-      process["created_at"] = now
-      sidekiq_metrics.delete_if { |metric| metric['created_at'] + MAX_SIDEKIQ_METRIC_AGE < now }
-      sidekiq_metrics << process
+      @sidekiq_metrics << object["process"]
     end
   end
 end

data/lib/prometheus_exporter/server/sidekiq_queue_collector.rb

@@ -11,7 +11,7 @@ module PrometheusExporter::Server
     attr_reader :sidekiq_metrics, :gauges
 
     def initialize
-      @sidekiq_metrics = []
+      @sidekiq_metrics = MetricsContainer.new
       @gauges = {}
     end
 
@@ -20,6 +20,8 @@ module PrometheusExporter::Server
     end
 
     def metrics
+      SIDEKIQ_QUEUE_GAUGES.each_key { |name| gauges[name]&.reset! }
+
       sidekiq_metrics.map do |metric|
         labels = metric.fetch("labels", {})
         SIDEKIQ_QUEUE_GAUGES.map do |name, help|
@@ -34,12 +36,9 @@ module PrometheusExporter::Server
     end
 
     def collect(object)
-      now = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
       object['queues'].each do |queue|
-        queue["created_at"] = now
         queue["labels"].merge!(object['custom_labels']) if object['custom_labels']
-        sidekiq_metrics.delete_if { |metric| metric['created_at'] + MAX_SIDEKIQ_METRIC_AGE < now }
-        sidekiq_metrics << queue
+        @sidekiq_metrics << queue
       end
     end
   end

data/lib/prometheus_exporter/server/sidekiq_stats_collector.rb

@@ -18,7 +18,7 @@ module PrometheusExporter::Server
     attr_reader :sidekiq_metrics, :gauges
 
     def initialize
-      @sidekiq_metrics = []
+      @sidekiq_metrics = MetricsContainer.new(ttl: MAX_SIDEKIQ_METRIC_AGE)
       @gauges = {}
     end
 
@@ -27,6 +27,8 @@ module PrometheusExporter::Server
     end
 
     def metrics
+      SIDEKIQ_STATS_GAUGES.each_key { |name| gauges[name]&.reset! }
+
       sidekiq_metrics.map do |metric|
         SIDEKIQ_STATS_GAUGES.map do |name, help|
           if (value = metric['stats'][name])
@@ -40,7 +42,7 @@ module PrometheusExporter::Server
     end
 
     def collect(object)
-      sidekiq_metrics << object
+      @sidekiq_metrics << object
     end
   end
 end

data/lib/prometheus_exporter/server/type_collector.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "prometheus_exporter/server/metrics_container"
+
 module PrometheusExporter::Server
   class TypeCollector
     def type

data/lib/prometheus_exporter/server/web_server.rb

@@ -44,6 +44,11 @@ module PrometheusExporter::Server
 
       @logger.info "Using Basic Authentication via #{@auth}" if @verbose && @auth
 
+      if %w(ALL ANY).include?(@bind)
+        @logger.info "Listening on both 0.0.0.0/:: network interfaces"
+        @bind = nil
+      end
+
       @server = WEBrick::HTTPServer.new(
         Port: @port,
         BindAddress: @bind,

data/lib/prometheus_exporter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PrometheusExporter
-  VERSION = '2.0.5'
+  VERSION = '2.0.7'
 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.7
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webrick
@@ -289,6 +289,7 @@ files:
 - lib/prometheus_exporter/server/collector_base.rb
 - lib/prometheus_exporter/server/delayed_job_collector.rb
 - lib/prometheus_exporter/server/hutch_collector.rb
+- lib/prometheus_exporter/server/metrics_container.rb
 - lib/prometheus_exporter/server/process_collector.rb
 - lib/prometheus_exporter/server/puma_collector.rb
 - lib/prometheus_exporter/server/resque_collector.rb