Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

2 files changed, 12 insertions, 7 deletions

diff --git a/lib/gitlab/sidekiq_config/dummy_worker.rb b/lib/gitlab/sidekiq_config/dummy_worker.rb
index ef0dce0cf84..b7f53da8e00 100644
--- a/lib/gitlab/sidekiq_config/dummy_worker.rb
+++ b/lib/gitlab/sidekiq_config/dummy_worker.rb
@@ -5,7 +5,6 @@ module Gitlab
     # For queues that don't have explicit workers - default and mailers
     class DummyWorker
       ATTRIBUTE_METHODS = {
-        queue: :queue,
         name: :name,
         feature_category: :get_feature_category,
         has_external_dependencies: :worker_has_external_dependencies?,
@@ -20,6 +19,10 @@ module Gitlab
         @attributes = attributes
       end
 
+      def generated_queue_name
+        @attributes[:queue]
+      end
+
       def queue_namespace
         nil
       end
diff --git a/lib/gitlab/sidekiq_config/worker.rb b/lib/gitlab/sidekiq_config/worker.rb
index aea4209f631..a343573440f 100644
--- a/lib/gitlab/sidekiq_config/worker.rb
+++ b/lib/gitlab/sidekiq_config/worker.rb
@@ -6,9 +6,11 @@ module Gitlab
       include Comparable
 
       attr_reader :klass
-      delegate :feature_category_not_owned?, :get_feature_category, :get_sidekiq_options,
-               :get_tags, :get_urgency, :get_weight, :get_worker_resource_boundary,
-               :idempotent?, :queue, :queue_namespace, :worker_has_external_dependencies?,
+
+      delegate :feature_category_not_owned?, :generated_queue_name, :get_feature_category,
+               :get_sidekiq_options, :get_tags, :get_urgency, :get_weight,
+               :get_worker_resource_boundary, :idempotent?, :queue_namespace,
+               :worker_has_external_dependencies?,
                to: :klass
 
       def initialize(klass, ee:)
@@ -35,7 +37,7 @@ module Gitlab
 
       # Put namespaced queues first
       def to_sort
-        [queue_namespace ? 0 : 1, queue]
+        [queue_namespace ? 0 : 1, generated_queue_name]
       end
 
       # YAML representation
@@ -45,7 +47,7 @@ module Gitlab
 
       def to_yaml
         {
-          name: queue,
+          name: generated_queue_name,
           worker_name: klass.name,
           feature_category: get_feature_category,
           has_external_dependencies: worker_has_external_dependencies?,
@@ -62,7 +64,7 @@ module Gitlab
       end
 
       def queue_and_weight
-        [queue, get_weight]
+        [generated_queue_name, get_weight]
       end
 
       def retries