Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

5 files changed, 15 insertions, 15 deletions

diff --git a/lib/gitlab/sidekiq_middleware/client_metrics.rb b/lib/gitlab/sidekiq_middleware/client_metrics.rb
index 245a1b5e024..7ee8a623d30 100644
--- a/lib/gitlab/sidekiq_middleware/client_metrics.rb
+++ b/lib/gitlab/sidekiq_middleware/client_metrics.rb
@@ -2,7 +2,9 @@
 
 module Gitlab
   module SidekiqMiddleware
-    class ClientMetrics < SidekiqMiddleware::Metrics
+    class ClientMetrics
+      include ::Gitlab::SidekiqMiddleware::MetricsHelper
+
       ENQUEUED = :sidekiq_enqueued_jobs_total
 
       def initialize
diff --git a/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb b/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb
index 5efd1b34d32..79ac853ea0c 100644
--- a/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb
+++ b/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job.rb
@@ -70,10 +70,6 @@ module Gitlab
           jid != existing_jid
         end
 
-        def droppable?
-          idempotent? && ::Feature.disabled?("disable_#{queue_name}_deduplication", type: :ops)
-        end
-
         def scheduled_at
           job['at']
         end
@@ -85,6 +81,13 @@ module Gitlab
           worker_klass.get_deduplication_options
         end
 
+        def idempotent?
+          return false unless worker_klass
+          return false unless worker_klass.respond_to?(:idempotent?)
+
+          worker_klass.idempotent?
+        end
+
         private
 
         attr_reader :queue_name, :job
@@ -128,13 +131,6 @@ module Gitlab
         def idempotency_string
           "#{worker_class_name}:#{arguments.join('-')}"
         end
-
-        def idempotent?
-          return false unless worker_klass
-          return false unless worker_klass.respond_to?(:idempotent?)
-
-          worker_klass.idempotent?
-        end
       end
     end
   end
diff --git a/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/deduplicates_when_scheduling.rb b/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/deduplicates_when_scheduling.rb
index 59b0e7e29da..469033a5e52 100644
--- a/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/deduplicates_when_scheduling.rb
+++ b/lib/gitlab/sidekiq_middleware/duplicate_jobs/strategies/deduplicates_when_scheduling.rb
@@ -13,7 +13,7 @@ module Gitlab
             if deduplicatable_job? && check! && duplicate_job.duplicate?
               job['duplicate-of'] = duplicate_job.existing_jid
 
-              if duplicate_job.droppable?
+              if duplicate_job.idempotent?
                 Gitlab::SidekiqLogging::DeduplicationLogger.instance.log(
                   job, "dropped #{strategy_name}", duplicate_job.options)
                 return false
diff --git a/lib/gitlab/sidekiq_middleware/metrics.rb b/lib/gitlab/sidekiq_middleware/metrics_helper.rb
index 7ae8995c46d..5c1ce2b98e8 100644
--- a/lib/gitlab/sidekiq_middleware/metrics.rb
+++ b/lib/gitlab/sidekiq_middleware/metrics_helper.rb
@@ -2,7 +2,7 @@
 
 module Gitlab
   module SidekiqMiddleware
-    class Metrics
+    module MetricsHelper
       TRUE_LABEL = "yes"
       FALSE_LABEL = "no"
 
diff --git a/lib/gitlab/sidekiq_middleware/server_metrics.rb b/lib/gitlab/sidekiq_middleware/server_metrics.rb
index 0635c07ae4b..7f3048f4c6e 100644
--- a/lib/gitlab/sidekiq_middleware/server_metrics.rb
+++ b/lib/gitlab/sidekiq_middleware/server_metrics.rb
@@ -2,7 +2,9 @@
 
 module Gitlab
   module SidekiqMiddleware
-    class ServerMetrics < SidekiqMiddleware::Metrics
+    class ServerMetrics
+      include ::Gitlab::SidekiqMiddleware::MetricsHelper
+
       # SIDEKIQ_LATENCY_BUCKETS are latency histogram buckets better suited to Sidekiq
       # timeframes than the DEFAULT_BUCKET definition. Defined in seconds.
       SIDEKIQ_LATENCY_BUCKETS = [0.1, 0.25, 0.5, 1, 2.5, 5, 10, 60, 300, 600].freeze