Revert "Merge pull request #3723 from jlledom/THREESCALE-9596-sidekiq…

…-7" (#3782) This reverts commit b378867, reversing changes made to 8aef7ac.
3scale · May 13, 2024 · 1997353 · 1997353
1 parent eea43d5
commit 1997353
Show file tree

Hide file tree

Showing 66 changed files with 165 additions and 156 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -134,7 +134,7 @@ memcached-container: &memcached-container
   image: memcached:1.5-alpine
 
 redis-container: &redis-container
-  image: redis:6.2-alpine
+  image: redis:4.0-alpine
 
 dnsmasq-container: &dnsmasq-container
   image: quay.io/3scale/dnsmasq

diff --git a/Gemfile b/Gemfile
@@ -54,13 +54,10 @@ gem '3scale_time_range', '0.0.6'
 gem 'statsd-ruby', require: false
 
 # Sidekiq
-gem 'sidekiq', '~> 7', require: %w[sidekiq sidekiq/web]
-# Use a forked sidekiq-batch with support for Sidekiq 7
-# The next upstream version will add support Sidekiq 7 as well
-# Remove this fork when they release the new version
-gem 'sidekiq-batch', github: '3scale/sidekiq-batch', branch: 'redis-client'
+gem 'sidekiq', '~> 6.4.0', require: %w[sidekiq sidekiq/web]
+gem 'sidekiq-batch'
 gem 'sidekiq-cron', require: %w[sidekiq/cron sidekiq/cron/web]
-gem 'sidekiq-throttled', '~> 1.4.0'
+gem 'sidekiq-throttled'
 
 # Yabeda metrics
 gem 'yabeda-prometheus-mmap'
@@ -96,7 +93,7 @@ gem 'acts-as-taggable-on', '~> 8.0'
 gem 'baby_squeel', '~> 1.4.3'
 gem 'browser'
 gem 'diff-lcs', '~> 1.2'
-gem 'hiredis-client'
+gem 'hiredis', '~> 0.6.3'
 gem 'httpclient', github: '3scale/httpclient', branch: 'ssl-env-cert'
 gem 'json-schema', git: 'https://github.com/3scale/json-schema.git'
 gem 'local-fastimage_resize', '~> 3.4.0', require: 'fastimage/resize'
@@ -109,7 +106,7 @@ gem 'ratelimit'
 gem 'recaptcha', '~> 5.16.0'
 gem 'redcarpet', '~>3.5.1', require: false
 gem 'RedCloth', '~>4.3', require: false
-gem 'redis'
+gem 'redis', '~> 4.2.0', require: ['redis', 'redis/connection/hiredis']
 gem 'rest-client', '~> 2.0.2'
 gem 'rubyzip', '~>1.3.0', require: false
 gem 'svg-graph', require: false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -28,14 +28,6 @@ GIT
       nokogiri (~> 1)
       rspec (>= 3.0.0.a, < 4)
 
-GIT
-  remote: https://github.com/3scale/sidekiq-batch.git
-  revision: f1c56d0b8445fd3eb337614aedba1752aa19938e
-  branch: redis-client
-  specs:
-    sidekiq-batch (0.1.9)
-      sidekiq (~> 7)
-
 GIT
   remote: https://github.com/3scale/swagger-ui_rails.git
   revision: f88bb8bed4fdb57fcf5be6425f3fc10c638788d1
@@ -219,7 +211,7 @@ GEM
     braintree (2.104.1)
       builder (>= 2.0.0)
     browser (5.3.1)
-    bugsnag (6.26.3)
+    bugsnag (6.26.0)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
     bullet (6.1.5)
@@ -397,8 +389,7 @@ GEM
     hashdiff (1.0.1)
     hashery (2.1.2)
     hashie (3.6.0)
-    hiredis-client (0.21.1)
-      redis-client (= 0.21.1)
+    hiredis (0.6.3)
     html-pipeline (2.12.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
@@ -585,7 +576,7 @@ GEM
     public_suffix (4.0.7)
     raabro (1.4.0)
     racc (1.7.3)
-    rack (2.2.9)
+    rack (2.2.8.1)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-no_animations (1.0.3)
@@ -662,13 +653,10 @@ GEM
       actionview (>= 5)
     recursive-open-struct (1.1.3)
     redcarpet (3.5.1)
-    redis (5.1.0)
-      redis-client (>= 0.17.0)
-    redis-client (0.21.1)
-      connection_pool
+    redis (4.2.5)
     redis-namespace (1.7.0)
       redis (>= 3.0.4)
-    redis-prescription (2.6.0)
+    redis-prescription (1.0.0)
     redlock (1.3.2)
       redis (>= 3.0.0, < 6.0)
     reek (6.1.0)
@@ -782,18 +770,19 @@ GEM
     shoulda-context (2.0.0)
     shoulda-matchers (4.5.1)
       activesupport (>= 4.2.0)
-    sidekiq (7.2.2)
-      concurrent-ruby (< 2)
-      connection_pool (>= 2.3.0)
-      rack (>= 2.2.4)
-      redis-client (>= 0.19.0)
+    sidekiq (6.4.2)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
+    sidekiq-batch (0.1.9)
+      sidekiq (>= 3)
     sidekiq-cron (1.9.1)
       fugit (~> 1.8)
       sidekiq (>= 4.2.1)
-    sidekiq-throttled (1.4.0)
-      concurrent-ruby (>= 1.2.0)
-      redis-prescription (~> 2.2)
-      sidekiq (>= 6.5)
+    sidekiq-throttled (0.15.0)
+      concurrent-ruby
+      redis-prescription
+      sidekiq
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -989,7 +978,7 @@ DEPENDENCIES
   formtastic (~> 4.0)
   github-markdown
   hashie
-  hiredis-client
+  hiredis (~> 0.6.3)
   html-pipeline
   htmlentities (~> 4.3, >= 4.3.4)
   httpclient!
@@ -1047,7 +1036,7 @@ DEPENDENCIES
   recaptcha (~> 5.16.0)
   record_tag_helper (~> 1.0)
   redcarpet (~> 3.5.1)
-  redis
+  redis (~> 4.2.0)
   redlock
   reek (= 6.01)
   reform (~> 2.3.0)
@@ -1069,10 +1058,10 @@ DEPENDENCIES
   secure_headers (~> 6.3.0)
   selenium-webdriver (~> 3.142)
   shoulda (~> 4.0)
-  sidekiq (~> 7)
-  sidekiq-batch!
+  sidekiq (~> 6.4.0)
+  sidekiq-batch
   sidekiq-cron
-  sidekiq-throttled (~> 1.4.0)
+  sidekiq-throttled
   simplecov (~> 0.21.2)
   slim-rails (~> 3.2)
   sprockets-rails

diff --git a/app/lib/backend/storage.rb b/app/lib/backend/storage.rb
@@ -7,7 +7,8 @@ def self.parse_config
       config = File.read("#{Rails.root}/config/backend_redis.yml")
       config = ERB.new(config).result(binding)
       config = YAML.load(config)
-      config.fetch(Rails.env).deep_symbolize_keys
+      config = config.fetch(Rails.env).symbolize_keys
+      config.reverse_merge(logger: Rails.logger)
     end
 
     def initialize

diff --git a/app/lib/system/redis_pool.rb b/app/lib/system/redis_pool.rb
@@ -6,11 +6,11 @@ module System
   # RedisPool a simple wrapper around Redis with connection pooling
   class RedisPool
 
-    def initialize(config = {})
-      cfg = config.to_h
-      pool_config = cfg.extract!(:size, :pool_timeout)
-      @pool = ConnectionPool.new(size: pool_config[:size] || 5, timeout: pool_config[:pool_timeout] || 5 ) do
-        Redis.new(cfg)
+    def initialize(config={})
+      config = config.dup
+      pool_config = config.extract!(:pool_size, :pool_timeout)
+      @pool = ConnectionPool.new(size: pool_config[:pool_size] || 5, timeout: pool_config[:pool_timeout] || 5 ) do
+        Redis.new(config)
       end
     end
 

diff --git a/app/lib/three_scale/redis_config.rb b/app/lib/three_scale/redis_config.rb
@@ -6,7 +6,6 @@ def initialize(redis_config = {})
       raw_config = (redis_config || {}).symbolize_keys
       sentinels = raw_config.delete(:sentinels).presence
       raw_config.delete_if { |key, value| value.blank? }
-      raw_config[:size] ||= raw_config.delete(:pool_size) if raw_config.key?(:pool_size)
 
       @config = ActiveSupport::OrderedOptions.new.merge(raw_config)
       config.sentinels = parse_sentinels(sentinels) if sentinels

diff --git a/app/workers/activation_reminder_worker.rb b/app/workers/activation_reminder_worker.rb
@@ -1,5 +1,5 @@
 class ActivationReminderWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   THREE_DAYS = 72.hours.freeze
 

diff --git a/app/workers/audited_worker.rb b/app/workers/audited_worker.rb
@@ -1,5 +1,5 @@
 class AuditedWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   def perform(attributes)
     audit = Audited.audit_class.new

diff --git a/app/workers/backend_delete_service_token_worker.rb b/app/workers/backend_delete_service_token_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackendDeleteServiceTokenWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   def self.enqueue(event)
     perform_async(event.event_id)

diff --git a/app/workers/backend_delete_service_worker.rb b/app/workers/backend_delete_service_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackendDeleteServiceWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   def self.enqueue(event)
     perform_async(event.event_id)

diff --git a/app/workers/backend_metric_worker.rb b/app/workers/backend_metric_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackendMetricWorker < ApplicationJob
-  include Sidekiq::Throttled::Job
+  include Sidekiq::Throttled::Worker
 
   queue_as :backend_sync
 

diff --git a/app/workers/backend_provider_sync_worker.rb b/app/workers/backend_provider_sync_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackendProviderSyncWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   def self.enqueue(provider_id)
     perform_async(provider_id)

diff --git a/app/workers/backend_random_data_generator_worker.rb b/app/workers/backend_random_data_generator_worker.rb
@@ -1,5 +1,5 @@
 class BackendRandomDataGeneratorWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   def self.generate(options)
     perform_async(options)

diff --git a/app/workers/backend_storage_rewrite_worker.rb b/app/workers/backend_storage_rewrite_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BackendStorageRewriteWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
   sidekiq_options queue: :low
 
   def perform(class_name, ids)

diff --git a/app/workers/billing_worker.rb b/app/workers/billing_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BillingWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   sidekiq_options queue: :billing, retry: 3
 

diff --git a/app/workers/cms/upgrade_content_worker.rb b/app/workers/cms/upgrade_content_worker.rb
@@ -1,10 +1,10 @@
 class CMS::UpgradeContentWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   sidekiq_options queue: :low
 
   class ExpandWorker
-    include Sidekiq::Job
+    include Sidekiq::Worker
     sidekiq_options queue: :low
 
     def perform(provider_id, kind)

diff --git a/app/workers/create_service_token_worker.rb b/app/workers/create_service_token_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class CreateServiceTokenWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   # @param [Services::ServiceCreatedEvent] event
   def self.enqueue(event)

diff --git a/app/workers/data_exports_worker.rb b/app/workers/data_exports_worker.rb
@@ -3,7 +3,7 @@
 require 'zip'
 
 class DataExportsWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
   sidekiq_options queue: :priority
 
   def perform(provider_id, recipient_id, type, period)

diff --git a/app/workers/delete_plain_object_worker.rb b/app/workers/delete_plain_object_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class DeletePlainObjectWorker < ApplicationJob
-  include Sidekiq::Throttled::Job
+  include Sidekiq::Throttled::Worker
 
   # TODO: Rails 5 --> discard_on ActiveJob::DeserializationError, ActiveRecord::RecordNotFound
   rescue_from(ActiveJob::DeserializationError, ActiveRecord::RecordNotFound) do |exception|

diff --git a/app/workers/delete_provided_access_tokens_worker.rb b/app/workers/delete_provided_access_tokens_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class DeleteProvidedAccessTokensWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
   sidekiq_options queue: :low
 
   def perform

diff --git a/app/workers/event_import_worker.rb b/app/workers/event_import_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class EventImportWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   def perform(attributes)
     Events::Importer.import_event!(attributes)

diff --git a/app/workers/events_fetch_worker.rb b/app/workers/events_fetch_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class EventsFetchWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   sidekiq_options queue: :events
 

diff --git a/app/workers/find_and_delete_scheduled_accounts_worker.rb b/app/workers/find_and_delete_scheduled_accounts_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class FindAndDeleteScheduledAccountsWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   def perform
     return unless ThreeScale.config.onpremises

diff --git a/app/workers/invoice_friendly_id_sanitization_worker.rb b/app/workers/invoice_friendly_id_sanitization_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class InvoiceFriendlyIdSanitizationWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   sidekiq_options queue: :billing
 

diff --git a/app/workers/invoice_friendly_id_worker.rb b/app/workers/invoice_friendly_id_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class InvoiceFriendlyIdWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   sidekiq_options queue: :billing
 

diff --git a/app/workers/janitor_worker.rb b/app/workers/janitor_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class JanitorWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   def perform
     return unless ThreeScale.config.janitor_worker_enabled

diff --git a/app/workers/last_traffic_worker.rb b/app/workers/last_traffic_worker.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class LastTrafficWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
   sidekiq_options queue: :low
 
   delegate :logger, to: Rails

diff --git a/app/workers/message_worker.rb b/app/workers/message_worker.rb
@@ -1,5 +1,5 @@
 class MessageWorker
-  include Sidekiq::Job
+  include Sidekiq::Worker
 
   def self.enqueue(recipients, attributes)
     perform_async(recipients.as_json, attributes.as_json)