sidekiq-prometheus-exporter 0.1.15 → 0.1.16

data/helm/sidekiq-prometheus-exporter/README.md

@@ -51,7 +51,7 @@ $ helm install sidekiq-metrics strech/sidekiq-prometheus-exporter --set serviceA
 | `fullnameOverride`             | Override the full resource names                                                                 | `nil`                                |
 | `image.registry`               | Image registry                                                                                   | `docker.io`                          |
 | `image.repository`             | Image repository                                                                                 | `strech/sidekiq-prometheus-exporter` |
-| `image.tag`                    | Image tag                                                                                        | `0.1.15`                             |
+| `image.tag`                    | Image tag                                                                                        | `0.1.15-3`                           |
 | `image.pullPolicy`             | Image pull policy                                                                                | `IfNotPresent`                       |
 | `image.pullSecrets`            | Image pull secrets                                                                               | `nil`                                |
 | `containerPort`                | Port for the exporter to bind on                                                                 | `9292`                               |

data/helm/sidekiq-prometheus-exporter/values.yaml

@@ -9,7 +9,7 @@
 image:
   registry: docker.io
   repository: strech/sidekiq-prometheus-exporter
-  tag: 0.1.15
+  tag: 0.1.15-3
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -77,6 +77,7 @@ containerPort: 9292
 ## ref: https://github.com/Strech/sidekiq-prometheus-exporter/tree/master/docker#supported-envs
 ##
 # env:
+#   REDIS_SSL: "false"
 #   REDIS_HOST: "localhost"
 #   REDIS_PORT: 6379
 #   REDIS_URL: "..."

data/lib/sidekiq/prometheus/exporter/standard.rb

@@ -10,6 +10,8 @@ module Sidekiq
         TEMPLATE = ERB.new(File.read(File.expand_path('templates/standard.erb', __dir__)))
 
         QueueStats = Struct.new(:name, :size, :latency)
+        QueueWorkersStats = Struct.new(:total_workers, :busy_workers, :processes)
+        WorkersStats = Struct.new(:total_workers, :by_queue)
 
         def self.available?
           true
@@ -18,8 +20,8 @@ module Sidekiq
         def initialize
           @overview_stats = Sidekiq::Stats.new
           @queues_stats = queues_stats
+          @workers_stats = workers_stats
           @max_processing_times = max_processing_times
-          @total_workers = total_workers
         end
 
         def to_s
@@ -34,8 +36,24 @@ module Sidekiq
           end
         end
 
+        def workers_stats
+          workers_stats = WorkersStats.new(0, {})
+
+          Sidekiq::ProcessSet.new.each_with_object(workers_stats) do |process, stats|
+            stats.total_workers += process['concurrency'].to_i
+
+            process['queues'].each do |queue|
+              stats.by_queue[queue] ||= QueueWorkersStats.new(0, 0, 0)
+              stats.by_queue[queue].processes += 1
+              stats.by_queue[queue].busy_workers += process['busy'].to_i
+              stats.by_queue[queue].total_workers += process['concurrency'].to_i
+            end
+          end
+        end
+
         def max_processing_times
           now = Time.now.to_i
+
           Sidekiq::Workers.new
             .map { |_, _, execution| execution }
             .group_by { |execution| execution['queue'] }
@@ -44,10 +62,6 @@ module Sidekiq
               memo[queue] = now - oldest_execution['run_at']
             end
         end
-
-        def total_workers
-          Sidekiq::ProcessSet.new.map { |process| process['concurrency'].to_i }.reduce(0, :+)
-        end
       end
     end
   end

data/lib/sidekiq/prometheus/exporter/templates/standard.erb

@@ -8,7 +8,7 @@ sidekiq_failed_jobs_total <%= format('%d', @overview_stats.failed) %>
 
 # HELP sidekiq_workers The number of workers across all the processes.
 # TYPE sidekiq_workers gauge
-sidekiq_workers <%= format('%d', @total_workers) %>
+sidekiq_workers <%= format('%d', @workers_stats.total_workers) %>
 
 # HELP sidekiq_processes The number of processes.
 # TYPE sidekiq_processes gauge
@@ -46,3 +46,15 @@ sidekiq_dead_jobs <%= format('%d', @overview_stats.dead_size) %>
 # TYPE sidekiq_queue_max_processing_time_seconds gauge
 <% @max_processing_times.each do |queue, max_processing_time| %>sidekiq_queue_max_processing_time_seconds{name="<%= queue %>"} <%= format('%i', max_processing_time) %>
 <% end %>
+# HELP sidekiq_queue_workers The number of workers serving the queue.
+# TYPE sidekiq_queue_workers gauge
+<% @workers_stats.by_queue.each do |queue, stats| %>sidekiq_queue_workers{name="<%= queue %>"} <%= format('%i', stats.total_workers) %>
+<% end %>
+# HELP sidekiq_queue_processes The number of processes serving the queue.
+# TYPE sidekiq_queue_processes gauge
+<% @workers_stats.by_queue.each do |queue, stats| %>sidekiq_queue_processes{name="<%= queue %>"} <%= format('%i', stats.processes) %>
+<% end %>
+# HELP sidekiq_queue_busy_workers The number of workers performing the job for the queue.
+# TYPE sidekiq_queue_busy_workers gauge
+<% @workers_stats.by_queue.each do |queue, stats| %>sidekiq_queue_busy_workers{name="<%= queue %>"} <%= format('%i', stats.busy_workers) %>
+<% end %>

data/lib/sidekiq/prometheus/exporter/version.rb

@@ -3,7 +3,7 @@
 module Sidekiq
   module Prometheus
     module Exporter
-      VERSION = '0.1.15'.freeze
+      VERSION = '0.1.16'.freeze
     end
   end
 end

data/sidekiq-prometheus-exporter.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
     spec.metadata['allowed_push_host'] = 'https://rubygems.org'
   else
     raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+          'public gem pushes.'
   end
 
   spec.files = `git ls-files -z`.split("\x0").reject do |file|
@@ -28,16 +28,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |file| File.basename(file) }
   spec.require_paths = %w(lib)
 
+  spec.required_ruby_version = '>= 2.3'
   spec.add_dependency 'sidekiq', '>= 3.3.1'
 
   spec.add_development_dependency 'appraisal',                 '~> 2.2'
   spec.add_development_dependency 'bundler',                   '~> 2.1'
-  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0'
   spec.add_development_dependency 'pry-byebug',                '~> 3.6'
   spec.add_development_dependency 'rack-test',                 '~> 1.1'
   spec.add_development_dependency 'rake',                      '~> 13.0'
   spec.add_development_dependency 'rspec',                     '~> 3.0'
-  spec.add_development_dependency 'rubocop',                   '~> 0.58'
-  spec.add_development_dependency 'rubocop-rspec',             '~> 1.28.0'
+  spec.add_development_dependency 'rubocop',                   '~> 1.22'
+  spec.add_development_dependency 'rubocop-performance',       '~> 1.12'
+  spec.add_development_dependency 'rubocop-rake',              '~> 0.6'
+  spec.add_development_dependency 'rubocop-rspec',             '~> 2.6'
   spec.add_development_dependency 'timecop',                   '~> 0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-prometheus-exporter
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Sergey Fedorov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +114,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: '1.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.22'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.58'
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.28.0
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +185,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
 - ".github/FUNDING.yml"
 - ".github/workflows/ci.yaml"
 - ".gitignore"
@@ -243,14 +256,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.20
 signing_key:
 specification_version: 4
 summary: Prometheus exporter for the Sidekiq

data/.codeclimate.yml

@@ -1,16 +0,0 @@
-version: "2"
-plugins:
-  duplication:
-    enabled: true
-    config:
-      languages:
-        ruby:
-          mass_threshold: 30
-    exclude_paths:
-    - spec/
-  rubocop:
-    enabled: true
-    channel: rubocop-0-58
-exclude_paths:
-- tmp/
-- gemfiles/