1 files changed, 13 insertions, 12 deletions
diff --git a/spec/services/packages/create_event_service_spec.rb b/spec/services/packages/create_event_service_spec.rb
index f581d704087..f7bab0e5a9f 100644
--- a/spec/services/packages/create_event_service_spec.rb
+++ b/spec/services/packages/create_event_service_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe Packages::CreateEventService do
       end
     end
 
-    shared_examples 'redis package event creation' do |originator_type, expected_scope|
+    shared_examples 'redis package unique event creation' do |originator_type, expected_scope|
       context 'with feature flag disable' do
         before do
           stub_feature_flags(collect_package_events_redis: false)
@@ -70,29 +70,27 @@ RSpec.describe Packages::CreateEventService do
       end
 
       it 'tracks the event' do
-        expect(::Gitlab::UsageDataCounters::GuestPackageEventCounter).not_to receive(:count)
-        expect(::Gitlab::UsageDataCounters::HLLRedisCounter).to receive(:track_event).with(user.id, Packages::Event.allowed_event_name(expected_scope, event_name, originator_type))
+        expect(::Gitlab::UsageDataCounters::HLLRedisCounter).to receive(:track_event).with(/package/, values: user.id)
 
         subject
       end
     end
 
-    shared_examples 'redis package guest event creation' do |originator_type, expected_scope|
+    shared_examples 'redis package count event creation' do |originator_type, expected_scope|
       context 'with feature flag disabled' do
         before do
           stub_feature_flags(collect_package_events_redis: false)
         end
 
         it 'does not track the event' do
-          expect(::Gitlab::UsageDataCounters::GuestPackageEventCounter).not_to receive(:count)
+          expect(::Gitlab::UsageDataCounters::PackageEventCounter).not_to receive(:count)
 
           subject
         end
       end
 
       it 'tracks the event' do
-        expect(::Gitlab::UsageDataCounters::HLLRedisCounter).not_to receive(:track_event)
-        expect(::Gitlab::UsageDataCounters::GuestPackageEventCounter).to receive(:count).with(Packages::Event.allowed_event_name(expected_scope, event_name, originator_type))
+        expect(::Gitlab::UsageDataCounters::PackageEventCounter).to receive(:count).at_least(:once)
 
         subject
       end
@@ -102,21 +100,23 @@ RSpec.describe Packages::CreateEventService do
       let(:user) { create(:user) }
 
       it_behaves_like 'db package event creation', 'user', 'container'
-      it_behaves_like 'redis package event creation', 'user', 'container'
+      it_behaves_like 'redis package unique event creation', 'user', 'container'
+      it_behaves_like 'redis package count event creation', 'user', 'container'
     end
 
     context 'with a deploy token' do
       let(:user) { create(:deploy_token) }
 
       it_behaves_like 'db package event creation', 'deploy_token', 'container'
-      it_behaves_like 'redis package event creation', 'deploy_token', 'container'
+      it_behaves_like 'redis package unique event creation', 'deploy_token', 'container'
+      it_behaves_like 'redis package count event creation', 'deploy_token', 'container'
     end
 
     context 'with no user' do
       let(:user) { nil }
 
       it_behaves_like 'db package event creation', 'guest', 'container'
-      it_behaves_like 'redis package guest event creation', 'guest', 'container'
+      it_behaves_like 'redis package count event creation', 'guest', 'container'
     end
 
     context 'with a package as scope' do
@@ -126,14 +126,15 @@ RSpec.describe Packages::CreateEventService do
         let(:user) { nil }
 
         it_behaves_like 'db package event creation', 'guest', 'npm'
-        it_behaves_like 'redis package guest event creation', 'guest', 'npm'
+        it_behaves_like 'redis package count event creation', 'guest', 'npm'
       end
 
       context 'with user' do
         let(:user) { create(:user) }
 
         it_behaves_like 'db package event creation', 'user', 'npm'
-        it_behaves_like 'redis package event creation', 'user', 'npm'
+        it_behaves_like 'redis package unique event creation', 'user', 'npm'
+        it_behaves_like 'redis package count event creation', 'user', 'npm'
       end
     end
   end