Expand queues before instantiating fetcher

Removes the patch to Sidekiq::Manager since we need to expand the queue
names earlier so that it can be included in the options used to
instantiate the fetcher object

config/initializers/7_redis.rb

@@ -3,6 +3,7 @@
 # We set the instance variable directly to suppress warnings.
 # We cannot switch to the new behavior until we change all existing `redis.exists` calls to `redis.exists?`.
 # Some gems also need to be updated
+# https://gitlab.com/gitlab-org/gitlab/-/issues/340602
 Redis.instance_variable_set(:@exists_returns_integer, false)
 
 Redis::Client.prepend(Gitlab::Instrumentation::RedisInterceptor)

config/initializers/sidekiq.rb

@@ -27,6 +27,11 @@ use_sidekiq_daemon_memory_killer = ENV.fetch("SIDEKIQ_DAEMON_MEMORY_KILLER", 1).
 use_sidekiq_legacy_memory_killer = !use_sidekiq_daemon_memory_killer
 
 Sidekiq.configure_server do |config|
+  config.options[:strict] = false
+  config.options[:queues] = Gitlab::SidekiqConfig.expand_queues(config.options[:queues])
+
+  Sidekiq.logger.info "Listening on queues #{config.options[:queues].uniq.sort}"
+
   if enable_json_logs
     config.log_formatter = Gitlab::SidekiqLogging::JSONFormatter.new
     config.options[:job_logger] = Gitlab::SidekiqLogging::StructuredLogger

lib/gitlab/sidekiq_versioning.rb

@@ -3,25 +3,21 @@
 module Gitlab
   module SidekiqVersioning
     def self.install!
-      Sidekiq::Manager.prepend SidekiqVersioning::Manager
-
       # The Sidekiq client API always adds the queue to the Sidekiq queue
       # list, but mail_room and gitlab-shell do not. This is only necessary
       # for monitoring.
-      begin
-        queues = SidekiqConfig.worker_queues
+      queues = SidekiqConfig.worker_queues
 
-        if queues.any?
-          Sidekiq.redis do |conn|
-            conn.pipelined do
-              queues.each do |queue|
-                conn.sadd('queues', queue)
-              end
+      if queues.any?
+        Sidekiq.redis do |conn|
+          conn.pipelined do
+            queues.each do |queue|
+              conn.sadd('queues', queue)
             end
           end
         end
-      rescue ::Redis::BaseError, SocketError, Errno::ENOENT, Errno::EADDRNOTAVAIL, Errno::EAFNOSUPPORT, Errno::ECONNRESET, Errno::ECONNREFUSED
       end
+    rescue ::Redis::BaseError, SocketError, Errno::ENOENT, Errno::EADDRNOTAVAIL, Errno::EAFNOSUPPORT, Errno::ECONNRESET, Errno::ECONNREFUSED
     end
   end
 end

lib/gitlab/sidekiq_versioning/manager.rb

-# frozen_string_literal: true
-
-module Gitlab
-  module SidekiqVersioning
-    module Manager
-      def initialize(options = {})
-        options[:strict] = false
-        options[:queues] = SidekiqConfig.expand_queues(options[:queues])
-        Sidekiq.logger.info "Listening on queues #{options[:queues].uniq.sort}"
-        super
-      end
-    end
-  end
-end

spec/lib/gitlab/sidekiq_versioning/manager_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Gitlab::SidekiqVersioning::Manager do
-  before do
-    Sidekiq::Manager.prepend described_class
-  end
-
-  describe '#initialize' do
-    it 'listens on all expanded queues' do
-      manager = Sidekiq::Manager.new(queues: %w[post_receive repository_fork cronjob unknown])
-
-      queues = manager.options[:queues]
-
-      expect(queues).to include('post_receive')
-      expect(queues).to include('repository_fork')
-      expect(queues).to include('cronjob')
-      expect(queues).to include('cronjob:import_stuck_project_import_jobs')
-      expect(queues).to include('cronjob:jira_import_stuck_jira_import_jobs')
-      expect(queues).to include('cronjob:stuck_merge_jobs')
-      expect(queues).to include('unknown')
-    end
-  end
-end

spec/lib/gitlab/sidekiq_versioning_spec.rb

@@ -29,12 +29,6 @@ RSpec.describe Gitlab::SidekiqVersioning, :redis do
   end
 
   describe '.install!' do
-    it 'prepends SidekiqVersioning::Manager into Sidekiq::Manager' do
-      described_class.install!
-
-      expect(Sidekiq::Manager).to include(Gitlab::SidekiqVersioning::Manager)
-    end
-
     it 'registers all versionless and versioned queues with Redis' do
       described_class.install!