sidekiq_prometheus 0.9.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 109c4043a6a4fec7f4240feb567b8919c97e90e92624d829d60f915787307b8e
-  data.tar.gz: e922e320009be0ac69ffeb11c64ce78c74ea803af76bff6dbfd9ec1148cfb5d4
+  metadata.gz: 93a2d8b5cbc5f31163889e382d144bdc328a9c9aae03be27587575f59e811d14
+  data.tar.gz: d5570e6a8164ce9245f02db0962211d26dc54ae9194db204c4f448ba71984040
 SHA512:
-  metadata.gz: 8299b54bd66498be1891a5e408d1baa2b40a3277a87c676a02b49b96fd898738f1a4cd4ecd1533a0a360e4f21797cde92b3b4fb308d688fc3ba14637e8f4f27e
-  data.tar.gz: ed121301c19da12849cd166d12f7701e81e52aa9fda24cbcde99b364b18b7650a8ebb77e1267b1a778faa827c42fcd95f5e4c00c35952facd8f62ae7aa5ba759
+  metadata.gz: 19985d0d0bdefb543223d6da1020c504d0ca903a9c227fda38ed31e36238e1f19a6d5d5e0044c4090fe0e65816616cb0f70c3f52d69364dc4cba9b143efccc14
+  data.tar.gz: 2ec3230d70cdc40939b1371b2ac1c0c14cc7c4a20741d8f9690217d2eb19a8e15be0be85c06ae66051c06ba3916e2b4a88c3b8672acddfcdedd1a444a93d68af

data/.gitignore

@@ -8,3 +8,4 @@
 /tmp/
 .rspec_status
 Gemfile.lock
+/.idea/

data/CHANGELOG.md

@@ -1,5 +1,56 @@
 CHANGELOG
 
+<a name="v1.3.0"></a>
+## [v1.3.0](https://github.com/fastly/sidekiq-prometheus/compare/v1.2.0...v1.3.0) (2021-03-26)
+
+### Pull Requests
+
+* Merge pull request [#22](https://github.com/fastly/sidekiq-prometheus/issues/22) from mirubiri/add-active-job-support
+* Merge pull request [#20](https://github.com/fastly/sidekiq-prometheus/issues/20) from fastly/aw/move-to-main
+
+<a name="v1.2.0"></a>
+## [v1.2.0](https://github.com/fastly/sidekiq-prometheus/compare/v1.1.0...v1.2.0) (2020-10-01)
+
+### Feature
+
+* allow the metrics host to be disabled with a configuration option
+* use prometheus-client ~> 2.0
+
+### Pull Requests
+
+* Merge pull request [#17](https://github.com/fastly/sidekiq-prometheus/issues/17) from jetpks/add-option-to-disable-metrics-server
+* Merge pull request [#15](https://github.com/fastly/sidekiq-prometheus/issues/15) from silicakes/master
+
+<a name="v1.1.0"></a>
+## [v1.1.0](https://github.com/fastly/sidekiq-prometheus/compare/v1.0.1...v1.1.0) (2020-02-12)
+
+### Feature
+
+* allow for configuration of the metrics host (instead of always binding to 127.0.0.1)
+* Use prometheus-client ~> 1.0.0
+
+### Pull Requests
+
+* Merge pull request [#13](https://github.com/fastly/sidekiq-prometheus/issues/13) from postmodern/metrics_host
+* Merge pull request [#11](https://github.com/fastly/sidekiq-prometheus/issues/11) from rossjones/patch-1
+* Merge pull request [#12](https://github.com/fastly/sidekiq-prometheus/issues/12) from fastly/hr
+
+<a name="v1.0.0"></a>
+## [v1.0.0](https://github.com/fastly/sidekiq-prometheus/compare/v0.9.1...v1.0.0) (2019-10-24)
+
+### Pull Requests
+
+* Merge pull request [#9](https://github.com/fastly/sidekiq-prometheus/issues/9) from we4tech/features/update-prometheus-client
+
+
+<a name="v0.9.1"></a>
+## [v0.9.1](https://github.com/fastly/sidekiq-prometheus/compare/v0.9.0...v0.9.1) (2019-07-08)
+
+### Bug Fixes
+
+* properly alias configure!
+
+
 <a name="v0.9.0"></a>
 ## [v0.9.0](https://github.com/fastly/sidekiq-prometheus/compare/v0.8.1...v0.9.0) (2019-03-18)
 

data/README.md

@@ -1,7 +1,7 @@
 # Sidekiq Prometheus
 
 
-[![Status](https://travis-ci.org/fastly/sidekiq-prometheus.svg?branch=master)](https://travis-ci.org/fastly/sidekiq-prometheus)
+[![Status](https://travis-ci.org/fastly/sidekiq-prometheus.svg?branch=main)](https://travis-ci.org/fastly/sidekiq-prometheus)
 ![Gem](https://img.shields.io/gem/v/sidekiq_prometheus.svg?color=blue)
 [![MIT license](http://img.shields.io/badge/license-MIT-brightgreen.svg)](http://opensource.org/licenses/MIT)
 
@@ -58,43 +58,50 @@ You can configure the gem by calling `configure`:
 
 ```ruby
 SidekiqPrometheus.configure do |config|
-  config.base_labels = { service: 'kubernandos_api' }
+  config.preset_labels = { service: 'kubernandos_api' }
 end
 ```
 
 `configure` will automatically call setup so
 
-If you are running multiple services that will be reporting Sidekiq metrics you will want to take advantage of the `base_labels` configuration option. For example:
+If you are running multiple services that will be reporting Sidekiq metrics you will want to take advantage of the `preset_labels` configuration option. For example:
 
 ```ruby
 SidekiqPrometheus.configure do |config|
-  config.base_labels  = { service: 'image_api' }
+  config.preset_labels  = { service: 'image_api' }
   config.metrics_port = 9090
 end
 ```
 
 #### Configuration options
 
-* `base_labels`: Hash of labels that will be included with every metric when they are registered.
+* `preset_labels`: Hash of labels that will be included with every metric when they are registered.
+* `custom_labels`: Array of names for each label that will be passed during the reporting. 
 * `gc_metrics_enabled`: Boolean that determines whether to record object allocation metrics per job. The default is `true`. Setting this to `false` if you don't need this metric.
 * `global_metrics_enabled`: Boolean that determines whether to report global metrics from the PeriodicMetrics reporter. When `true` this will report on a number of stats from the Sidekiq API for the cluster. This requires Sidekiq::Enterprise as the reporter uses the leader election functionality to ensure that only one worker per cluster is reporting metrics.
 * `periodic_metrics_enabled`: Boolean that determines whether to run the periodic metrics reporter. `PeriodicMetrics` runs a separate thread that reports on global metrics (if enabled) as well worker GC stats (if enabled). It reports metrics on the interval defined by `periodic_reporting_interval`. Defaults to `true`.
 * `periodic_reporting_interval`: interval in seconds for reporting periodic metrics. Default: `30`
+* `metrics_server_enabled`: Boolean that determines whether to run the rack server. Defaults to `true`
+* `metrics_host`: Host on which the rack server will listen. Defaults to
+  `localhost`
 * `metrics_port`: Port on which the rack server will listen. Defaults to `9359`
 * `registry`: An instance of `Prometheus::Client::Registry`. If you have a registry with defined metrics you can use this option to pass in your registry.
 
 ```ruby
 SidekiqPrometheus.configure do |config|
-  config.base_labels                   = { service: 'myapp' }
+  config.preset_labels                 = { service: 'myapp' }
+  config.custom_labels                 = [:worker_class, :job_type, :any_other_label]
   config.gc_metrics_enabled            = false
   config.global_metrics_enabled        = true
   config.periodic_metrics_enabled      = true
   config.periodic_reporting_interval   = 20
+  config.metrics_server_enabled        = true
   config.metrics_port                  = 8675
 end
 ```
 
-Custom labels may be added by defining the `prometheus_labels` method in the worker class:
+Custom labels may be added by defining the `prometheus_labels` method in the worker class, 
+prior you need to register the custom labels as of the above example:
 
 ```ruby
 class SomeWorker
@@ -164,7 +171,7 @@ which ensures that metrics are only reported once per cluster.
 | sidekiq_redis_keys | gauge | Number of redis keys |
 | sidekiq_redis_expires | gauge | Number of redis keys with expiry set |
 
-The global metrics are reported with the only the `base_labels` with the exception of `sidekiq_enqueued` which will add a `queue` label and record a metric per Sidekiq queue.
+The global metrics are reported with the only the `preset_labels` with the exception of `sidekiq_enqueued` which will add a `queue` label and record a metric per Sidekiq queue.
 
 ## Custom Worker Metrics
 
@@ -175,14 +182,14 @@ There are a few different ways to register custom metrics with SidekiqPrometheus
   name:        :metric_name,
   type:        :gauge,
   docstring:   'description',
-  base_labels: { label_name: 'label_text' },
+  preset_labels: { label_name: 'label_text' },
 }
 ```
 
 * `:name` (required) - Unique name of the metric and should be a symbol.
 * `:type` (required) - Prometheus metric type. Supported values are: `:counter`, `:gauge`, `:histogram`, and `:summary`.
 * `:docstring` (required) - Human readable description of the metric.
-* `:base_labels` (optional) - Hash of labels that will be applied to every instance of this metric.
+* `:preset_labels` (optional) - Hash of labels that will be applied to every instance of this metric.
 
 #### Registering custom metrics:
 
@@ -240,10 +247,18 @@ See the [documentation of the Prometheus::Client library](https://github.com/pro
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`.
 
+## Contributors
+
+* Lukas Eklund  ([@leklund](https://github.com/leklund))
+* NHM Tanveer Hossain Khan ([@we4tech](https://github.com/we4tech))
+* [@Postmodern](https://github.com/postmodern)
+* Ross Jones ([@rossjones](https://github.com/rossjones))
+* Alejandro Arrufat ([@mirubiri](https://github.com/mirubiri))
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/fastly/sidekiq-prometheus. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
@@ -258,4 +273,8 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the SidekiqPrometheus project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/fastly/sidekiq-prometheus/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the SidekiqPrometheus project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/fastly/sidekiq-prometheus/blob/main/CODE_OF_CONDUCT.md).
+
+# Metadata
+
+- Ignore

data/lib/sidekiq_prometheus.rb

@@ -14,10 +14,10 @@ end
 
 module SidekiqPrometheus
   class << self
-    # @return [Hash] Base labels applied to every registered metric
-    attr_accessor :base_labels
+    # @return [Hash] Preset labels applied to every registered metric
+    attr_accessor :preset_labels
 
-    # @return [Hash] Custom labels applied to specific metrics
+    # @return [Hash{Symbol => Array<Symbol>}] Custom labels applied to specific metrics
     attr_accessor :custom_labels
 
     # @return [Array] Custom metrics that will be registered on setup.
@@ -27,12 +27,12 @@ module SidekiqPrometheus
     #       name: :metric_name,
     #       type: :prometheus_metric_type,
     #       docstring: 'Description of the metric',
-    #       base_labels : { label: 'value' },
+    #       preset_labels : { label: 'value' },
     #     }
     #   ]
     # @note Each element of the array is a hash and must have the required keys: `:name`, `:type`, and `:docstring`.
     #   The values for `:name` and `:type` should be symbols and `:docstring` should be a string.
-    #   `base_labels` is optional and, if used, must be a hash of labels that will be included on every instance of this metric.
+    #   `preset_labels` is optional and, if used, must be a hash of labels that will be included on every instance of this metric.
     attr_accessor :custom_metrics
 
     # @return [Boolean] Setting to control enabling/disabling GC metrics. Default: true
@@ -47,6 +47,12 @@ module SidekiqPrometheus
     # @return [Integer] Interval in seconds to record metrics. Default: 30
     attr_accessor :periodic_reporting_interval
 
+    # @return [Boolean] Setting to control enabling/disabling the metrics server. Default: true
+    attr_accessor :metrics_server_enabled
+
+    # @return [String] Host on which the metrics server will listen. Default: localhost
+    attr_accessor :metrics_host
+
     # @return [Integer] Port on which the metrics server will listen. Default: 9357
     attr_accessor :metrics_port
 
@@ -66,6 +72,8 @@ module SidekiqPrometheus
   self.periodic_metrics_enabled = true
   self.global_metrics_enabled = true
   self.periodic_reporting_interval = 30
+  self.metrics_server_enabled = true
+  self.metrics_host = 'localhost'
   self.metrics_port = 9359
   self.custom_labels = {}
   self.custom_metrics = []
@@ -82,8 +90,8 @@ module SidekiqPrometheus
   # Configure SidekiqPrometheus and setup for reporting
   # @example
   #   SidekiqPrometheus.configure do |config|
-  #     config.base_labels = { service: 'images_api' }
-  #     config.custom_labels = { sidekiq_job_count: { object_klass: nil } }
+  #     config.preset_labels = { service: 'images_api' }
+  #     config.custom_labels = { sidekiq_job_count: [:custom_label_1, :custom_label_2] } }
   #     config.gc_metrics_enabled = true
   #   end
   def configure
@@ -113,6 +121,13 @@ module SidekiqPrometheus
     periodic_metrics_enabled
   end
 
+  ##
+  # Helper method for +metrics_server_enabled+ configuration setting
+  # @return [Boolean] defaults to true
+  def metrics_server_enabled?
+    metrics_server_enabled
+  end
+
   ##
   # Get a metric from the registry
   # @param metric [Symbol] name of metric to fetch
@@ -172,14 +187,17 @@ module SidekiqPrometheus
         config.on(:shutdown) { SidekiqPrometheus::PeriodicMetrics.reporter.stop }
       end
 
-      config.on(:startup)  { SidekiqPrometheus.metrics_server }
-      config.on(:shutdown) { SidekiqPrometheus.metrics_server.kill }
+      if metrics_server_enabled?
+        config.on(:startup)  { SidekiqPrometheus.metrics_server }
+        config.on(:shutdown) { SidekiqPrometheus.metrics_server.kill }
+      end
     end
   end
 
   ##
   # Start a new Prometheus exporter in a new thread.
-  # Will listen on SidekiqPrometheus.metrics_port
+  # Will listen on SidekiqPrometheus.metrics_host and
+  # SidekiqPrometheus.metrics_port
   def metrics_server
     @_metrics_server ||= Thread.new do
       Rack::Handler::WEBrick.run(
@@ -188,7 +206,7 @@ module SidekiqPrometheus
           run ->(_) { [301, { 'Location' => '/metrics' }, []] }
         },
         Port: SidekiqPrometheus.metrics_port,
-        BindAddress: '127.0.0.1',
+        Host: SidekiqPrometheus.metrics_host,
       )
     end
   end

data/lib/sidekiq_prometheus/job_metrics.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
 class SidekiqPrometheus::JobMetrics
-  def call(worker, _job, queue)
+  def call(worker, job, queue)
     before = GC.stat(:total_allocated_objects) if SidekiqPrometheus.gc_metrics_enabled?
 
-    labels = { class: worker.class.to_s, queue: queue }
+    # If we're using a wrapper class, like ActiveJob, use the "wrapped"
+    # attribute to expose the underlying thing.
+    labels = {
+      class: job['wrapped'] || worker.class.to_s,
+      queue: queue,
+    }
 
     begin
       labels.merge!(custom_labels(worker))
@@ -15,20 +20,20 @@ class SidekiqPrometheus::JobMetrics
       # In case the labels have changed after the worker perform method has been called
       labels.merge!(custom_labels(worker))
 
-      registry[:sidekiq_job_duration].observe(labels, duration)
-      registry[:sidekiq_job_success].increment(labels)
+      registry[:sidekiq_job_duration].observe(duration, labels: labels)
+      registry[:sidekiq_job_success].increment(labels: labels)
 
       if SidekiqPrometheus.gc_metrics_enabled?
         allocated = GC.stat(:total_allocated_objects) - before
-        registry[:sidekiq_job_allocated_objects].observe(labels, allocated)
+        registry[:sidekiq_job_allocated_objects].observe(allocated, labels: labels)
       end
 
       result
     rescue StandardError => e
-      registry[:sidekiq_job_failed].increment(labels)
+      registry[:sidekiq_job_failed].increment(labels: labels)
       raise e
     ensure
-      registry[:sidekiq_job_count].increment(labels)
+      registry[:sidekiq_job_count].increment(labels: labels)
     end
   end
 

data/lib/sidekiq_prometheus/metrics.rb

@@ -6,6 +6,7 @@ module SidekiqPrometheus::Metrics
   UNKNOWN = 'unknown'
 
   VALID_TYPES = %i[counter gauge histogram summary].freeze
+  JOB_LABELS = %i[class queue].freeze
   SIDEKIQ_GLOBAL_METRICS = [
     { name:      :sidekiq_workers_size,
       type:      :gauge,
@@ -15,10 +16,12 @@ module SidekiqPrometheus::Metrics
       docstring: 'Total Dead Size', },
     { name:      :sidekiq_enqueued,
       type:      :gauge,
-      docstring: 'Total Size of all known queues', },
+      docstring: 'Total Size of all known queues',
+      labels:    %i[queue], },
     { name:      :sidekiq_queue_latency,
       type:      :summary,
-      docstring: 'Latency (in seconds) of all queues', },
+      docstring: 'Latency (in seconds) of all queues',
+      labels:    %i[queue], },
     { name:      :sidekiq_failed,
       type:      :gauge,
       docstring: 'Number of job executions which raised an error', },
@@ -42,30 +45,37 @@ module SidekiqPrometheus::Metrics
       docstring: 'Used memory peak from Redis.info', },
     { name:      :sidekiq_redis_keys,
       type:      :gauge,
-      docstring: 'Number of redis keys', },
+      docstring: 'Number of redis keys',
+      labels:     %i[database], },
     { name:      :sidekiq_redis_expires,
       type:      :gauge,
-      docstring: 'Number of redis keys with expiry set', },
+      docstring: 'Number of redis keys with expiry set',
+      labels:     %i[database], },
   ].freeze
   SIDEKIQ_JOB_METRICS = [
     { name:      :sidekiq_job_count,
       type:      :counter,
-      docstring: 'Count of Sidekiq jobs', },
+      docstring: 'Count of Sidekiq jobs',
+      labels:    JOB_LABELS, },
     { name:      :sidekiq_job_duration,
       type:      :histogram,
-      docstring: 'Sidekiq job processing duration', },
+      docstring: 'Sidekiq job processing duration',
+      labels:    JOB_LABELS, },
     { name:      :sidekiq_job_failed,
       type:      :counter,
-      docstring: 'Count of failed Sidekiq jobs', },
+      docstring: 'Count of failed Sidekiq jobs',
+      labels:    JOB_LABELS, },
     { name:      :sidekiq_job_success,
       type:      :counter,
-      docstring: 'Count of successful Sidekiq jobs', },
+      docstring: 'Count of successful Sidekiq jobs',
+      labels:    JOB_LABELS, },
   ].freeze
   SIDEKIQ_GC_METRIC = {
     name:      :sidekiq_job_allocated_objects,
     type:      :histogram,
     docstring: 'Count of ruby objects allocated by a Sidekiq job',
     buckets:   [10, 50, 100, 500, 1_000, 2_500, 5_000, 10_000, 50_000, 100_000, 500_000, 1_000_000, 5_000_000, 10_000_000, 25_000_000],
+    labels:    JOB_LABELS,
   }.freeze
   SIDEKIQ_WORKER_GC_METRICS = [
     { name:      :sidekiq_allocated_objects,
@@ -130,21 +140,26 @@ module SidekiqPrometheus::Metrics
   # @param types [Symbol] type of metric to register. Valid types: %w(counter gauge summary histogram)
   # @param name [Symbol] name of metric
   # @param docstring [String] help text for metric
-  # @param base_labels [Hash] Optional hash of base labels to use for every instance of this metric
+  # @param labels [Array] Optionally an array of labels to configure for every instance of this metric
+  # @param preset_labels [Hash] Optionally a Hash of labels to use for every instance of this metric
   # @param buckets [Hash] Optional hash of bucket values. Only used for histogram metrics.
-  def register(type:, name:, docstring:, base_labels: {}, buckets: nil)
+  def register(type:, name:, docstring:, labels: [], preset_labels: {}, buckets: nil)
     raise InvalidMetricType, type unless VALID_TYPES.include? type
 
-    custom_labels = SidekiqPrometheus.custom_labels[name]
+    # Aggregate all preset labels
+    all_preset_labels = preset_labels.dup
+    all_preset_labels.merge!(SidekiqPrometheus.preset_labels) if SidekiqPrometheus.preset_labels
 
-    base_labels.merge! custom_labels if custom_labels&.is_a?(Hash)
-    base_labels.merge! SidekiqPrometheus.base_labels if SidekiqPrometheus.base_labels
+    # Aggregate all labels
+    all_labels = labels | SidekiqPrometheus.custom_labels.fetch(name, []) | all_preset_labels.keys
 
-    args = [name.to_sym, docstring]
-    args << base_labels
-    args << buckets if buckets
+    options = { docstring: docstring,
+                labels: all_labels,
+                preset_labels: all_preset_labels, }
 
-    registry.send(type, *args)
+    options[:buckets] = buckets if buckets
+
+    registry.send(type, name.to_sym, options)
   end
 
   def unregister(name:)

data/lib/sidekiq_prometheus/periodic_metrics.rb

@@ -8,7 +8,7 @@
 # one worker.
 #
 # @see https://github.com/mperham/sidekiq/wiki/Ent-Leader-Election
-# @see https://github.com/mperham/sidekiq/blob/master/lib/sidekiq/api.rb
+# @see https://github.com/mperham/sidekiq/blob/main/lib/sidekiq/api.rb
 
 class SidekiqPrometheus::PeriodicMetrics
   # @return [Boolean] When +true+ will stop the reporting loop.
@@ -71,13 +71,13 @@ class SidekiqPrometheus::PeriodicMetrics
   def report_gc_metrics
     stats = GC.stat
     GC_STATS[:counters].each do |stat|
-      SidekiqPrometheus["sidekiq_#{stat}"]&.increment({}, stats[stat])
+      SidekiqPrometheus["sidekiq_#{stat}"]&.increment(labels: {}, by: stats[stat])
     end
     GC_STATS[:gauges].each do |stat|
-      SidekiqPrometheus["sidekiq_#{stat}"]&.set({}, stats[stat])
+      SidekiqPrometheus["sidekiq_#{stat}"]&.set(stats[stat], labels: {})
     end
 
-    SidekiqPrometheus[:sidekiq_rss]&.set({}, rss)
+    SidekiqPrometheus[:sidekiq_rss]&.set(rss, labels: {})
   end
 
   ##
@@ -85,12 +85,12 @@ class SidekiqPrometheus::PeriodicMetrics
   def report_global_metrics
     current_stats = sidekiq_stats.new
     GLOBAL_STATS.each do |stat|
-      SidekiqPrometheus["sidekiq_#{stat}"]&.set({}, current_stats.send(stat))
+      SidekiqPrometheus["sidekiq_#{stat}"]&.set(current_stats.send(stat), labels: {})
     end
 
     sidekiq_queue.all.each do |queue|
-      SidekiqPrometheus[:sidekiq_enqueued]&.set({ queue: queue.name }, queue.size)
-      SidekiqPrometheus[:sidekiq_queue_latency]&.observe({ queue: queue.name }, queue.latency)
+      SidekiqPrometheus[:sidekiq_enqueued]&.set(queue.size, labels: { queue: queue.name })
+      SidekiqPrometheus[:sidekiq_queue_latency]&.observe(queue.latency, labels: { queue: queue.name })
     end
   end
 
@@ -106,15 +106,15 @@ class SidekiqPrometheus::PeriodicMetrics
     return if redis_info.nil?
 
     REDIS_STATS.each do |stat|
-      SidekiqPrometheus["sidekiq_redis_#{stat}"]&.set({}, redis_info[stat].to_i)
+      SidekiqPrometheus["sidekiq_redis_#{stat}"]&.set(redis_info[stat].to_i, labels: {})
     end
 
     db_stats = redis_info.select { |k, _v| k.match(/^db/) }
     db_stats.each do |db, stat|
       label = { database: db }
       values = stat.scan(/\d+/)
-      SidekiqPrometheus[:sidekiq_redis_keys]&.set(label, values[0].to_i)
-      SidekiqPrometheus[:sidekiq_redis_expires]&.set(label, values[1].to_i)
+      SidekiqPrometheus[:sidekiq_redis_keys]&.set(values[0].to_i, labels: label)
+      SidekiqPrometheus[:sidekiq_redis_expires]&.set(values[1].to_i, labels: label)
     end
   end
 

data/lib/sidekiq_prometheus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqPrometheus
-  VERSION = '0.9.2'
+  VERSION = '1.3.0'
 end

data/sidekiq_prometheus.gemspec

@@ -7,7 +7,7 @@ require 'sidekiq_prometheus/version'
 Gem::Specification.new do |spec|
   spec.name          = 'sidekiq_prometheus'
   spec.version       = SidekiqPrometheus::VERSION
-  spec.authors       = ['Lukas Eklund']
+  spec.authors       = ['Lukas Eklund', 'NHM Tanveer Hossain Khan']
   spec.email         = ['leklund@fastly.com']
 
   spec.summary       = 'Prometheus Instrumentation for Sidekiq'
@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.58.0'
 
-  spec.add_runtime_dependency 'prometheus-client', '~> 0.8.0'
+  spec.add_runtime_dependency 'prometheus-client', '~> 2.0'
   spec.add_runtime_dependency 'rack'
   spec.add_runtime_dependency 'sidekiq', '> 5.1'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_prometheus
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Lukas Eklund
-autorequire: 
+- NHM Tanveer Hossain Khan
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +123,7 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.1'
-description: 
+description:
 email:
 - leklund@fastly.com
 executables: []
@@ -152,7 +153,7 @@ homepage: https://github.com/fastly/sidekiq-prometheus
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -167,9 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Prometheus Instrumentation for Sidekiq
 test_files: []