Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 9 insertions, 1 deletions

diff --git a/app/services/packages/create_event_service.rb b/app/services/packages/create_event_service.rb
index c4492389da9..f0328ceb08a 100644
--- a/app/services/packages/create_event_service.rb
+++ b/app/services/packages/create_event_service.rb
@@ -4,7 +4,11 @@ module Packages
   class CreateEventService < BaseService
     def execute
       if Feature.enabled?(:collect_package_events_redis) && redis_event_name
-        ::Gitlab::UsageDataCounters::HLLRedisCounter.track_event(current_user.id, redis_event_name)
+        if guest?
+          ::Gitlab::UsageDataCounters::GuestPackageEventCounter.count(redis_event_name)
+        else
+          ::Gitlab::UsageDataCounters::HLLRedisCounter.track_event(current_user.id, redis_event_name)
+        end
       end
 
       if Feature.enabled?(:collect_package_events) && Gitlab::Database.read_write?
@@ -45,5 +49,9 @@ module Packages
         :guest
       end
     end
+
+    def guest?
+      originator_type == :guest
+    end
   end
 end