Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb b/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb
index ac5c907465e..133d777fc32 100644
--- a/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb
+++ b/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb
@@ -17,7 +17,7 @@ module Gitlab
       # to a structured log
       # rubocop:disable Gitlab/ModuleWithInstanceVariables
       def enqueue_stats_job(request_id)
-        return unless Feature.enabled?(:performance_bar_stats)
+        return unless gather_stats?
 
         @client.sadd(GitlabPerformanceBarStatsWorker::STATS_KEY, request_id)
 
@@ -43,6 +43,12 @@ module Gitlab
         )
       end
       # rubocop:enable Gitlab/ModuleWithInstanceVariables
+
+      def gather_stats?
+        return unless Feature.enabled?(:performance_bar_stats)
+
+        Gitlab.com? || Gitlab.staging? || !Rails.env.production?
+      end
     end
   end
 end