sidekiq_prometheus 1.9.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 654002b3b3138eef5307c4e4c3cab5a6d8ca45cc283c49341d3c1760f4d3ef67
-  data.tar.gz: 5abf477f0a4a8baa64e82d22527477614d57f48c8bf26c4d637a7c24bbb5cc70
+  metadata.gz: 2714333d887725850f63e8fc1caf7d43c81186f8c2a8d7ac8aef03e6c58b18b8
+  data.tar.gz: f7d847ae7d35c0d082fda2b31ed5eb61c54d3f3314ed85c983bc2f05cc7cb68d
 SHA512:
-  metadata.gz: 0544dc888a169886f532b2aa08ef8ab3c8c34ec1dea5a72bb9a75618aecfaaf4d1de81f6ae44cd61cc2621189ad69489a082f4af877cf63e7139ca3eb124a8dc
-  data.tar.gz: 7eb8689d5514e3585a6ee722a5f21d6f964a56146750d922fa578164a72ffbb36415c47befb10f7f7c61cc82ada60c7a4200b55370cf74ceae72270f4b423d98
+  metadata.gz: a50d4f382cbe52c0ba351b7a6a006c2f2787d14292f8fc4d2d84af0b92b75cea7edded1e55087d56cdbc047b3f43c693745ffa0d8043bd2faee9f9e6c61e4ff8
+  data.tar.gz: 1dd6f7d4052529dcb35055acf4c42739bd56b19a0b44ac0e3c5985b42c45b38e034e5f7113fc01b127675ee3930a3e0202f2ddcfc8db0577575ad7034f98d49d

data/.github/workflows/ruby.yml

@@ -0,0 +1,28 @@
+name: Ruby
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -8,4 +8,5 @@
 /tmp/
 .rspec_status
 Gemfile.lock
+*gemfile.lock
 /.idea/

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 CHANGELOG
 
+<a name="v2.0.0"></a>
+## [v2.0.0](https://github.com/fastly/sidekiq-prometheus/compare/v1.9.0...v2.0.0) (2023-08-23)
+
+## What's Changed
+* Sidekiq 7 support by @leklund in https://github.com/fastly/sidekiq-prometheus/pull/37
+
+**Full Changelog**: https://github.com/fastly/sidekiq-prometheus/compare/v1.9.0...v2.0.0
+
+<a name="v1.9.0"></a>
+## [v1.9.0](https://github.com/fastly/sidekiq-prometheus/compare/v1.8.3...v1.9.0) (2023-08-23)
+
+## What's Changed
+* Adds info about sidekiq_job_over_limit metric to README by @ricardogpsf in https://github.com/fastly/sidekiq-prometheus/pull/38
+* Allow label sets initialization while registering metrics by @davidbrusius in https://github.com/fastly/sidekiq-prometheus/pull/40
+
+## New Contributors
+* @ricardogpsf made their first contribution in https://github.com/fastly/sidekiq-prometheus/pull/38
+* @davidbrusius made their first contribution in https://github.com/fastly/sidekiq-prometheus/pull/40
+
+**Full Changelog**: https://github.com/fastly/sidekiq-prometheus/compare/v1.8.3...v1.9.0
+
 <a name="v1.8.3"></a>
 ## [v1.8.3](https://github.com/fastly/sidekiq-prometheus/compare/v1.8.2...v1.8.3) (2023-01-30)
 

data/README.md

@@ -1,7 +1,7 @@
 # Sidekiq Prometheus
 
 
-[![Status](https://travis-ci.org/fastly/sidekiq-prometheus.svg?branch=main)](https://travis-ci.org/fastly/sidekiq-prometheus)
+[![Status](https://github.com/fastly/sidekiq-prometheus/actions/workflows/ruby.yml/badge.svg)](https://github.com/fastly/sidekiq-prometheus/actions/workflows/ruby.yml)
 ![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)
 
@@ -276,7 +276,3 @@ 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/main/CODE_OF_CONDUCT.md).
-
-# Metadata
-
-- Ignore

data/lib/sidekiq_prometheus/job_metrics.rb

@@ -30,7 +30,7 @@ class SidekiqPrometheus::JobMetrics
 
       result
     rescue => e
-      if e.instance_of?(::Sidekiq::Limiter::OverLimit)
+      if defined?(::Sidekiq::Limiter::OverLimit) && e.instance_of?(::Sidekiq::Limiter::OverLimit)
         registry[:sidekiq_job_over_limit].increment(labels: labels)
       else
         err_label = {error_class: e.class.to_s}

data/lib/sidekiq_prometheus/periodic_metrics.rb

@@ -12,6 +12,7 @@
 
 begin
   require "sidekiq/component"
+  require "redis"
 rescue LoadError
 end
 
@@ -113,7 +114,11 @@ class SidekiqPrometheus::PeriodicMetrics
   # Records metrics from Redis
   def report_redis_metrics
     redis_info = begin
-      Sidekiq.redis_info
+      if SidekiqPrometheus.sidekiq_seven?
+        Sidekiq.default_configuration.redis_info
+      else
+        Sidekiq.redis_info
+      end
     rescue Redis::BaseConnectionError
       nil
     end

data/lib/sidekiq_prometheus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqPrometheus
-  VERSION = "1.9.0"
+  VERSION = "2.0.1"
 end

data/lib/sidekiq_prometheus.rb

@@ -239,6 +239,10 @@ module SidekiqPrometheus
       )
     end
   end
+
+  def sidekiq_seven?
+    @sk7 ||= Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("7.0")
+  end
 end
 
 class SidekiqPrometheus::Error < StandardError; end

data/sidekiq_6.gemfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in sidekiq_prometheus.gemspec
+gemspec
+
+gem "sidekiq", "< 7.0"

data/sidekiq_7.gemfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
+# Specify your gem's dependencies in sidekiq_prometheus.gemspec
+gemspec
+
+gem "sidekiq", "> 7.0"

data/sidekiq_prometheus.gemspec

@@ -28,7 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "standard"
 
   spec.add_runtime_dependency "prometheus-client", ">= 2.0"
-  spec.add_runtime_dependency "rack"
-  spec.add_runtime_dependency "sidekiq", "> 5.1", "< 7.0"
+  spec.add_runtime_dependency "rack", "< 3.0"
+  spec.add_runtime_dependency "redis"
+  spec.add_runtime_dependency "sidekiq", "> 5.1"
   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.9.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Lukas Eklund
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-23 00:00:00.000000000 Z
+date: 2023-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,20 @@ dependencies:
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -116,9 +130,6 @@ 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
@@ -126,9 +137,6 @@ 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
@@ -152,9 +160,9 @@ extra_rdoc_files: []
 files:
 - ".chglog/CHANGELOG.tpl.md"
 - ".chglog/config.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -168,6 +176,8 @@ files:
 - lib/sidekiq_prometheus/metrics.rb
 - lib/sidekiq_prometheus/periodic_metrics.rb
 - lib/sidekiq_prometheus/version.rb
+- sidekiq_6.gemfile
+- sidekiq_7.gemfile
 - sidekiq_prometheus.gemspec
 homepage: https://github.com/fastly/sidekiq-prometheus
 licenses:

data/.travis.yml

@@ -1,7 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 3.1
-  - 3.0
-  - 2.7
-before_install: gem install bundler -v 2.2.15