1 files changed, 7 insertions, 53 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 f955fd265e5..3322075cd5c 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
@@ -23,39 +23,6 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
     described_class.clear_memoization(:known_events)
   end
 
-  describe '.categories' do
-    it 'gets CE unique category names' do
-      expect(described_class.categories).to include(
-        'analytics',
-        'ci_templates',
-        'ci_users',
-        'code_review',
-        'deploy_token_packages',
-        'ecosystem',
-        'environments',
-        'error_tracking',
-        'geo',
-        'ide_edit',
-        'importer',
-        'incident_management_alerts',
-        'incident_management',
-        'issues_edit',
-        'kubernetes_agent',
-        'manage',
-        'pipeline_authoring',
-        'quickactions',
-        'search',
-        'secure',
-        'snippets',
-        'source_code',
-        'terraform',
-        'testing',
-        'user_packages',
-        'work_items'
-      )
-    end
-  end
-
   describe '.known_events' do
     let(:ce_temp_dir) { Dir.mktmpdir }
     let(:ce_temp_file) { Tempfile.new(%w[common .yml], ce_temp_dir) }
@@ -63,7 +30,6 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
       {
         "name" => "ce_event",
         "redis_slot" => "analytics",
-        "category" => "analytics",
         "aggregation" => "weekly"
       }
     end
@@ -105,13 +71,13 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
 
     let(:known_events) do
       [
-        { name: weekly_event, redis_slot: "analytics", category: analytics_category, aggregation: "weekly", feature_flag: feature },
-        { name: daily_event, redis_slot: "analytics", category: analytics_category, aggregation: "daily" },
-        { name: category_productivity_event, redis_slot: "analytics", category: productivity_category, aggregation: "weekly" },
-        { name: compliance_slot_event, redis_slot: "compliance", category: compliance_category, aggregation: "weekly" },
-        { name: no_slot, category: global_category, aggregation: "daily" },
-        { name: different_aggregation, category: global_category, aggregation: "monthly" },
-        { name: context_event, category: other_category, aggregation: 'weekly' }
+        { name: weekly_event, redis_slot: "analytics", aggregation: "weekly", feature_flag: feature },
+        { name: daily_event, redis_slot: "analytics", aggregation: "daily" },
+        { name: category_productivity_event, redis_slot: "analytics", aggregation: "weekly" },
+        { name: compliance_slot_event, redis_slot: "compliance", aggregation: "weekly" },
+        { name: no_slot, aggregation: "daily" },
+        { name: different_aggregation, aggregation: "monthly" },
+        { name: context_event, aggregation: 'weekly' }
       ].map(&:with_indifferent_access)
     end
 
@@ -121,12 +87,6 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
       allow(described_class).to receive(:known_events).and_return(known_events)
     end
 
-    describe '.events_for_category' do
-      it 'gets the event names for given category' do
-        expect(described_class.events_for_category(:analytics)).to contain_exactly(weekly_event, daily_event)
-      end
-    end
-
     describe '.track_event' do
       context 'with redis_hll_tracking' do
         it 'tracks the event when feature enabled' do
@@ -346,12 +306,6 @@ RSpec.describe Gitlab::UsageDataCounters::HLLRedisCounter, :clean_gitlab_redis_s
         end.to raise_error(Gitlab::UsageDataCounters::HLLRedisCounter::SlotMismatch)
       end
 
-      it 'raise error if metrics are not in the same category' do
-        expect do
-          described_class.unique_events(event_names: [category_analytics_event, category_productivity_event], start_date: 4.weeks.ago, end_date: Date.current)
-        end.to raise_error(Gitlab::UsageDataCounters::HLLRedisCounter::CategoryMismatch)
-      end
-
       it "raise error if metrics don't have same aggregation" do
         expect do
           described_class.unique_events(event_names: [daily_event, weekly_event], start_date: 4.weeks.ago, end_date: Date.current)