Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 13 deletions

diff --git a/lib/gitlab/sidekiq_middleware/server_metrics.rb b/lib/gitlab/sidekiq_middleware/server_metrics.rb
index 058c23178f8..e7c6b586da4 100644
--- a/lib/gitlab/sidekiq_middleware/server_metrics.rb
+++ b/lib/gitlab/sidekiq_middleware/server_metrics.rb
@@ -18,7 +18,7 @@ module Gitlab
       SIDEKIQ_QUEUE_DURATION_BUCKETS = [10, 60].freeze
 
       # These labels from Gitlab::SidekiqMiddleware::MetricsHelper are included in SLI metrics
-      SIDEKIQ_SLI_LABELS = [:worker, :feature_category, :urgency, :external_dependencies].freeze
+      SIDEKIQ_SLI_LABELS = [:worker, :feature_category, :urgency, :external_dependencies, :queue].freeze
 
       class << self
         include ::Gitlab::SidekiqMiddleware::MetricsHelper
@@ -64,8 +64,8 @@ module Gitlab
             end
           end
 
-          Gitlab::Metrics::SidekiqSlis.initialize_execution_slis!(possible_sli_labels) if ::Feature.enabled?(:sidekiq_execution_application_slis)
-          Gitlab::Metrics::SidekiqSlis.initialize_queueing_slis!(possible_sli_labels) if ::Feature.enabled?(:sidekiq_queueing_application_slis)
+          Gitlab::Metrics::SidekiqSlis.initialize_execution_slis!(possible_sli_labels)
+          Gitlab::Metrics::SidekiqSlis.initialize_queueing_slis!(possible_sli_labels)
         end
       end
 
@@ -143,16 +143,10 @@ module Gitlab
             @metrics[:sidekiq_load_balancing_count].increment(labels.merge(load_balancing_labels), 1)
           end
 
-          if ::Feature.enabled?(:sidekiq_execution_application_slis)
-            sli_labels = labels.slice(*SIDEKIQ_SLI_LABELS)
-            Gitlab::Metrics::SidekiqSlis.record_execution_apdex(sli_labels, monotonic_time) if job_succeeded
-            Gitlab::Metrics::SidekiqSlis.record_execution_error(sli_labels, !job_succeeded)
-          end
-
-          if ::Feature.enabled?(:sidekiq_queueing_application_slis)
-            sli_labels = labels.slice(*SIDEKIQ_SLI_LABELS)
-            Gitlab::Metrics::SidekiqSlis.record_queueing_apdex(sli_labels, queue_duration) if queue_duration
-          end
+          sli_labels = labels.slice(*SIDEKIQ_SLI_LABELS)
+          Gitlab::Metrics::SidekiqSlis.record_execution_apdex(sli_labels, monotonic_time) if job_succeeded
+          Gitlab::Metrics::SidekiqSlis.record_execution_error(sli_labels, !job_succeeded)
+          Gitlab::Metrics::SidekiqSlis.record_queueing_apdex(sli_labels, queue_duration) if queue_duration
         end
       end
 
diff --git a/lib/sidebars/projects/menus/settings_menu.rb b/lib/sidebars/projects/menus/settings_menu.rb
index 9219312ede8..142d803037b 100644
--- a/lib/sidebars/projects/menus/settings_menu.rb
+++ b/lib/sidebars/projects/menus/settings_menu.rb
@@ -162,3 +162,5 @@ module Sidebars
     end
   end
 end
+
+Sidebars::Projects::Menus::SettingsMenu.prepend_mod_with('Sidebars::Projects::Menus::SettingsMenu')