Merge branch 'pbar_stats_fix' into 'master'

Use Gitlab::Redis::Cache in GitlabPerformanceBarStatsWorker

See merge request gitlab-org/gitlab!51104

app/workers/gitlab_performance_bar_stats_worker.rb

@@ -7,12 +7,13 @@ class GitlabPerformanceBarStatsWorker
   LEASE_TIMEOUT = 600
   WORKER_DELAY = 120
   STATS_KEY = 'performance_bar_stats:pending_request_ids'
+  STATS_KEY_EXPIRE = 30.minutes.to_i
 
   feature_category :metrics
   idempotent!
 
   def perform(lease_uuid)
-    Gitlab::Redis::SharedState.with do |redis|
+    Gitlab::Redis::Cache.with do |redis|
       request_ids = fetch_request_ids(redis, lease_uuid)
       stats = Gitlab::PerformanceBar::Stats.new(redis)
 

lib/gitlab/performance_bar/redis_adapter_when_peek_enabled.rb

@@ -15,23 +15,39 @@ module Gitlab
 
       # schedules a job which parses peek profile data and adds them
       # to a structured log
+      # rubocop:disable Gitlab/ModuleWithInstanceVariables
       def enqueue_stats_job(request_id)
         return unless gather_stats?
 
-        @client.sadd(GitlabPerformanceBarStatsWorker::STATS_KEY, request_id) # rubocop:disable Gitlab/ModuleWithInstanceVariables
+        @client.sadd(GitlabPerformanceBarStatsWorker::STATS_KEY, request_id)
 
         return unless uuid = Gitlab::ExclusiveLease.new(
           GitlabPerformanceBarStatsWorker::LEASE_KEY,
           timeout: GitlabPerformanceBarStatsWorker::LEASE_TIMEOUT
         ).try_obtain
 
-        GitlabPerformanceBarStatsWorker.perform_in(GitlabPerformanceBarStatsWorker::WORKER_DELAY, uuid)
+        # stats key should be periodically processed and deleted by
+        # GitlabPerformanceBarStatsWorker but if it doesn't happen for
+        # some reason, we set expiration for the stats key to avoid
+        # keeping millions of request ids which would be already expired
+        # anyway
+        # rubocop:disable Gitlab/ModuleWithInstanceVariables
+        @client.expire(
+          GitlabPerformanceBarStatsWorker::STATS_KEY,
+          GitlabPerformanceBarStatsWorker::STATS_KEY_EXPIRE
+        )
+
+        GitlabPerformanceBarStatsWorker.perform_in(
+          GitlabPerformanceBarStatsWorker::WORKER_DELAY,
+          uuid
+        )
       end
+      # rubocop:enable Gitlab/ModuleWithInstanceVariables
 
       def gather_stats?
         return unless Feature.enabled?(:performance_bar_stats)
 
-        Gitlab.com? || !Rails.env.production?
+        Gitlab.com? || Gitlab.staging? || !Rails.env.production?
       end
     end
   end

spec/lib/gitlab/performance_bar/redis_adapter_when_peek_enabled_spec.rb

@@ -31,6 +31,7 @@ RSpec.describe Gitlab::PerformanceBar::RedisAdapterWhenPeekEnabled do
       expect_to_obtain_exclusive_lease(GitlabPerformanceBarStatsWorker::LEASE_KEY, uuid)
       expect(GitlabPerformanceBarStatsWorker).to receive(:perform_in).with(GitlabPerformanceBarStatsWorker::WORKER_DELAY, uuid)
       expect(client).to receive(:sadd).with(GitlabPerformanceBarStatsWorker::STATS_KEY, uuid)
+      expect(client).to receive(:expire).with(GitlabPerformanceBarStatsWorker::STATS_KEY, GitlabPerformanceBarStatsWorker::STATS_KEY_EXPIRE)
 
       peek_adapter.new(client).save('foo')
     end

spec/workers/gitlab_performance_bar_stats_worker_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe GitlabPerformanceBarStatsWorker do
     let(:uuid) { 1 }
 
     before do
-      expect(Gitlab::Redis::SharedState).to receive(:with).and_yield(redis)
+      expect(Gitlab::Redis::Cache).to receive(:with).and_yield(redis)
       expect_to_cancel_exclusive_lease(GitlabPerformanceBarStatsWorker::LEASE_KEY, uuid)
     end