1 files changed, 33 insertions, 3 deletions
diff --git a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
index d12dcdae955..9fc28f6c4ec 100644
--- a/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb
@@ -34,6 +34,7 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
         'source_code',
         'incident_management',
         'incident_management_alerts',
+        'incident_management_oncall',
         'testing',
         'issues_edit',
         'ci_secrets_management',
@@ -43,7 +44,8 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
         'ci_templates',
         'quickactions',
         'pipeline_authoring',
-        'epics_usage'
+        'epics_usage',
+        'secure'
       )
     end
   end
@@ -93,7 +95,25 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
     end
 
     describe '.track_event' do
-      context 'with feature flag set' do
+      context 'with redis_hll_tracking' do
+        it 'tracks the event when feature enabled' do
+          stub_feature_flags(redis_hll_tracking: true)
+
+          expect(Gitlab::Redis::HLL).to receive(:add)
+
+          described_class.track_event(weekly_event, values: 1)
+        end
+
+        it 'does not track the event with feature flag disabled' do
+          stub_feature_flags(redis_hll_tracking: false)
+
+          expect(Gitlab::Redis::HLL).not_to receive(:add)
+
+          described_class.track_event(weekly_event, values: 1)
+        end
+      end
+
+      context 'with event feature flag set' do
         it 'tracks the event when feature enabled' do
           stub_feature_flags(feature => true)
 
@@ -111,7 +131,7 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
         end
       end
 
-      context 'with no feature flag set' do
+      context 'with no event feature flag set' do
         it 'tracks the event' do
           expect(Gitlab::Redis::HLL).to receive(:add)
 
@@ -289,6 +309,11 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
         described_class.track_event(daily_event, values: entity4, time: 29.days.ago)
       end
 
+      it 'returns 0 if there are no keys for the given events' do
+        expect(Gitlab::Redis::HLL).not_to receive(:count)
+        expect(described_class.unique_events(event_names: [weekly_event], start_date: Date.current, end_date: 4.weeks.ago)).to eq(-1)
+      end
+
       it 'raise error if metrics are not in the same slot' do
         expect do
           described_class.unique_events(event_names: [compliance_slot_event, analytics_slot_event], start_date: 4.weeks.ago, end_date: Date.current)
@@ -508,6 +533,11 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
       expect { described_class.calculate_events_union(**time_range.merge(event_names: %w[event1_slot event4])) }.to raise_error described_class::SlotMismatch
       expect { described_class.calculate_events_union(**time_range.merge(event_names: %w[event5_slot event3_slot])) }.to raise_error described_class::AggregationMismatch
     end
+
+    it 'returns 0 if there are no keys for given events' do
+      expect(Gitlab::Redis::HLL).not_to receive(:count)
+      expect(described_class.calculate_events_union(event_names: %w[event1_slot event2_slot event3_slot], start_date: Date.current, end_date: 4.weeks.ago)).to eq(-1)
+    end
   end
 
   describe '.weekly_time_range' do