1 files changed, 25 insertions, 7 deletions

diff --git a/app/services/users/activity_service.rb b/app/services/users/activity_service.rb
index 4978f778870..c8f9c28061f 100644
--- a/app/services/users/activity_service.rb
+++ b/app/services/users/activity_service.rb
@@ -4,38 +4,56 @@ module Users
   class ActivityService
     LEASE_TIMEOUT = 1.minute.to_i
 
-    def initialize(author)
+    def initialize(author:, namespace: nil, project: nil)
       @user = if author.respond_to?(:username)
                 author
               elsif author.respond_to?(:user)
                 author.user
               end
 
-      @user = nil unless @user.is_a?(User)
+      @user = nil unless user.is_a?(User)
+      @namespace = namespace
+      @project = project
     end
 
     def execute
-      return unless @user
+      return unless user
 
       ::Gitlab::Database::LoadBalancing::Session.without_sticky_writes { record_activity }
     end
 
     private
 
+    attr_reader :user, :namespace, :project
+
     def record_activity
       return if Gitlab::Database.read_only?
 
       today = Date.today
 
-      return if @user.last_activity_on == today
+      return if user.last_activity_on == today
 
-      lease = Gitlab::ExclusiveLease.new("activity_service:#{@user.id}",
+      lease = Gitlab::ExclusiveLease.new("activity_service:#{user.id}",
                                          timeout: LEASE_TIMEOUT)
       return unless lease.try_obtain
 
-      @user.update_attribute(:last_activity_on, today)
+      user.update_attribute(:last_activity_on, today)
+
+      Gitlab::UsageDataCounters::HLLRedisCounter.track_event('unique_active_user', values: user.id)
+
+      return unless Feature.enabled?(:route_hll_to_snowplow_phase3)
 
-      Gitlab::UsageDataCounters::HLLRedisCounter.track_event('unique_active_user', values: @user.id)
+      Gitlab::Tracking.event(
+        'Users::ActivityService',
+        'perform_action',
+        user: user,
+        namespace: namespace,
+        project: project,
+        label: 'redis_hll_counters.manage.unique_active_users_monthly',
+        context: [
+          Gitlab::Tracking::ServicePingContext.new(data_source: :redis_hll, event: 'unique_active_user').to_context
+        ]
+      )
     end
   end
 end