sidekiq_prometheus 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e41a25aa249fbd72437fef36b40b8ff0328a31ebb588a3e6be32b66d4af8bb37
-  data.tar.gz: 79093b2be152a84f528a17e36866f49db59812dc3789d81dbda8fe7d7f2d6974
+  metadata.gz: 406db244197b046b453c9bed648710f3356f00cd8691c8cff45344a5a0131bbf
+  data.tar.gz: 406cebc699b5f18c963271043247b74b2c54f68fb1b35647182ee4ff2d3a3765
 SHA512:
-  metadata.gz: b6018610e3dbf12324a123ad27f681771d93099a898ba454e9715cca4fa40fc9bccc96f3506ebd3df06501410ac3f4c8f838acbc207580a95f01c1e49187aa32
-  data.tar.gz: 765360b4f3e748592828c414a95afae77c30846569e0fa4dee21aae40af530dab2caf13b119befb2c0086b39c4b3e9c9a4c8a9e8b7417c89a05f1949fbf6ede1
+  metadata.gz: 14529af9deb335de65bb3df49a0abf33861944acf2d02b4ef07440ea26138e0b8e80fe5a6c0900793156cc643e90f5074db4ce78fb69190ee40c40eb69048a25
+  data.tar.gz: 3bd9c884058c368cc2fcf44c7e4005ecadb10a83ac94065f380d4859da0e7dff973eedf9264936209eacee789626fb8156aa478b05086e1b077739e1c5d25306

data/.github/workflows/ruby.yml

@@ -0,0 +1,30 @@
+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.1', '3.2', '3.3', '3.4']
+        gemfile: [ sidekiq_6, sidekiq_7 ]
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}.gemfile
+    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/CHANGELOG.md

@@ -1,5 +1,25 @@
 CHANGELOG
 
+<a name="v2.0.1"></a>
+## [v2.0.1](https://github.com/fastly/sidekiq-prometheus/compare/v2.0.0...v2.0.1) (2023-11-01)
+
+## What's Changed
+* Use github actions instead of travis-ci. by @leklund in https://github.com/fastly/sidekiq-prometheus/pull/43
+* Fix: Accomodate apps that do not use Sidekiq Enterprise by @jayroh in https://github.com/fastly/sidekiq-prometheus/pull/42
+
+## New Contributors
+* @jayroh made their first contribution in https://github.com/fastly/sidekiq-prometheus/pull/42
+
+**Full Changelog**: https://github.com/fastly/sidekiq-prometheus/compare/v2.0.0...v2.0.1
+
+<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)
 

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/version.rb

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

data/lib/sidekiq_prometheus.rb

@@ -2,6 +2,7 @@
 
 require "benchmark"
 require "rack"
+require "rackup"
 require "prometheus/client"
 require "prometheus/middleware/exporter"
 require "sidekiq"
@@ -225,12 +226,12 @@ module SidekiqPrometheus
     }
 
     unless metrics_server_logger_enabled?
-      opts[:Logger] = WEBrick::Log.new("/dev/null")
+      opts[:Logger] = WEBrick::Log.new(File::NULL)
       opts[:AccessLog] = []
     end
 
     @_metrics_server ||= Thread.new do
-      Rack::Handler::WEBrick.run(
+      Rackup::Handler::WEBrick.run(
         Rack::Builder.new {
           use Prometheus::Middleware::Exporter, registry: SidekiqPrometheus.registry
           run ->(_) { [301, {"Location" => "/metrics"}, []] }

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", "< 3.0"
+  spec.add_runtime_dependency "rack", "~> 3.0"
+  spec.add_runtime_dependency "rackup", ">2.0"
   spec.add_runtime_dependency "redis"
   spec.add_runtime_dependency "sidekiq", "> 5.1"
   spec.add_runtime_dependency "webrick"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_prometheus
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 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: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,16 +99,30 @@ dependencies:
   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: rackup
+  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
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -160,9 +174,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

data/.travis.yml

@@ -1,10 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 3.1
-  - 3.0
-  - 2.7
-before_install: gem install bundler -v 2.2.15
-gemfile:
-  - sidekiq_6.gemfile
-  - sidekiq_7.gemfile