sidekiq_prometheus 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99f2c02a2ecdac71a05de9212319cc8efafb5e15d39d1a46d9dcd60d32ff847d
-  data.tar.gz: b43c963a8c63ca92ad695a8a5ef191701a2486772aaea24ad333ad6aacf66363
+  metadata.gz: cfef2dcf926147bf8113fc2ef76ebc53e194b742bff8024e52915829ed315403
+  data.tar.gz: d312f2be0b37be88b32e4031560c03ad1386283c935e911435ba8929c108dc2b
 SHA512:
-  metadata.gz: 74a9dda61a073d84576614a107966b9e6f714896b1925b1a2983f8f5ff64d2fa4f19007b47eaa6926f9f8a76cd0162a4c95dc11e97b11b9d40d9804ed6765d69
-  data.tar.gz: d7d1784f6aa693eb0e96613d2f0af6ee49d26e11f6d061c61dc7c75e73c12760fbc95b4e526c6b8d017083a7a5c518b79fa0c339266c60d9e2c6611a702bd641
+  metadata.gz: edc39e79efebc8d713ab0b4c60913b860c115fd99e6b8d096e705e41c698accb8e1765316e98371f67bd13c53e612254f656cf49713580b50675b15f8c9664f3
+  data.tar.gz: d03bdf927308ed353d34922c894c0363e68e1326792d95dd7052f87c2a38d2156a6cfd13954b3ee593adbc9a7e80407a84569387ead503ea5adcb1f2baccf955

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 CHANGELOG
 
+<a name="v1.8.1"></a>
+## [v1.8.1](https://github.com/fastly/sidekiq-prometheus/compare/v1.8.0...v1.8.1) (2022-10-18)
+
+### Feature
+
+* Support newer Sidekiq-Enterprise (#[31](https://github.com/fastly/sidekiq-prometheus/pull/31))
+
 <a name="v1.8.0"></a>
 ## [v1.8.0](https://github.com/fastly/sidekiq-prometheus/compare/v1.7.0...v1.8.0) (2022-10-04)
 

data/lib/sidekiq_prometheus/periodic_metrics.rb

@@ -10,7 +10,14 @@
 # @see https://github.com/mperham/sidekiq/wiki/Ent-Leader-Election
 # @see https://github.com/mperham/sidekiq/blob/main/lib/sidekiq/api.rb
 
+begin
+  require 'sidekiq/component'
+rescue LoadError
+end
+
 class SidekiqPrometheus::PeriodicMetrics
+  include Sidekiq::Component if defined? Sidekiq::Component
+
   # @return [Boolean] When +true+ will stop the reporting loop.
   attr_accessor :done
 
@@ -28,26 +35,26 @@ class SidekiqPrometheus::PeriodicMetrics
   ##
   # Instance of SidekiqPrometheus::PeriodicMetrics
   # @return [SidekiqPrometheus:PeriodicMetrics]
-  def self.reporter
-    @reporter ||= new
+  def self.reporter(config)
+    @reporter ||= new(config: config)
   end
 
   ##
   # @param interval [Integer] Interval in seconds to record metrics.
   # @param sidekiq_stats [Sidekiq::Stats]
   # @param senate [#leader?] Sidekiq::Senate
-  def initialize(interval: SidekiqPrometheus.periodic_reporting_interval, sidekiq_stats: Sidekiq::Stats, sidekiq_queue: Sidekiq::Queue, senate: nil)
+  def initialize(interval: SidekiqPrometheus.periodic_reporting_interval, sidekiq_stats: Sidekiq::Stats, sidekiq_queue: Sidekiq::Queue, senate: nil, config: nil)
     self.done = false
     @interval = interval
-
+    @config = config
     @sidekiq_stats = sidekiq_stats
     @sidekiq_queue = sidekiq_queue
     @senate = if senate.nil?
                 if Object.const_defined?('Sidekiq::Senate')
-                  if Sidekiq::Senate.respond_to?(:leader?)
-                    Sidekiq::Senate
+                  if respond_to?(:leader?)
+                    self
                   else
-                    Sidekiq::Senate.new(Sidekiq)
+                    Sidekiq::Senate
                   end
                 else
                   Senate

data/lib/sidekiq_prometheus/version.rb

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

data/lib/sidekiq_prometheus.rb

@@ -195,8 +195,8 @@ module SidekiqPrometheus
       end
 
       if periodic_metrics_enabled?
-        config.on(:startup)  { SidekiqPrometheus::PeriodicMetrics.reporter.start }
-        config.on(:shutdown) { SidekiqPrometheus::PeriodicMetrics.reporter.stop }
+        config.on(:startup)  { SidekiqPrometheus::PeriodicMetrics.reporter(config).start }
+        config.on(:shutdown) { SidekiqPrometheus::PeriodicMetrics.reporter(config).stop }
       end
 
       if metrics_server_enabled?

data/sidekiq_prometheus.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.58.0'
 
-  spec.add_runtime_dependency 'prometheus-client', '~> 2.0'
+  spec.add_runtime_dependency 'prometheus-client', '>= 2.0'
   spec.add_runtime_dependency 'rack'
-  spec.add_runtime_dependency 'sidekiq', '> 5.1'
+  spec.add_runtime_dependency 'sidekiq', '> 5.1', '< 7.0'
   spec.add_runtime_dependency 'webrick'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_prometheus
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Lukas Eklund
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,14 +85,14 @@ dependencies:
   name: prometheus-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
@@ -116,6 +116,9 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,6 +126,9 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement