sidekiq-throttled 0.14.1 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe88fba2840a8a649b6a02951a246176e8b548257997aeaf922c7582e8c27e17
-  data.tar.gz: 76ba37d70509e33a266e7ad1e9e51babd4afd874788a1548b1aabc3a1c1cad87
+  metadata.gz: 51d312add58d0286d72087cefbdd49eac85a07c5416034e731f5c755f9fe702a
+  data.tar.gz: f7774ca65a0a26bb499dde8e34622d9e055b5112009228637a1f4b7696ad44bc
 SHA512:
-  metadata.gz: 14979e92d96a56096f19e61a40f8343025de2ccb4a57ede6f311be83acd80cca44d9bae7448ad2453e9539aa599c6154d2eec9f2a285148f14d2ad70fa9d86c4
-  data.tar.gz: 8ad7ee2999f8ab2645bdff54efc2b2592b5d416807795f58454af1a5f03ae3099975db492bbab4658cd2b9d5160af705c5509536c9dd7dddaa1db35c5ebe4448
+  metadata.gz: 0e7170c5e6dbe4a5664523ab04794b2f921296c690fbac05e6a2966bc0285612374441ec86d561cf48a45d36369c8c2fe0154c99aa2b9ed347cec642a0c4d22a
+  data.tar.gz: a7c8ff62bb1ff8e09f609f8d341ab57539e3db8aa8112c29d09f052b487310c5969e98c5e80c5cc6f1b4e1dbd13a278f7d117bb4ff13e28ee0e2f75743044b74

data/.github/dependabot.yml

@@ -0,0 +1,12 @@
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/ci.yml

@@ -2,18 +2,19 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
-  rspec:
+  test:
     name: "rspec (ruby:${{ matrix.ruby }} sidekiq:${{ matrix.sidekiq }})"
 
     strategy:
+      fail-fast: false
       matrix:
-        ruby: [ "2.6", "2.7" ]
-        sidekiq: [ "5.0", "5.1", "5.2", "6.0", "6.1" ]
+        ruby: [ "2.7", "3.0", "3.1" ]
+        sidekiq: [ "6.0", "6.1", "6.2", "6.3", "6.4", "6.5" ]
 
     runs-on: ubuntu-latest
 
@@ -24,31 +25,28 @@ jobs:
         options: "--entrypoint redis-server"
 
     env:
-      GEMFILE: gemfiles/sidekiq_${{ matrix.sidekiq }}.gemfile
+      BUNDLE_GEMFILE: gemfiles/sidekiq_${{ matrix.sidekiq }}.gemfile
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
 
-      - name: bundle install
-        run: bundle install --without development --jobs 4 --retry 3
-
-      - run: bundle exec rspec
+      - name: bundle exec rspec
+        run: bundle exec rspec --format progress --force-colour
 
   rubocop:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.4"
-
-      - name: bundle install
-        run: bundle install --without development --jobs 4 --retry 3
+          ruby-version: "2.7"
+          bundler-cache: true
 
       - run: bundle exec rubocop

data/.rubocop.yml

@@ -1,19 +1,20 @@
 require:
   - rubocop-performance
+  - rubocop-rake
   - rubocop-rspec
 
 inherit_from:
   - .rubocop_todo.yml
-  - .rubocop/layout.yml
-  - .rubocop/lint.yml
-  - .rubocop/metrics.yml
-  - .rubocop/performance.yml
-  - .rubocop/rspec.yml
-  - .rubocop/style.yml
+  - rubocop/layout.yml
+  - rubocop/lint.yml
+  - rubocop/metrics.yml
+  - rubocop/performance.yml
+  - rubocop/rspec.yml
+  - rubocop/style.yml
 
 AllCops:
   Exclude:
     - gemfiles/**/*
     - vendor/**/*
   NewCops: enable
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.7

data/.rubocop_todo.yml

@@ -1,12 +1,40 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-09-14 13:53:26 UTC using RuboCop version 0.90.0.
+# on 2022-06-13 00:11:28 UTC using RuboCop version 1.30.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 68
+# Offense count: 3
+# Configuration parameters: AllowComments, AllowEmptyLambdas.
+Lint/EmptyBlock:
+  Exclude:
+    - 'spec/sidekiq/throttled/middleware_spec.rb'
+    - 'spec/sidekiq/throttled/registry_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyleForLeadingUnderscores.
+# SupportedStylesForLeadingUnderscores: disallowed, required, optional
+Naming/MemoizedInstanceVariableName:
+  Exclude:
+    - 'lib/sidekiq/throttled/communicator.rb'
+    - 'lib/sidekiq/throttled/queues_pauser.rb'
+
+# Offense count: 2
+Performance/MethodObjectAsBlock:
+  Exclude:
+    - 'lib/sidekiq/throttled/queues_pauser.rb'
+
+# Offense count: 2
+# Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
+# Include: **/*_spec*rb*, **/spec/**/*
+RSpec/FilePath:
+  Exclude:
+    - 'spec/sidekiq/throttled/web/queues_spec.rb'
+    - 'spec/sidekiq/throttled/web/throttled_spec.rb'
+
+# Offense count: 69
 # Configuration parameters: .
 # SupportedStyles: have_received, receive
 RSpec/MessageSpies:
@@ -25,8 +53,16 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NestedGroups:
   Max: 5
 
-# Offense count: 4
+# Offense count: 5
+RSpec/StubbedMock:
+  Exclude:
+    - 'spec/sidekiq/throttled/expirable_list_spec.rb'
+    - 'spec/sidekiq/throttled/fetch_spec.rb'
+    - 'spec/sidekiq/throttled/queues_pauser_spec.rb'
+
+# Offense count: 6
 RSpec/SubjectStub:
   Exclude:
     - 'spec/sidekiq/throttled/communicator_spec.rb'
+    - 'spec/sidekiq/throttled/fetch_spec.rb'
     - 'spec/sidekiq/throttled/queues_pauser_spec.rb'

data/Appraisals

@@ -1,21 +1,25 @@
 # frozen_string_literal: true
 
-appraise "sidekiq-5.0" do
-  gem "sidekiq", "~> 5.0.0"
+appraise "sidekiq-6.0" do
+  gem "sidekiq", "~> 6.0.0"
 end
 
-appraise "sidekiq-5.1" do
-  gem "sidekiq", "~> 5.1.0"
+appraise "sidekiq-6.1" do
+  gem "sidekiq", "~> 6.1.0"
 end
 
-appraise "sidekiq-5.2" do
-  gem "sidekiq", "~> 5.2.0"
+appraise "sidekiq-6.2" do
+  gem "sidekiq", "~> 6.2.0"
 end
 
-appraise "sidekiq-6.0" do
-  gem "sidekiq", "~> 6.0.0"
+appraise "sidekiq-6.3" do
+  gem "sidekiq", "~> 6.3.0"
 end
 
-appraise "sidekiq-6.1" do
-  gem "sidekiq", "~> 6.1.0"
+appraise "sidekiq-6.4" do
+  gem "sidekiq", "~> 6.4.0"
+end
+
+appraise "sidekiq-6.5" do
+  gem "sidekiq", "~> 6.5.0"
 end

data/CHANGES.md

@@ -1,3 +1,66 @@
+## 0.16.1 (2022-06-14)
+
+* [#2](https://github.com/ixti/sidekiq-throttled/pull/2)
+  Support custom ActiveJob adapters.
+  ([@longkt90])
+
+* [#107](https://github.com/sensortower/sidekiq-throttled/pull/107)
+  Log error when key sufix extraction fails.
+  ([@pjungwir])
+
+## 0.16.0 (2022-06-13)
+
+* Drop Ruby 2.6 support.
+
+* Drop Sidekiq 5.X support.
+
+* [#121](https://github.com/sensortower/sidekiq-throttled/pull/121)
+  Sidekiq 6.5 compatibility.
+  ([@hieuk09])
+
+* [#116](https://github.com/sensortower/sidekiq-throttled/pull/116)
+  Unwrap ActiveJob JobWrapper
+  ([@holstvoogd])
+
+* [#115](https://github.com/sensortower/sidekiq-throttled/pull/115)
+  Fix Redis 4.6 deprecation warnings.
+  ([@dbackeus])
+
+* [#113](https://github.com/sensortower/sidekiq-throttled/pull/113)
+  Add Ruby 3.1 to CI.
+  ([@petergoldstein])
+
+* [#103](https://github.com/sensortower/sidekiq-throttled/pull/103)
+  Rename Sidekiq::Throttled::Worker to Sidekiq::Throttled::Job, and alias it
+  as Sidekiq::Throttled::Worker.
+  ([@CHTJonas])
+
+## 0.15.0 (2021-12-16)
+
+* [#102](https://github.com/sensortower/sidekiq-throttled/pull/102)
+  Support Ruby 3.0 and Sidekiq 6.2+.
+  ([@ybiquitous])
+
+* [#97](https://github.com/sensortower/sidekiq-throttled/pull/97)
+  Fix kwargs usage in strategy collection.
+  ([@baptistejub])
+
+## 0.14.0 (2021-09-21)
+
+* [#98](https://github.com/sensortower/sidekiq-throttled/pull/98)
+  Remove warning for strategy override.
+  ([@mattiagiuffrida-st])
+
+* [#65](https://github.com/sensortower/sidekiq-throttled/pull/65)
+  Support composite (multi-key) strategies.
+  ([@holyketzer])
+
+* [#89](https://github.com/sensortower/sidekiq-throttled/pull/89),
+  [#96](https://github.com/sensortower/sidekiq-throttled/pull/96), and
+  [#93](https://github.com/sensortower/sidekiq-throttled/pull/93)
+  Improve documentation.
+  ([@hubertjakubiak], [@khaile], and [@kylerippey])
+
 ## 0.13.0 (2020-07-28)
 
 * [#85](https://github.com/sensortower/sidekiq-throttled/pull/85)
@@ -221,3 +284,17 @@
 [@lenon]: https://github.com/lenon
 [@vaot]: https://github.com/vaot
 [@hmaack]: https://github.com/hmaack
+[@holyketzer]: https://github.com/holyketzer
+[@hubertjakubiak]: https://github.com/hubertjakubiak
+[@kylerippey]: https://github.com/kylerippey
+[@khaile]: https://github.com/khaile
+[@mattiagiuffrida-st]: https://github.com/mattiagiuffrida-st
+[@baptistejub]: https://github.com/baptistejub
+[@ybiquitous]: https://github.com/ybiquitous
+[@hieuk09]: https://github.com/hieuk09
+[@petergoldstein]: https://github.com/petergoldstein
+[@dbackeus]: https://github.com/dbackeus
+[@holstvoogd]: https://github.com/holstvoogd
+[@CHTJonas]: https://github.com/CHTJonas
+[@pjungwir]: https://github.com/pjungwir
+[@longkt90]: https://github.com/longkt90

data/Gemfile

@@ -5,9 +5,6 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "rake"
 gem "rspec"
-gem "rubocop",             "~> 0.90.0", :require => false
-gem "rubocop-performance", "~> 1.8.0",  :require => false
-gem "rubocop-rspec",       "~> 1.43.2", :require => false
 gem "sidekiq"
 
 group :development do
@@ -20,13 +17,18 @@ end
 group :test do
   gem "apparition"
   gem "capybara"
-  gem "coveralls", :require => false
   gem "puma"
   gem "rack-test"
-  gem "simplecov"
   gem "sinatra"
   gem "timecop"
 end
 
+group :lint do
+  gem "rubocop",              :require => false
+  gem "rubocop-performance",  :require => false
+  gem "rubocop-rake",         :require => false
+  gem "rubocop-rspec",        :require => false
+end
+
 # Specify your gem's dependencies in sidekiq-throttled.gemspec
 gemspec

data/LICENSE.md

@@ -1,5 +1,7 @@
 The MIT License (MIT)
 
+Copyright (c) 2022 Alexey Zapparov
+Copyright (c) 2020-2021 Alexey Zapparov, SensorTower Inc.
 Copyright (c) 2015-2020 SensorTower Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/README.md

@@ -1,10 +1,7 @@
 # Sidekiq::Throttled
 
+[![CI Status](https://github.com/ixti/sidekiq-throttled/actions/workflows/ci.yml/badge.svg)](https://github.com/ixti/sidekiq-throttled/actions/workflows/ci.yml)
 [![Latest Version](https://badge.fury.io/rb/sidekiq-throttled.svg)](http://rubygems.org/gems/sidekiq-throttled)
-[![CI Status](https://github.com/sensortower/sidekiq-throttled/workflows/CI/badge.svg?branch=master)](https://github.com/sensortower/sidekiq-throttled/actions?query=workflow%3ACI+branch%3Amaster)
-[![Code Quality](https://codeclimate.com/github/sensortower/sidekiq-throttled.svg?branch=master)](https://codeclimate.com/github/sensortower/sidekiq-throttled)
-[![Code Coverage](https://coveralls.io/repos/github/sensortower/sidekiq-throttled/badge.svg?branch=master)](https://coveralls.io/github/sensortower/sidekiq-throttled?branch=master)
-[![API Docs Quality](http://inch-ci.org/github/sensortower/sidekiq-throttled.svg?branch=master)](http://inch-ci.org/github/sensortower/sidekiq-throttled)
 [![API Docs](https://img.shields.io/badge/yard-docs-blue.svg)](http://www.rubydoc.info/gems/sidekiq-throttled)
 
 Concurrency and threshold throttling for [Sidekiq][sidekiq].
@@ -230,11 +227,12 @@ end
 
 ## Supported Ruby Versions
 
-This library aims to support and is [tested against][travis] the following Ruby
+This library aims to support and is [tested against][ci] the following Ruby
 versions:
 
-* Ruby 2.6.x
 * Ruby 2.7.x
+* Ruby 3.0.x
+* Ruby 3.1.x
 
 If something doesn't work on one of these versions, it's a bug.
 
@@ -254,11 +252,12 @@ dropped.
 
 This library aims to support work with following [Sidekiq][sidekiq] versions:
 
-* Sidekiq 5.0.x
-* Sidekiq 5.1.x
-* Sidekiq 5.2.x
 * Sidekiq 6.0.x
 * Sidekiq 6.1.x
+* Sidekiq 6.2.x
+* Sidekiq 6.3.x
+* Sidekiq 6.4.x
+* Sidekiq 6.5.x
 
 
 ## Contributing
@@ -284,11 +283,5 @@ bundle exec rubocop             # run static code analysis
 Don't forget to run `appraisal update` after any changes to `Gemfile`.
 
 
-## Copyright
-
-Copyright (c) 2015-2020 SensorTower Inc.
-See LICENSE.md for further details.
-
-
-[travis]: http://travis-ci.org/sensortower/sidekiq-throttled
+[ci]: https://github.com/ixti/sidekiq-throttled/actions/workflows/ci.yml
 [sidekiq]: https://github.com/mperham/sidekiq

data/Rakefile

@@ -24,4 +24,4 @@ end
 default_suite = ENV["CI"] ? :spec : %i[spec rubocop]
 named_suites  = { "rubocop" => :rubocop, "rspec" => :spec }
 
-task :default => named_suites.fetch(ENV["SUITE"], default_suite)
+task :default => named_suites.fetch(ENV.fetch("SUITE", nil), default_suite)

data/gemfiles/sidekiq_6.0.gemfile

@@ -5,9 +5,6 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "rake"
 gem "rspec"
-gem "rubocop", "~> 0.82.0", require: false
-gem "rubocop-performance", "~>1.5.2", require: false
-gem "rubocop-rspec", "~> 1.39.0", require: false
 gem "sidekiq", "~> 6.0.0"
 
 group :development do
@@ -20,12 +17,17 @@ end
 group :test do
   gem "apparition"
   gem "capybara"
-  gem "coveralls", require: false
   gem "puma"
   gem "rack-test"
-  gem "simplecov"
   gem "sinatra"
   gem "timecop"
 end
 
+group :lint do
+  gem "rubocop", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rake", require: false
+  gem "rubocop-rspec", require: false
+end
+
 gemspec path: "../"

data/gemfiles/sidekiq_6.1.gemfile

@@ -5,9 +5,6 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "rake"
 gem "rspec"
-gem "rubocop", "~> 0.82.0", require: false
-gem "rubocop-performance", "~>1.5.2", require: false
-gem "rubocop-rspec", "~> 1.39.0", require: false
 gem "sidekiq", "~> 6.1.0"
 
 group :development do
@@ -20,12 +17,17 @@ end
 group :test do
   gem "apparition"
   gem "capybara"
-  gem "coveralls", require: false
   gem "puma"
   gem "rack-test"
-  gem "simplecov"
   gem "sinatra"
   gem "timecop"
 end
 
+group :lint do
+  gem "rubocop", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rake", require: false
+  gem "rubocop-rspec", require: false
+end
+
 gemspec path: "../"

data/gemfiles/{sidekiq_5.2.gemfile → sidekiq_6.2.gemfile}

@@ -5,10 +5,7 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "rake"
 gem "rspec"
-gem "rubocop", "~> 0.82.0", require: false
-gem "rubocop-performance", "~>1.5.2", require: false
-gem "rubocop-rspec", "~> 1.39.0", require: false
-gem "sidekiq", "~> 5.2.0"
+gem "sidekiq", "~> 6.2.0"
 
 group :development do
   gem "byebug"
@@ -20,12 +17,17 @@ end
 group :test do
   gem "apparition"
   gem "capybara"
-  gem "coveralls", require: false
   gem "puma"
   gem "rack-test"
-  gem "simplecov"
   gem "sinatra"
   gem "timecop"
 end
 
+group :lint do
+  gem "rubocop", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rake", require: false
+  gem "rubocop-rspec", require: false
+end
+
 gemspec path: "../"

data/gemfiles/{sidekiq_5.1.gemfile → sidekiq_6.3.gemfile}

@@ -5,10 +5,7 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "rake"
 gem "rspec"
-gem "rubocop", "~> 0.82.0", require: false
-gem "rubocop-performance", "~>1.5.2", require: false
-gem "rubocop-rspec", "~> 1.39.0", require: false
-gem "sidekiq", "~> 5.1.0"
+gem "sidekiq", "~> 6.3.0"
 
 group :development do
   gem "byebug"
@@ -20,12 +17,17 @@ end
 group :test do
   gem "apparition"
   gem "capybara"
-  gem "coveralls", require: false
   gem "puma"
   gem "rack-test"
-  gem "simplecov"
   gem "sinatra"
   gem "timecop"
 end
 
+group :lint do
+  gem "rubocop", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rake", require: false
+  gem "rubocop-rspec", require: false
+end
+
 gemspec path: "../"

data/gemfiles/{sidekiq_5.0.gemfile → sidekiq_6.4.gemfile}

@@ -5,10 +5,7 @@ source "https://rubygems.org"
 gem "appraisal"
 gem "rake"
 gem "rspec"
-gem "rubocop", "~> 0.82.0", require: false
-gem "rubocop-performance", "~>1.5.2", require: false
-gem "rubocop-rspec", "~> 1.39.0", require: false
-gem "sidekiq", "~> 5.0.0"
+gem "sidekiq", "~> 6.4.0"
 
 group :development do
   gem "byebug"
@@ -20,12 +17,17 @@ end
 group :test do
   gem "apparition"
   gem "capybara"
-  gem "coveralls", require: false
   gem "puma"
   gem "rack-test"
-  gem "simplecov"
   gem "sinatra"
   gem "timecop"
 end
 
+group :lint do
+  gem "rubocop", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rake", require: false
+  gem "rubocop-rspec", require: false
+end
+
 gemspec path: "../"

data/gemfiles/sidekiq_6.5.gemfile

@@ -0,0 +1,33 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rake"
+gem "rspec"
+gem "sidekiq", "~> 6.5.0"
+
+group :development do
+  gem "byebug"
+  gem "guard", require: false
+  gem "guard-rspec", require: false
+  gem "guard-rubocop", require: false
+end
+
+group :test do
+  gem "apparition"
+  gem "capybara"
+  gem "puma"
+  gem "rack-test"
+  gem "sinatra"
+  gem "timecop"
+end
+
+group :lint do
+  gem "rubocop", require: false
+  gem "rubocop-performance", require: false
+  gem "rubocop-rake", require: false
+  gem "rubocop-rspec", require: false
+end
+
+gemspec path: "../"

data/lib/sidekiq/throttled/communicator/callbacks.rb

@@ -2,7 +2,7 @@
 
 require "fiber"
 
-require "sidekiq/exception_handler"
+require "sidekiq/throttled/communicator/exception_handler"
 
 module Sidekiq
   module Throttled
@@ -53,15 +53,13 @@ module Sidekiq
         # @param [#to_s] event
         # @param [Object] payload
         # @return [void]
-        def run(event, payload = nil) # rubocop:disable Metrics/MethodLength
+        def run(event, payload = nil)
           @mutex.synchronize do
             fiber = Fiber.new do
               @handlers[event.to_s].each do |callback|
-                begin
-                  callback.call(payload)
-                rescue => e
-                  handle_exception(e, :context => "sidekiq:throttled")
-                end
+                callback.call(payload)
+              rescue => e
+                handle_exception(e, :context => "sidekiq:throttled")
               end
             end
 

data/lib/sidekiq/throttled/communicator/exception_handler.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "sidekiq"
+require "sidekiq/version"
+
+module Sidekiq
+  module Throttled
+    class Communicator
+      if Sidekiq::VERSION >= "6.5.0"
+        module ExceptionHandler
+          def handle_exception(*args)
+            Sidekiq.handle_exception(*args)
+          end
+        end
+
+        # NOTE: `Sidekiq.default_error_handler` is private API
+        Sidekiq.error_handlers << Sidekiq.method(:default_error_handler)
+      else
+        require "sidekiq/exception_handler"
+
+        ExceptionHandler = ::Sidekiq::ExceptionHandler
+      end
+    end
+  end
+end

data/lib/sidekiq/throttled/communicator/listener.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "sidekiq/exception_handler"
+require "sidekiq/throttled/communicator/exception_handler"
 
 module Sidekiq
   module Throttled

data/lib/sidekiq/throttled/communicator.rb

@@ -2,7 +2,7 @@
 
 require "singleton"
 
-require "sidekiq/exception_handler"
+require "sidekiq/throttled/communicator/exception_handler"
 require "sidekiq/throttled/communicator/listener"
 require "sidekiq/throttled/communicator/callbacks"
 

data/lib/sidekiq/throttled/expirable_list.rb

@@ -2,8 +2,6 @@
 
 require "monitor"
 
-require "concurrent/utility/monotonic_time"
-
 module Sidekiq
   module Throttled
     # List that tracks when elements were added and enumerates over those not
@@ -24,7 +22,6 @@ module Sidekiq
     # It does not deduplicates elements. Eviction happens only upon elements
     # retrieval (see {#each}).
     #
-    # @see http://ruby-concurrency.github.io/concurrent-ruby/Concurrent.html#monotonic_time-class_method
     # @see https://ruby-doc.org/core/Process.html#method-c-clock_gettime
     # @see https://linux.die.net/man/3/clock_gettime
     #
@@ -44,7 +41,7 @@ module Sidekiq
       # @params element [Object]
       # @return [ExpirableList] self
       def <<(element)
-        @mon.synchronize { @arr << [Concurrent.monotonic_time, element] }
+        @mon.synchronize { @arr << [::Process.clock_gettime(::Process::CLOCK_MONOTONIC), element] }
         self
       end
 
@@ -58,7 +55,7 @@ module Sidekiq
         return to_enum __method__ unless block_given?
 
         @mon.synchronize do
-          horizon = Concurrent.monotonic_time - @ttl
+          horizon = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC) - @ttl
 
           # drop all elements older than horizon
           @arr.shift while @arr[0] && @arr[0][0] < horizon

data/lib/sidekiq/throttled/fetch/unit_of_work.rb

@@ -49,9 +49,14 @@ module Sidekiq
         #   process was terminated. It is a reverse of whatever fetcher was
         #   doing to pull the job out of queue.
         #
+        # @param [Redis] pipelined connection for requeing via Redis#pipelined
         # @return [void]
-        def requeue
-          Sidekiq.redis { |conn| conn.rpush(QueueName.expand(queue_name), job) }
+        def requeue(pipeline = nil)
+          if pipeline
+            pipeline.rpush(QueueName.expand(queue_name), job)
+          else
+            Sidekiq.redis { |conn| conn.rpush(QueueName.expand(queue_name), job) }
+          end
         end
 
         # Pushes job back to the head of the queue, so that job won't be tried

data/lib/sidekiq/throttled/fetch.rb

@@ -22,7 +22,11 @@ module Sidekiq
           return if units.empty?
 
           Sidekiq.logger.debug { "Re-queueing terminated jobs" }
-          Sidekiq.redis { |conn| conn.pipelined { units.each(&:requeue) } }
+          Sidekiq.redis do |conn|
+            conn.pipelined do |pipeline|
+              units.each { |unit| unit.requeue(pipeline) }
+            end
+          end
           Sidekiq.logger.info("Pushed #{units.size} jobs back to Redis")
         rescue => e
           Sidekiq.logger.warn("Failed to requeue #{units.size} jobs: #{e}")

data/lib/sidekiq/throttled/job.rb

@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+# internal
+require "sidekiq/throttled/registry"
+
+module Sidekiq
+  module Throttled
+    # Adds helpers to your worker classes
+    #
+    # @example Usage
+    #
+    #     class MyWorker
+    #       include Sidekiq::Worker
+    #       include Sidekiq::Throttled::Worker
+    #
+    #       sidkiq_options :queue => :my_queue
+    #       sidekiq_throttle :threshold => { :limit => 123, :period => 1.hour }
+    #
+    #       def perform
+    #         # ...
+    #       end
+    #     end
+    #
+    # @see ClassMethods
+    module Job
+      # Extends worker class with {ClassMethods}.
+      #
+      # @note Using `included` hook with extending worker with {ClassMethods}
+      #   in order to make API inline with `include Sidekiq::Worker`.
+      #
+      # @private
+      def self.included(worker)
+        worker.send(:extend, ClassMethods)
+      end
+
+      # Helper methods added to the singleton class of destination
+      module ClassMethods
+        # Registers some strategy for the worker.
+        #
+        # @example Allow max 123 MyWorker jobs per hour
+        #
+        #     class MyWorker
+        #       include Sidekiq::Worker
+        #       include Sidekiq::Throttled::Worker
+        #
+        #       sidekiq_throttle({
+        #         :threshold => { :limit => 123, :period => 1.hour }
+        #       })
+        #     end
+        #
+        # @example Allow max 10 concurrently running MyWorker jobs
+        #
+        #     class MyWorker
+        #       include Sidekiq::Worker
+        #       include Sidekiq::Throttled::Worker
+        #
+        #       sidekiq_throttle({
+        #         :concurrency => { :limit => 10 }
+        #       })
+        #     end
+        #
+        # @example Allow max 10 concurrent MyWorker jobs and max 123 per hour
+        #
+        #     class MyWorker
+        #       include Sidekiq::Worker
+        #       include Sidekiq::Throttled::Worker
+        #
+        #       sidekiq_throttle({
+        #         :threshold => { :limit => 123, :period => 1.hour },
+        #         :concurrency => { :limit => 10 }
+        #       })
+        #     end
+        #
+        # @see Registry.add
+        # @return [void]
+        def sidekiq_throttle(**kwargs)
+          Registry.add(self, **kwargs)
+        end
+
+        # Adds current worker to preconfigured throttling strategy. Allows
+        # sharing same pool for multiple workers.
+        #
+        # First of all we need to create shared throttling strategy:
+        #
+        #     # Create google_api throttling strategy
+        #     Sidekiq::Throttled::Registry.add(:google_api, {
+        #       :threshold => { :limit => 123, :period => 1.hour },
+        #       :concurrency => { :limit => 10 }
+        #     })
+        #
+        # Now we can assign it to our workers:
+        #
+        #     class FetchProfileJob
+        #       include Sidekiq::Worker
+        #       include Sidekiq::Throttled::Worker
+        #
+        #       sidekiq_throttle_as :google_api
+        #     end
+        #
+        #     class FetchCommentsJob
+        #       include Sidekiq::Worker
+        #       include Sidekiq::Throttled::Worker
+        #
+        #       sidekiq_throttle_as :google_api
+        #     end
+        #
+        # With the above configuration we ensure that there are maximum 10
+        # concurrently running jobs of FetchProfileJob or FetchCommentsJob
+        # allowed. And only 123 jobs of those are executed per hour.
+        #
+        # In other words, it will allow:
+        #
+        # - only `X` concurrent `FetchProfileJob`s
+        # - max `XX` `FetchProfileJob` per hour
+        # - only `Y` concurrent `FetchCommentsJob`s
+        # - max `YY` `FetchCommentsJob` per hour
+        #
+        # Where `(X + Y) == 10` and `(XX + YY) == 123`
+        #
+        # @see Registry.add_alias
+        # @return [void]
+        def sidekiq_throttle_as(name)
+          Registry.add_alias(self, name)
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/throttled/strategy/base.rb

@@ -12,8 +12,12 @@ module Sidekiq
 
         def key(job_args)
           key = @base_key.dup
-          key << ":#{@key_suffix.call(*job_args)}" if @key_suffix
-          key
+          return key unless @key_suffix
+
+          key << ":#{@key_suffix.call(*job_args)}"
+        rescue => e
+          Sidekiq.logger.error "Failed to get key suffix: #{e}"
+          raise e
         end
       end
     end

data/lib/sidekiq/throttled/strategy_collection.rb

@@ -60,10 +60,9 @@ module Sidekiq
       def make_strategy(strategy, name, key_suffix, options)
         return unless options
 
-        strategy.new("throttled:#{name}", {
+        strategy.new("throttled:#{name}",
           :key_suffix => key_suffix,
-          **options
-        })
+          **options)
       end
     end
   end

data/lib/sidekiq/throttled/version.rb

@@ -3,6 +3,6 @@
 module Sidekiq
   module Throttled
     # Gem version
-    VERSION = "0.14.1"
+    VERSION = "0.16.1"
   end
 end

data/lib/sidekiq/throttled/web/stats.rb

@@ -37,7 +37,8 @@ module Sidekiq
           percentile = 100.00 * int / max
           lvl = if    80 <= percentile then "danger"
                 elsif 60 <= percentile then "warning"
-                else                        "success"
+                else
+                  "success"
                 end
 
           %(<span class="label label-#{lvl}">#{int}</span>)
@@ -61,10 +62,10 @@ module Sidekiq
 
         # @return [String]
         def humanize_integer(int)
-          digits = int.to_s.split ""
-          str    = digits.shift(digits.count % 3).join("")
+          digits = int.to_s.chars
+          str    = digits.shift(digits.count % 3).join
 
-          str << " " << digits.shift(3).join("") while digits.count.positive?
+          str << " " << digits.shift(3).join while digits.count.positive?
 
           str.strip
         end

data/lib/sidekiq/throttled/worker.rb

@@ -1,128 +1,13 @@
 # frozen_string_literal: true
 
-# internal
-require "sidekiq/throttled/registry"
+require "sidekiq/throttled/job"
 
 module Sidekiq
   module Throttled
-    # Adds helpers to your worker classes
-    #
-    # @example Usage
-    #
-    #     class MyWorker
-    #       include Sidekiq::Worker
-    #       include Sidekiq::Throttled::Worker
-    #
-    #       sidkiq_options :queue => :my_queue
-    #       sidekiq_throttle :threshold => { :limit => 123, :period => 1.hour }
-    #
-    #       def perform
-    #         # ...
-    #       end
-    #     end
-    #
-    # @see ClassMethods
-    module Worker
-      # Extends worker class with {ClassMethods}.
-      #
-      # @note Using `included` hook with extending worker with {ClassMethods}
-      #   in order to make API inline with `include Sidekiq::Worker`.
-      #
-      # @private
-      def self.included(worker)
-        worker.send(:extend, ClassMethods)
-      end
-
-      # Helper methods added to the singleton class of destination
-      module ClassMethods
-        # Registers some strategy for the worker.
-        #
-        # @example Allow max 123 MyWorker jobs per hour
-        #
-        #     class MyWorker
-        #       include Sidekiq::Worker
-        #       include Sidekiq::Throttled::Worker
-        #
-        #       sidekiq_throttle({
-        #         :threshold => { :limit => 123, :period => 1.hour }
-        #       })
-        #     end
-        #
-        # @example Allow max 10 concurrently running MyWorker jobs
-        #
-        #     class MyWorker
-        #       include Sidekiq::Worker
-        #       include Sidekiq::Throttled::Worker
-        #
-        #       sidekiq_throttle({
-        #         :concurrency => { :limit => 10 }
-        #       })
-        #     end
-        #
-        # @example Allow max 10 concurrent MyWorker jobs and max 123 per hour
-        #
-        #     class MyWorker
-        #       include Sidekiq::Worker
-        #       include Sidekiq::Throttled::Worker
-        #
-        #       sidekiq_throttle({
-        #         :threshold => { :limit => 123, :period => 1.hour },
-        #         :concurrency => { :limit => 10 }
-        #       })
-        #     end
-        #
-        # @see Registry.add
-        # @return [void]
-        def sidekiq_throttle(**kwargs)
-          Registry.add(self, **kwargs)
-        end
-
-        # Adds current worker to preconfigured throttling strategy. Allows
-        # sharing same pool for multiple workers.
-        #
-        # First of all we need to create shared throttling strategy:
-        #
-        #     # Create google_api throttling strategy
-        #     Sidekiq::Throttled::Registry.add(:google_api, {
-        #       :threshold => { :limit => 123, :period => 1.hour },
-        #       :concurrency => { :limit => 10 }
-        #     })
-        #
-        # Now we can assign it to our workers:
-        #
-        #     class FetchProfileJob
-        #       include Sidekiq::Worker
-        #       include Sidekiq::Throttled::Worker
-        #
-        #       sidekiq_throttle_as :google_api
-        #     end
-        #
-        #     class FetchCommentsJob
-        #       include Sidekiq::Worker
-        #       include Sidekiq::Throttled::Worker
-        #
-        #       sidekiq_throttle_as :google_api
-        #     end
-        #
-        # With the above configuration we ensure that there are maximum 10
-        # concurrently running jobs of FetchProfileJob or FetchCommentsJob
-        # allowed. And only 123 jobs of those are executed per hour.
-        #
-        # In other words, it will allow:
-        #
-        # - only `X` concurrent `FetchProfileJob`s
-        # - max `XX` `FetchProfileJob` per hour
-        # - only `Y` concurrent `FetchCommentsJob`s
-        # - max `YY` `FetchCommentsJob` per hour
-        #
-        # Where `(X + Y) == 10` and `(XX + YY) == 123`
-        #
-        # @see Registry.add_alias
-        # @return [void]
-        def sidekiq_throttle_as(name)
-          Registry.add_alias(self, name)
-        end
-      end
-    end
+    # A new module, Sidekiq::Job, was added in Sidekiq version 6.3.0 as a
+    # simple alias for Sidekiq::Worker as the term "worker" was considered
+    # too generic and confusing. Many people call a Sidekiq process a "worker"
+    # whereas others call the thread that executes jobs a "worker".
+    Worker = Job
   end
 end

data/lib/sidekiq/throttled.rb

@@ -9,6 +9,7 @@ require "sidekiq/throttled/communicator"
 require "sidekiq/throttled/configuration"
 require "sidekiq/throttled/queues_pauser"
 require "sidekiq/throttled/registry"
+require "sidekiq/throttled/job"
 require "sidekiq/throttled/worker"
 require "sidekiq/throttled/utils"
 
@@ -76,7 +77,7 @@ module Sidekiq
       # @return [Boolean]
       def throttled?(message)
         message = JSON.parse message
-        job = message.fetch("class") { return false }
+        job = message.fetch("wrapped") { message.fetch("class") { return false } }
         jid = message.fetch("jid") { return false }
 
         preload_constant! job

data/{.rubocop → rubocop}/rspec.yml

@@ -1,3 +1,3 @@
 RSpec/ExampleLength:
   Enabled: true
-  Max: 10
+  Max: 15

data/sidekiq-throttled.gemspec

@@ -8,27 +8,29 @@ require "sidekiq/throttled/version"
 Gem::Specification.new do |spec|
   spec.name          = "sidekiq-throttled"
   spec.version       = Sidekiq::Throttled::VERSION
-  spec.authors       = ["Alexey V Zapparov"]
-  spec.email         = ["ixti@member.fsf.org"]
+  spec.authors       = ["Alexey Zapparov"]
+  spec.email         = ["alexey@zapparov.com"]
 
   spec.summary       = "Concurrency and threshold throttling for Sidekiq."
   spec.description   = "Concurrency and threshold throttling for Sidekiq."
-  spec.homepage      = "https://github.com/sensortower/sidekiq-throttled"
+  spec.homepage      = "https://github.com/ixti/sidekiq-throttled"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match %r{^(test|spec|features)/}
   end
 
+  spec.metadata["rubygems_mfa_required"] = "true"
+
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 2.6"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.add_runtime_dependency "concurrent-ruby"
   spec.add_runtime_dependency "redis-prescription"
   spec.add_runtime_dependency "sidekiq"
 
-  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "bundler", ">= 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.16.1
 platform: ruby
 authors:
-- Alexey V Zapparov
+- Alexey Zapparov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -56,34 +56,29 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Concurrency and threshold throttling for Sidekiq.
 email:
-- ixti@member.fsf.org
+- alexey@zapparov.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop/layout.yml"
-- ".rubocop/lint.yml"
-- ".rubocop/metrics.yml"
-- ".rubocop/performance.yml"
-- ".rubocop/rspec.yml"
-- ".rubocop/style.yml"
 - ".rubocop_todo.yml"
 - ".travis.yml"
 - ".yardopts"
@@ -94,20 +89,23 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- gemfiles/sidekiq_5.0.gemfile
-- gemfiles/sidekiq_5.1.gemfile
-- gemfiles/sidekiq_5.2.gemfile
 - gemfiles/sidekiq_6.0.gemfile
 - gemfiles/sidekiq_6.1.gemfile
+- gemfiles/sidekiq_6.2.gemfile
+- gemfiles/sidekiq_6.3.gemfile
+- gemfiles/sidekiq_6.4.gemfile
+- gemfiles/sidekiq_6.5.gemfile
 - lib/sidekiq/throttled.rb
 - lib/sidekiq/throttled/communicator.rb
 - lib/sidekiq/throttled/communicator/callbacks.rb
+- lib/sidekiq/throttled/communicator/exception_handler.rb
 - lib/sidekiq/throttled/communicator/listener.rb
 - lib/sidekiq/throttled/configuration.rb
 - lib/sidekiq/throttled/errors.rb
 - lib/sidekiq/throttled/expirable_list.rb
 - lib/sidekiq/throttled/fetch.rb
 - lib/sidekiq/throttled/fetch/unit_of_work.rb
+- lib/sidekiq/throttled/job.rb
 - lib/sidekiq/throttled/middleware.rb
 - lib/sidekiq/throttled/patches/queue.rb
 - lib/sidekiq/throttled/queue_name.rb
@@ -130,27 +128,34 @@ files:
 - lib/sidekiq/throttled/web/summary_fix.rb
 - lib/sidekiq/throttled/web/throttled.html.erb
 - lib/sidekiq/throttled/worker.rb
+- rubocop/layout.yml
+- rubocop/lint.yml
+- rubocop/metrics.yml
+- rubocop/performance.yml
+- rubocop/rspec.yml
+- rubocop/style.yml
 - sidekiq-throttled.gemspec
-homepage: https://github.com/sensortower/sidekiq-throttled
+homepage: https://github.com/ixti/sidekiq-throttled
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Concurrency and threshold throttling for Sidekiq.