sidekiq-throttled 0.17.0 → 1.1.0

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "redis/prescription"
+require "redis_prescription"
 
-require "sidekiq/throttled/strategy/base"
+require_relative "./base"
 
 module Sidekiq
   module Throttled
@@ -30,7 +30,7 @@ module Sidekiq
         #
         #     increase!
         #     return 0
-        SCRIPT = Redis::Prescription.read "#{__dir__}/threshold.lua"
+        SCRIPT = RedisPrescription.new(File.read("#{__dir__}/threshold.lua"))
         private_constant :SCRIPT
 
         # @param [#to_s] strategy_key
@@ -66,9 +66,7 @@ module Sidekiq
           keys = [key(job_args)]
           argv = [job_limit, period(job_args), Time.now.to_f]
 
-          Sidekiq.redis do |redis|
-            1 == SCRIPT.eval(redis, :keys => keys, :argv => argv)
-          end
+          Sidekiq.redis { |redis| 1 == SCRIPT.call(redis, keys: keys, argv: argv) }
         end
 
         # @return [Integer] Current count of jobs

data/lib/sidekiq/throttled/strategy.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # internal
-require "sidekiq/throttled/errors"
-require "sidekiq/throttled/strategy_collection"
-require "sidekiq/throttled/strategy/concurrency"
-require "sidekiq/throttled/strategy/threshold"
+require_relative "./errors"
+require_relative "./strategy_collection"
+require_relative "./strategy/concurrency"
+require_relative "./strategy/threshold"
 
 module Sidekiq
   module Throttled
@@ -35,14 +35,14 @@ module Sidekiq
         @observer = observer
 
         @concurrency = StrategyCollection.new(concurrency,
-          :strategy   => Concurrency,
-          :name       => name,
-          :key_suffix => key_suffix)
+          strategy:   Concurrency,
+          name:       name,
+          key_suffix: key_suffix)
 
         @threshold = StrategyCollection.new(threshold,
-          :strategy   => Threshold,
-          :name       => name,
-          :key_suffix => key_suffix)
+          strategy:   Threshold,
+          name:       name,
+          key_suffix: key_suffix)
 
         return if @concurrency.any? || @threshold.any?
 

data/lib/sidekiq/throttled/strategy_collection.rb

@@ -19,8 +19,7 @@ module Sidekiq
       # @param [#to_s] name
       # @param [#call] key_suffix Dynamic key suffix generator.
       def initialize(strategies, strategy:, name:, key_suffix:)
-        strategies = (strategies.is_a?(Hash) ? [strategies] : Array(strategies))
-        @strategies = strategies.map do |options|
+        @strategies = (strategies.is_a?(Hash) ? [strategies] : Array(strategies)).map do |options|
           make_strategy(strategy, name, key_suffix, options)
         end
       end
@@ -61,7 +60,7 @@ module Sidekiq
         return unless options
 
         strategy.new("throttled:#{name}",
-          :key_suffix => key_suffix,
+          key_suffix: key_suffix,
           **options)
       end
     end

data/lib/sidekiq/throttled/version.rb

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

data/lib/sidekiq/throttled/web.rb

@@ -8,9 +8,8 @@ require "sidekiq"
 require "sidekiq/web"
 
 # internal
-require "sidekiq/throttled/registry"
-require "sidekiq/throttled/web/stats"
-require "sidekiq/throttled/web/summary_fix"
+require_relative "./registry"
+require_relative "./web/stats"
 
 module Sidekiq
   module Throttled
@@ -18,31 +17,11 @@ module Sidekiq
     module Web
       VIEWS         = Pathname.new(__dir__).join("web")
       THROTTLED_TPL = VIEWS.join("throttled.html.erb").read.freeze
-      QUEUES_TPL    = VIEWS.join("queues.html.erb").read.freeze
 
       class << self
-        # Replace default Queues tab with enhanced one.
-        def enhance_queues_tab!
-          SummaryFix.enabled = true
-          Sidekiq::Web::DEFAULT_TABS["Queues"] = "enhanced-queues"
-          Sidekiq::Web.tabs.delete("Enhanced Queues")
-        end
-
-        # Restore original Queues tab.
-        #
-        # @api There's next to absolutely no value in this method for real
-        #   users. The only it's purpose is to restore virgin state in specs.
-        def restore_queues_tab!
-          SummaryFix.enabled = false
-          Sidekiq::Web::DEFAULT_TABS["Queues"] = "queues"
-          Sidekiq::Web.tabs["Enhanced Queues"] = "enhanced-queues"
-        end
-
         # @api private
         def registered(app)
-          SummaryFix.apply! app
           register_throttled_tab app
-          register_enhanced_queues_tab app
         end
 
         private
@@ -55,27 +34,6 @@ module Sidekiq
             redirect "#{root_path}throttled"
           end
         end
-
-        # rubocop:disable Metrics/AbcSize
-        def register_enhanced_queues_tab(app) # rubocop:disable Metrics/MethodLength
-          pauser = QueuesPauser.instance
-
-          app.get("/enhanced-queues") do
-            @queues = Sidekiq::Queue.all
-            erb QUEUES_TPL.dup
-          end
-
-          app.post("/enhanced-queues/:name") do
-            case params[:action]
-            when "delete" then Sidekiq::Queue.new(params[:name]).clear
-            when "pause"  then pauser.pause!(params[:name])
-            else               pauser.resume!(params[:name])
-            end
-
-            redirect "#{root_path}enhanced-queues"
-          end
-        end
-        # rubocop:enable Metrics/AbcSize
       end
     end
   end
@@ -83,4 +41,3 @@ end
 
 Sidekiq::Web.register Sidekiq::Throttled::Web
 Sidekiq::Web.tabs["Throttled"] = "throttled"
-Sidekiq::Web.tabs["Enhanced Queues"] = "enhanced-queues"

data/lib/sidekiq/throttled/worker.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "sidekiq/throttled/job"
+require_relative "./job"
 
 module Sidekiq
   module Throttled

data/lib/sidekiq/throttled.rb

@@ -1,17 +1,15 @@
 # frozen_string_literal: true
 
-# 3rd party
 require "sidekiq"
 
-# internal
-require "sidekiq/throttled/version"
-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"
+require_relative "./throttled/config"
+require_relative "./throttled/cooldown"
+require_relative "./throttled/job"
+require_relative "./throttled/middlewares/server"
+require_relative "./throttled/patches/basic_fetch"
+require_relative "./throttled/registry"
+require_relative "./throttled/version"
+require_relative "./throttled/worker"
 
 # @see https://github.com/mperham/sidekiq/
 module Sidekiq
@@ -20,7 +18,6 @@ module Sidekiq
   # Just add somewhere in your bootstrap:
   #
   #     require "sidekiq/throttled"
-  #     Sidekiq::Throttled.setup!
   #
   # Once you've done that you can include {Sidekiq::Throttled::Job} to your
   # job classes and configure throttling:
@@ -46,28 +43,29 @@ module Sidekiq
     MUTEX = Mutex.new
     private_constant :MUTEX
 
-    class << self
-      include Utils
+    @config   = Config.new.freeze
+    @cooldown = Cooldown[@config]
 
-      # @return [Configuration]
-      def configuration
-        @configuration ||= Configuration.new
-      end
+    class << self
+      # @api internal
+      #
+      # @return [Cooldown, nil]
+      attr_reader :cooldown
 
-      # Hooks throttler into sidekiq.
+      # @example
+      #   Sidekiq::Throttled.configure do |config|
+      #     config.cooldown_period = nil # Disable queues cooldown manager
+      #   end
       #
-      # @return [void]
-      def setup!
-        Communicator.instance.setup!
-        QueuesPauser.instance.setup!
+      # @yieldparam config [Config]
+      def configure
+        MUTEX.synchronize do
+          config = @config.dup
 
-        Sidekiq.configure_server do |config|
-          setup_strategy!(config)
+          yield config
 
-          require "sidekiq/throttled/middleware"
-          config.server_middleware do |chain|
-            chain.add Sidekiq::Throttled::Middleware
-          end
+          @config   = config.freeze
+          @cooldown = Cooldown[@config]
         end
       end
 
@@ -76,13 +74,13 @@ module Sidekiq
       # @param [String] message Job's JSON payload
       # @return [Boolean]
       def throttled?(message)
-        message = JSON.parse message
-        job = message.fetch("wrapped") { message.fetch("class") { return false } }
-        jid = message.fetch("jid") { return false }
+        message = Sidekiq.load_json(message)
+        job     = message.fetch("wrapped") { message["class"] }
+        jid     = message["jid"]
 
-        preload_constant! job
+        return false unless job && jid
 
-        Registry.get job do |strategy|
+        Registry.get(job) do |strategy|
           return strategy.throttled?(jid, *message["args"])
         end
 
@@ -91,33 +89,23 @@ module Sidekiq
         false
       end
 
-      private
-
-      # @return [void]
-      def setup_strategy!(sidekiq_config)
-        require "sidekiq/throttled/fetch"
-
-        # https://github.com/mperham/sidekiq/commit/67daa7a408b214d593100f782271ed108686c147
-        sidekiq_config = sidekiq_config.options if Gem::Version.new(Sidekiq::VERSION) < Gem::Version.new("6.5.0")
-
-        sidekiq_config[:fetch] = Sidekiq::Throttled::Fetch.new(sidekiq_config)
-      end
+      # @deprecated Will be removed in 2.0.0
+      def setup!
+        warn "Sidekiq::Throttled.setup! was deprecated"
 
-      # Tries to preload constant by it's name once.
-      #
-      # Somehow, sometimes, some classes are not eager loaded upon Rails init,
-      # leading to throttling config not being registered prior job perform.
-      # And that leaves us with concurrency limit + 1 situation upon Sidekiq
-      # server restart (becomes normal after all Sidekiq processes handled
-      # at leas onr job of that class).
-      #
-      # @return [void]
-      def preload_constant!(job)
-        MUTEX.synchronize do
-          @preloaded      ||= {}
-          @preloaded[job] ||= constantize(job) || true
+        Sidekiq.configure_server do |config|
+          config.server_middleware do |chain|
+            chain.remove(Sidekiq::Throttled::Middlewares::Server)
+            chain.add(Sidekiq::Throttled::Middlewares::Server)
+          end
         end
       end
     end
   end
+
+  configure_server do |config|
+    config.server_middleware do |chain|
+      chain.add(Sidekiq::Throttled::Middlewares::Server)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexey Zapparov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -16,96 +16,59 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: redis-prescription
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.4'
+        version: '6.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.4'
-- !ruby/object:Gem::Dependency
-  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.
+        version: '6.5'
+description:
 email:
 - alexey@zapparov.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".github/dependabot.yml"
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
-- ".yardopts"
-- Appraisals
-- CHANGES.md
-- Gemfile
-- Guardfile
-- LICENSE.md
-- README.md
-- Rakefile
-- gemfiles/sidekiq_6.4.gemfile
-- gemfiles/sidekiq_6.5.gemfile
+- LICENSE.txt
+- README.adoc
 - 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/config.rb
+- lib/sidekiq/throttled/cooldown.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/expirable_set.rb
 - lib/sidekiq/throttled/job.rb
-- lib/sidekiq/throttled/middleware.rb
-- lib/sidekiq/throttled/patches/queue.rb
-- lib/sidekiq/throttled/queue_name.rb
-- lib/sidekiq/throttled/queues_pauser.rb
+- lib/sidekiq/throttled/middlewares/server.rb
+- lib/sidekiq/throttled/patches/basic_fetch.rb
 - lib/sidekiq/throttled/registry.rb
 - lib/sidekiq/throttled/strategy.rb
 - lib/sidekiq/throttled/strategy/base.rb
@@ -114,27 +77,19 @@ files:
 - lib/sidekiq/throttled/strategy/threshold.lua
 - lib/sidekiq/throttled/strategy/threshold.rb
 - lib/sidekiq/throttled/strategy_collection.rb
-- lib/sidekiq/throttled/testing.rb
-- lib/sidekiq/throttled/utils.rb
 - lib/sidekiq/throttled/version.rb
 - lib/sidekiq/throttled/web.rb
-- lib/sidekiq/throttled/web/queues.html.erb
 - lib/sidekiq/throttled/web/stats.rb
-- lib/sidekiq/throttled/web/summary_fix.js
-- 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/ixti/sidekiq-throttled
 licenses:
 - MIT
 metadata:
+  homepage_uri: https://github.com/ixti/sidekiq-throttled
+  source_code_uri: https://github.com/ixti/sidekiq-throttled/tree/v1.1.0
+  bug_tracker_uri: https://github.com/ixti/sidekiq-throttled/issues
+  changelog_uri: https://github.com/ixti/sidekiq-throttled/blob/v1.1.0/CHANGES.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -144,15 +99,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
-summary: Concurrency and threshold throttling for Sidekiq.
+summary: Concurrency and rate-limit throttling for Sidekiq
 test_files: []

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci

data/.github/dependabot.yml

@@ -1,12 +0,0 @@
-# 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

@@ -1,52 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  test:
-    name: "rspec (ruby:${{ matrix.ruby }} sidekiq:${{ matrix.sidekiq }})"
-
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ "2.7", "3.0", "3.1" ]
-        sidekiq: [ "6.4", "6.5" ]
-
-    runs-on: ubuntu-latest
-
-    services:
-      redis:
-        image: redis
-        ports: ["6379:6379"]
-        options: "--entrypoint redis-server"
-
-    env:
-      BUNDLE_GEMFILE: gemfiles/sidekiq_${{ matrix.sidekiq }}.gemfile
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - name: bundle exec rspec
-        run: bundle exec rspec --format progress --force-colour
-
-  rubocop:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: "2.7"
-          bundler-cache: true
-
-      - run: bundle exec rubocop

data/.gitignore

@@ -1,12 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/gemfiles/.bundle
-/gemfiles/*.gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-.byebug_history

data/.rspec

@@ -1,5 +0,0 @@
---backtrace
---color
---format=documentation
---order random
---require spec_helper

data/.rubocop.yml

@@ -1,20 +0,0 @@
-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
-
-AllCops:
-  Exclude:
-    - gemfiles/**/*
-    - vendor/**/*
-  NewCops: enable
-  TargetRubyVersion: 2.7