sidekiq-prometheus-exporter 0.1.14 → 0.1.17

data/gemfiles/sidekiq_latest.Gemfile.lock

@@ -0,0 +1,116 @@
+GIT
+  remote: https://github.com/mperham/sidekiq
+  revision: 20cdf68a7362c9f7cc40508e294b96026754772b
+  specs:
+    sidekiq (6.4.1)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
+
+GIT
+  remote: https://github.com/rack/rack
+  revision: 253fc5b29c240276d3cf573bdf795e6a6126b16f
+  specs:
+    rack (2.3.0)
+      rack-session
+
+GIT
+  remote: https://github.com/redis/redis-rb
+  revision: 5fb64bdecacac0bc5738f194ab82cd1001071879
+  specs:
+    redis (4.6.0)
+
+PATH
+  remote: ..
+  specs:
+    sidekiq-prometheus-exporter (0.1.17)
+      rack (>= 1.6.0)
+      sidekiq (>= 3.3.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    connection_pool (2.2.5)
+    diff-lcs (1.5.0)
+    method_source (1.0.0)
+    parallel (1.21.0)
+    parser (3.1.1.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rack-session (0.1.0)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.1)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.26.0)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.16.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.13.3)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.9.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    thor (1.2.1)
+    timecop (0.9.5)
+    unicode-display_width (2.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 2.2)
+  bundler (~> 2.1)
+  pry-byebug (~> 3.6)
+  rack (>= 2)!
+  rack-test (~> 1.1)
+  rake (~> 13.0)
+  redis (>= 4)!
+  rspec (~> 3.0)
+  rubocop (~> 1.22)
+  rubocop-performance (~> 1.12)
+  rubocop-rake (~> 0.6)
+  rubocop-rspec (~> 2.6)
+  sidekiq (>= 6)!
+  sidekiq-prometheus-exporter!
+  timecop (~> 0.9)
+
+BUNDLED WITH
+   2.3.7

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

@@ -1,6 +1,6 @@
 ---
 apiVersion: v1
-appVersion: 0.1.13
+appVersion: 0.1.17
 description: A Helm chart to deploy sidekiq-prometheus-exporter in Kubernetes
 name: sidekiq-prometheus-exporter
-version: 0.1.13
+version: 0.1.17

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.13`                             |
+| `image.tag`                    | Image tag                                                                                        | `0.1.17`                             |
 | `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.13
+  tag: 0.1.17
   ## 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: "..."
@@ -85,6 +86,7 @@ containerPort: 9292
 #   REDIS_NAMESPACE: "..."
 #   REDIS_SENTINELS: "..."
 #   REDIS_SENTINEL_ROLE: "..."
+#   REDIS_DISABLE_CLIENT_ID: "false"
 # envFrom:
 #   type: configMapRef
 #   name: myConfigMapReference

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.14'.freeze
+      VERSION = '0.1.17'.freeze
     end
   end
 end

data/lib/sidekiq/prometheus/exporter.rb

@@ -12,7 +12,7 @@ module Sidekiq
       NOT_FOUND_TEXT = 'Not Found'.freeze
       MOUNT_PATH = '/metrics'.freeze
       # rubocop:disable Style/MutableConstant
-      HEADERS = {'Content-Type' => 'text/plain; version=0.0.4', 'Cache-Control' => 'no-cache'}
+      HEADERS = {Rack::CONTENT_TYPE => 'text/plain; version=0.0.4', Rack::CACHE_CONTROL => 'no-cache'}
       # rubocop:enable Style/MutableConstant
       EXPORTERS = Exporters.new
 

data/sidekiq-prometheus-exporter.gemspec

@@ -16,9 +16,10 @@ Gem::Specification.new do |spec|
 
   if spec.respond_to?(:metadata)
     spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+    spec.metadata['rubygems_mfa_required'] = 'true'
   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 +29,19 @@ 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 'rack', '>= 1.6.0'
   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.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,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-prometheus-exporter
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.17
 platform: ruby
 authors:
 - Sergey Fedorov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +66,20 @@ 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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +128,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: '0.58'
+        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: '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,12 +199,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
 - ".github/FUNDING.yml"
+- ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE
@@ -197,18 +224,18 @@ files:
 - examples/sidekiq/Dockerfile
 - examples/sidekiq/sidekiq.rb
 - examples/sidekiq/sidekiq.yml
-- gemfiles/sidekiq_3.3.1.gemfile
-- gemfiles/sidekiq_3.3.1.gemfile.lock
-- gemfiles/sidekiq_3.x.gemfile
-- gemfiles/sidekiq_3.x.gemfile.lock
-- gemfiles/sidekiq_4.x.gemfile
-- gemfiles/sidekiq_4.x.gemfile.lock
-- gemfiles/sidekiq_5.x.gemfile
-- gemfiles/sidekiq_5.x.gemfile.lock
-- gemfiles/sidekiq_6.x.gemfile
-- gemfiles/sidekiq_6.x.gemfile.lock
-- gemfiles/sidekiq_head.gemfile
-- gemfiles/sidekiq_head.gemfile.lock
+- gemfiles/sidekiq_3.3.1.Gemfile
+- gemfiles/sidekiq_3.3.1.Gemfile.lock
+- gemfiles/sidekiq_3.x.Gemfile
+- gemfiles/sidekiq_3.x.Gemfile.lock
+- gemfiles/sidekiq_4.x.Gemfile
+- gemfiles/sidekiq_4.x.Gemfile.lock
+- gemfiles/sidekiq_5.x.Gemfile
+- gemfiles/sidekiq_5.x.Gemfile.lock
+- gemfiles/sidekiq_6.x.Gemfile
+- gemfiles/sidekiq_6.x.Gemfile.lock
+- gemfiles/sidekiq_latest.Gemfile
+- gemfiles/sidekiq_latest.Gemfile.lock
 - helm/sidekiq-prometheus-exporter/.helmignore
 - helm/sidekiq-prometheus-exporter/Chart.yaml
 - helm/sidekiq-prometheus-exporter/README.md
@@ -235,6 +262,7 @@ homepage: https://github.com/Strech/sidekiq-prometheus-exporter
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -243,14 +271,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.1.6
 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/

data/.travis.yml

@@ -1,85 +0,0 @@
-os: linux
-dist: xenial
-language: ruby
-rvm:
-  - 2.3.8
-  - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-  - ruby-head
-notifications:
-  email: false
-
-gemfile:
-  - gemfiles/sidekiq_3.3.1.gemfile
-  - gemfiles/sidekiq_3.x.gemfile
-  - gemfiles/sidekiq_4.x.gemfile
-  - gemfiles/sidekiq_5.x.gemfile
-  - gemfiles/sidekiq_6.x.gemfile
-  - gemfiles/sidekiq_head.gemfile
-
-jobs:
-  include:
-    - rvm: "2.6.6"
-      gemfile: "gemfiles/sidekiq_5.x.gemfile"
-      env:
-        - CODECLIMATE_REPORT=true
-  exclude:
-    - rvm: "2.3.8"
-      gemfile: "gemfiles/sidekiq_6.x.gemfile"
-    - rvm: "2.4.10"
-      gemfile: "gemfiles/sidekiq_6.x.gemfile"
-    - rvm: "2.3.8"
-      gemfile: "gemfiles/sidekiq_head.gemfile"
-    - rvm: "2.4.10"
-      gemfile: "gemfiles/sidekiq_head.gemfile"
-    - rvm: "2.5.8"
-      gemfile: "gemfiles/sidekiq_head.gemfile"
-    - rvm: "2.6.6"
-      gemfile: "gemfiles/sidekiq_head.gemfile"
-    - rvm: "2.7.1"
-      gemfile: "gemfiles/sidekiq_head.gemfile"
-  allow_failures:
-    - rvm: "ruby-head"
-      gemfile: "gemfiles/sidekiq_3.3.1.gemfile"
-    - rvm: "ruby-head"
-      gemfile: "gemfiles/sidekiq_3.x.gemfile"
-    - rvm: "ruby-head"
-      gemfile: "gemfiles/sidekiq_4.x.gemfile"
-    - rvm: "ruby-head"
-      gemfile: "gemfiles/sidekiq_5.x.gemfile"
-    - rvm: "ruby-head"
-      gemfile: "gemfiles/sidekiq_6.x.gemfile"
-    - rvm: "ruby-head"
-      gemfile: "gemfiles/sidekiq_head.gemfile"
-
-cache:
-  directories:
-    - ./vendor
-
-env:
-  global:
-    - CC_TEST_REPORTER_ID=$CODECLIMATE_REPO_TOKEN
-
-before_install:
-  - gem install bundler -v '~> 2.1'
-
-before_script:
-  - if [ ! -f ./vendor/cc-test-reporter ]; then
-    curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./vendor/cc-test-reporter;
-    chmod +x ./vendor/cc-test-reporter;
-    fi
-  - if [ ! -z "$CODECLIMATE_REPORT" ]; then
-    echo "Start recording Codeclimate test coverage";
-    ./vendor/cc-test-reporter before-build;
-    fi
-
-script:
-  - bundle exec rake spec
-
-after_success:
-  - if [ ! -z "$CODECLIMATE_REPORT" ]; then
-    echo "Finish recording Codeclimate test coverage";
-    ./vendor/cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT;
-    fi