Merge branch '240901-fix-expire-time-for-redis-hll-counters' into 'master'

Fix expire time for Redis HLL counters

Closes #240901

See merge request gitlab-org/gitlab!40253

lib/gitlab/usage_data_counters/hll_redis_counter.rb

@@ -91,7 +91,7 @@ module Gitlab
         end
 
         def expiry(event)
-          return event[:expiry] if event[:expiry].present?
+          return event[:expiry].days if event[:expiry].present?
 
           event[:aggregation].to_sym == :daily ? DEFAULT_DAILY_KEY_EXPIRY_LENGTH : DEFAULT_WEEKLY_KEY_EXPIRY_LENGTH
         end

spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb

@@ -45,6 +45,32 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
     it 'raise error if metrics of unknown aggregation' do
       expect { described_class.track_event(entity1, 'unknown', Date.current) } .to raise_error(Gitlab::UsageDataCounters::HLLRedisCounter::UnknownEvent)
     end
+
+    it 'sets the keys in Redis to expire automatically after 12 weeks' do
+      described_class.track_event(entity1, "g_analytics_contribution")
+
+      Gitlab::Redis::SharedState.with do |redis|
+        keys = redis.scan_each(match: "g_{analytics}_contribution-*").to_a
+        expect(keys).not_to be_empty
+
+        keys.each do |key|
+          expect(redis.ttl(key)).to be_within(5.seconds).of(12.weeks)
+        end
+      end
+    end
+
+    it 'sets the keys in Redis to expire automatically after 6 weeks by default' do
+      described_class.track_event(entity1, "g_compliance_dashboard")
+
+      Gitlab::Redis::SharedState.with do |redis|
+        keys = redis.scan_each(match: "g_{compliance}_dashboard-*").to_a
+        expect(keys).not_to be_empty
+
+        keys.each do |key|
+          expect(redis.ttl(key)).to be_within(5.seconds).of(6.weeks)
+        end
+      end
+    end
   end
 
   describe '.unique_events' do