sidekiq-prometheus-exporter 0.1.17 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d49eee804952e326619e0c38a486343c277249db897b8c2ef214d5f449efbbc
-  data.tar.gz: 529fadfaf195e9415d2344397acf8e73fd171022df02fbdbd13886e8d6c5230e
+  metadata.gz: 420aff1e44de33405644188fadfe166fe8b8b1f24994ad0035bc2f350e968718
+  data.tar.gz: ec7e9d8fba8d9f56151a7c759ccc55202f8a5ef7a776cf5ce273aea834cea60e
 SHA512:
-  metadata.gz: dd43a43f2d0f8dea5b58a64c42387cb2b9973021eb912d54ad24375af64f33f2252a3b27b029ef3008216d8c5908c7ea2259c0cbd06e7aac0c7120f4e2423695
-  data.tar.gz: 815ca578012da37e72d4293fef12adb228ad602e9ad33664588c1269f0cd6a8602c31e4456287eac180fead1a7cadf135f805a823a3ff2f0cad1e9971c75fa24
+  metadata.gz: 6fba09943f7bbb9c886ee10ad36ea9647e26411bbf378676ae99cdfc26b3adb9e41c9bf346dd496c3b087f119851267fa2a25d997b79117fcd9b88b9524ec8f4
+  data.tar.gz: 8a2dbb2c61076fc58913f6c83eb27be187279d113fc1c1112eb0fbb051dbf1a56b5ce521e267afccda87aa7a9bfbde86d32ab3cd877f4e9bcbdadf761556d7d7

data/.github/workflows/ci.yaml

@@ -5,6 +5,9 @@ on:
     branches: ["master"]
   pull_request:
     branches: ["master"]
+  schedule:
+    # Run the workflow once per month
+    - cron: "0 0 1 * *"
 jobs:
   rubocop:
     name: Rubocop
@@ -13,11 +16,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0.2
+          ruby-version: 2.7.8
       - name: rubocop
         uses: reviewdog/action-rubocop@v2
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
           rubocop_version: gemfile
           rubocop_extensions: rubocop-rake:gemfile rubocop-rspec:gemfile rubocop-performance:gemfile
           reporter: github-pr-review
@@ -30,17 +32,17 @@ jobs:
     strategy:
       matrix:
         # Always keep a window of "5 most recent" including (or on top with) HEAD
-        ruby: ["2.6.8", "2.7.4", "3.0.2", "3.1.1", "latest"]
-        sidekiq: ["3.3.1", "3.x", "4.x", "5.x", "6.x", "latest"]
+        ruby: ["2.7.8", "3.0.6", "3.1.4", "3.2.2", "latest"]
+        sidekiq: ["4.1.0", "4.x", "5.x", "6.x", "7.x", "latest"]
         # Allow failures ... kind-a
         exclude:
-          - ruby: "2.6.8"
+          - ruby: "2.7.8"
             sidekiq: "latest"
-          - ruby: "2.7.4"
+          - ruby: "3.0.6"
             sidekiq: "latest"
-          - ruby: "3.0.2"
+          - ruby: "3.1.4"
             sidekiq: "latest"
-          - ruby: "3.1.1"
+          - ruby: "3.2.2"
             sidekiq: "latest"
 
     container:

data/.rubocop.yml

@@ -8,6 +8,9 @@ AllCops:
   NewCops: enable
   SuggestExtensions: false
   TargetRubyVersion: ~
+  Exclude:
+    - "gemfiles/**/*"
+    - "tmp/**/*"
 
 Gemspec/RequiredRubyVersion:
   Enabled: false
@@ -69,7 +72,7 @@ Layout/MultilineOperationIndentation:
   IndentationWidth: ~
 
 Metrics/AbcSize:
-  Max: 25
+  Max: 35
   CountRepeatedAttributes: false
 
 Metrics/MethodLength:

data/Appraisals

@@ -1,24 +1,12 @@
-appraise 'sidekiq-3.3.1' do
-  gem 'slim'
+appraise 'sidekiq-4.1.0' do
   gem 'redis', '~> 3.3'
-  gem 'redis-namespace', '< 1.7.0'
+  gem 'sidekiq', '= 4.1.0'
   gem 'sinatra'
-  gem 'concurrent-ruby'
-  gem 'sidekiq', '= 3.3.1'
-end
-
-appraise 'sidekiq-3.x' do
-  gem 'slim'
-  gem 'redis', '~> 3.3'
-  gem 'redis-namespace', '< 1.7.0'
-  gem 'sinatra'
-  gem 'concurrent-ruby'
-  gem 'sidekiq', '~> 3.0'
 end
 
 appraise 'sidekiq-4.x' do
   gem 'redis', '~> 3.3'
-  gem 'sidekiq', '~> 4.0'
+  gem 'sidekiq', '~> 4.1'
 end
 
 appraise 'sidekiq-5.x' do
@@ -31,6 +19,11 @@ appraise 'sidekiq-6.x' do
   gem 'sidekiq', '~> 6.0'
 end
 
+appraise 'sidekiq-7.x' do
+  gem 'redis', '~> 5.0'
+  gem 'sidekiq', '~> 7.0'
+end
+
 appraise 'sidekiq-latest' do
   gem 'rack', '>= 2', github: 'rack/rack'
   gem 'redis', '>= 4', github: 'redis/redis-rb'

data/README.md

@@ -20,7 +20,7 @@ Open [dashboard example file](/examples/sidekiq-dashboard.grafana-7.json) (grafa
 
 # Available metrics
 
-_(starting Sidekiq `v3.3.1`)_
+_(starting Sidekiq `v4.1.0`)_
 
 ## Standard
 
@@ -30,6 +30,7 @@ _(starting Sidekiq `v3.3.1`)_
 | sidekiq_failed_jobs_total                 | counter | The total number of failed jobs                                                                        |
 | sidekiq_workers                           | gauge   | The number of workers across all the processes                                                         |
 | sidekiq_processes                         | gauge   | The number of processes                                                                                |
+| sidekiq_host_processes                    | gauge   | The number of processes running on the host (labels: `host`, `quiet`)                                  |
 | sidekiq_busy_workers                      | gauge   | The number of workers performing the job                                                               |
 | sidekiq_enqueued_jobs                     | gauge   | The number of enqueued jobs                                                                            |
 | sidekiq_scheduled_jobs                    | gauge   | The number of jobs scheduled for a future execution                                                    |
@@ -220,4 +221,4 @@ please make sure that you are following naming conventions from [Prometheus](htt
 
 # License
 
-Please see [LICENSE](https://github.com/mperham/sidekiq/blob/master/LICENSE) for licensing details.
+Please see [LICENSE](/LICENSE) for licensing details.

data/Rakefile

@@ -12,6 +12,7 @@ require 'fileutils'
 require_relative 'lib/sidekiq/prometheus/exporter/version'
 
 VERSION = Sidekiq::Prometheus::Exporter::VERSION
+DOCKER_PATCH_VERSION = Sidekiq::Prometheus::Exporter::DOCKER_PATCH_VERSION
 
 def execute(command)
   output = `#{command}`
@@ -24,17 +25,22 @@ def execute(command)
   output
 end
 
+def docker_version
+  patch = DOCKER_PATCH_VERSION unless DOCKER_PATCH_VERSION.to_i.zero?
+  [VERSION, patch].compact.join('-')
+end
+
 namespace :docker do
-  desc "Release new Docker image strech/sidekiq-prometheus-exporter:#{VERSION} (latest)"
-  task :release, %i(patch) do |_, args|
-    version = [VERSION, args.patch].compact.join('-')
+  desc "Release new Docker image strech/sidekiq-prometheus-exporter:#{docker_version} (latest)"
+  task :release, %i(version) do |_, args|
+    version = args.fetch(:version, docker_version)
 
     Rake::Task['docker:build'].invoke(version)
     Rake::Task['docker:push'].invoke(version)
   end
 
   task :build, %i(version) do |_, args|
-    args.with_defaults(version: VERSION)
+    args.with_defaults(version: docker_version)
     image = 'strech/sidekiq-prometheus-exporter'
 
     Dir.chdir(File.expand_path('./docker')) do
@@ -45,7 +51,7 @@ namespace :docker do
   end
 
   task :push, %i(version) do |_, args|
-    args.with_defaults(version: VERSION)
+    args.with_defaults(version: docker_version)
     image = 'strech/sidekiq-prometheus-exporter'
 
     execute("docker push #{image}:#{args.version}")
@@ -57,12 +63,12 @@ end
 
 namespace :helm do
   desc 'Generate new Helm repo index'
-  task :generate, %i(patch) do |_, args|
-    version = [VERSION, args.patch].compact.join('-')
+  task :generate, %i(version) do |_, args|
+    args.with_defaults(version: docker_version)
     archive_dir = File.expand_path("./tmp/archive-#{Time.now.to_i}")
 
     Rake::Task['helm:package'].invoke(archive_dir)
-    Rake::Task['helm:index'].invoke(archive_dir, version)
+    Rake::Task['helm:index'].invoke(archive_dir, args.version)
 
     puts "New index generated: #{File.join(archive_dir, 'index.yaml')}"
   end
@@ -77,7 +83,7 @@ namespace :helm do
   end
 
   task :index, %i(directory version) do |_, args|
-    args.with_defaults(version: VERSION)
+    args.with_defaults(version: docker_version)
 
     Dir.chdir(args.fetch(:directory)) do
       url = "https://github.com/Strech/sidekiq-prometheus-exporter/releases/download/v#{args.version}"

data/docker/Dockerfile

@@ -1,11 +1,11 @@
-FROM ruby:2.7.5-alpine
+FROM ruby:2.7.7-alpine3.16
 
 LABEL maintainer="Sergey Fedorov <oni.strech@gmail.com>"
 LABEL repository="strech/sidekiq-prometheus-exporter"
 
-ENV RACK_VERSION 2.0.9
-ENV SIDEKIQ_VERSION 6.2.1
-ENV REDIS_NAMESPACE_VERSION 1.8.1
+ENV RACK_VERSION 2.2.4
+ENV SIDEKIQ_VERSION 6.5.7
+ENV REDIS_NAMESPACE_VERSION 1.9
 ENV SIDEKIQ_PROMETHEUS_EXPORTER_VERSION 0.1.17
 
 RUN    addgroup -S exporter \

data/gemfiles/{sidekiq_3.x.Gemfile → sidekiq_4.1.0.Gemfile}

@@ -2,11 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "slim"
 gem "redis", "~> 3.3"
-gem "redis-namespace", "< 1.7.0"
+gem "sidekiq", "= 4.1.0"
 gem "sinatra"
-gem "concurrent-ruby"
-gem "sidekiq", "~> 3.0"
 
 gemspec path: "../"

data/gemfiles/sidekiq_4.1.0.Gemfile.lock

@@ -0,0 +1,117 @@
+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)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.0)
+    diff-lcs (1.5.0)
+    json (2.6.3)
+    method_source (1.0.0)
+    mustermann (3.0.0)
+      ruby2_keywords (~> 0.0.1)
+    parallel (1.23.0)
+    parser (3.2.2.0)
+      ast (~> 2.4.1)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.10.1)
+      byebug (~> 11.0)
+      pry (>= 0.13, < 0.15)
+    rack (2.2.6.4)
+    rack-protection (3.0.3)
+      rack
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    redis (3.3.5)
+    regexp_parser (2.8.0)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.50.2)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-performance (1.17.1)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.20.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sidekiq (4.1.0)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      redis (~> 3.2, >= 3.2.1)
+    sinatra (3.0.3)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.0.3)
+      tilt (~> 2.0)
+    thor (1.2.1)
+    tilt (2.0.11)
+    timecop (0.9.6)
+    unicode-display_width (2.4.2)
+
+PLATFORMS
+  x86_64-darwin-21
+
+DEPENDENCIES
+  appraisal (~> 2.2)
+  bundler (~> 2.1)
+  pry (~> 0.14)
+  pry-byebug (~> 3.6)
+  rack-test (~> 1.1)
+  rake (~> 13.0)
+  redis (~> 3.3)
+  rspec (~> 3.0)
+  rubocop (~> 1.22)
+  rubocop-performance (~> 1.12)
+  rubocop-rake (~> 0.6)
+  rubocop-rspec (~> 2.6)
+  sidekiq (= 4.1.0)
+  sidekiq-prometheus-exporter!
+  sinatra
+  timecop (~> 0.9)
+
+BUNDLED WITH
+   2.3.26

data/gemfiles/sidekiq_4.x.Gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "redis", "~> 3.3"
-gem "sidekiq", "~> 4.0"
+gem "sidekiq", "~> 4.1"
 
 gemspec path: "../"

data/gemfiles/sidekiq_4.x.Gemfile.lock

@@ -15,60 +15,62 @@ GEM
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    connection_pool (2.2.5)
+    concurrent-ruby (1.1.10)
+    connection_pool (2.3.0)
     diff-lcs (1.5.0)
+    json (2.6.2)
     method_source (1.0.0)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rack (2.2.3)
-    rack-protection (2.2.0)
+      pry (>= 0.13, < 0.15)
+    rack (2.2.4)
+    rack-protection (3.0.3)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.1.1)
     rake (13.0.6)
     redis (3.3.5)
-    regexp_parser (2.2.1)
+    regexp_parser (2.6.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)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.26.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.39.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.13.3)
+    rubocop-performance (1.15.1)
       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)
+    rubocop-rspec (2.15.0)
+      rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     sidekiq (4.2.10)
       concurrent-ruby (~> 1.0)
@@ -77,7 +79,7 @@ GEM
       redis (~> 3.2, >= 3.2.1)
     thor (1.2.1)
     timecop (0.9.5)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   ruby
@@ -85,6 +87,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal (~> 2.2)
   bundler (~> 2.1)
+  pry (~> 0.14)
   pry-byebug (~> 3.6)
   rack-test (~> 1.1)
   rake (~> 13.0)
@@ -94,9 +97,9 @@ DEPENDENCIES
   rubocop-performance (~> 1.12)
   rubocop-rake (~> 0.6)
   rubocop-rspec (~> 2.6)
-  sidekiq (~> 4.0)
+  sidekiq (~> 4.1)
   sidekiq-prometheus-exporter!
   timecop (~> 0.9)
 
 BUNDLED WITH
-   2.3.7
+   2.3.26

data/gemfiles/sidekiq_5.x.Gemfile.lock

@@ -15,59 +15,61 @@ GEM
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    connection_pool (2.2.5)
+    connection_pool (2.3.0)
     diff-lcs (1.5.0)
+    json (2.6.2)
     method_source (1.0.0)
-    parallel (1.21.0)
-    parser (3.1.1.0)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rack (2.2.3)
-    rack-protection (2.2.0)
+      pry (>= 0.13, < 0.15)
+    rack (2.2.4)
+    rack-protection (3.0.3)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.1.1)
     rake (13.0.6)
     redis (3.3.5)
-    regexp_parser (2.2.1)
+    regexp_parser (2.6.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)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.26.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.39.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+    rubocop-ast (1.23.0)
       parser (>= 3.1.1.0)
-    rubocop-performance (1.13.3)
+    rubocop-performance (1.15.1)
       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)
+    rubocop-rspec (2.15.0)
+      rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
     sidekiq (5.2.9)
       connection_pool (~> 2.2, >= 2.2.2)
@@ -76,7 +78,7 @@ GEM
       redis (>= 3.3.5, < 4.2)
     thor (1.2.1)
     timecop (0.9.5)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
   ruby
@@ -84,6 +86,7 @@ PLATFORMS
 DEPENDENCIES
   appraisal (~> 2.2)
   bundler (~> 2.1)
+  pry (~> 0.14)
   pry-byebug (~> 3.6)
   rack-test (~> 1.1)
   rake (~> 13.0)
@@ -98,4 +101,4 @@ DEPENDENCIES
   timecop (~> 0.9)
 
 BUNDLED WITH
-   2.3.7
+   2.3.26