1 files changed, 91 insertions, 0 deletions
diff --git a/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb
index 11d59257ed9..b9856e1f74a 100644
--- a/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/merge_request_activity_unique_counter.rb
@@ -10,6 +10,8 @@ module Gitlab
       MR_CLOSE_ACTION = 'i_code_review_user_close_mr'
       MR_REOPEN_ACTION = 'i_code_review_user_reopen_mr'
       MR_MERGE_ACTION = 'i_code_review_user_merge_mr'
+      MR_APPROVE_ACTION = 'i_code_review_user_approve_mr'
+      MR_UNAPPROVE_ACTION = 'i_code_review_user_unapprove_mr'
       MR_CREATE_COMMENT_ACTION = 'i_code_review_user_create_mr_comment'
       MR_EDIT_COMMENT_ACTION = 'i_code_review_user_edit_mr_comment'
       MR_REMOVE_COMMENT_ACTION = 'i_code_review_user_remove_mr_comment'
@@ -18,6 +20,21 @@ module Gitlab
       MR_CREATE_MULTILINE_COMMENT_ACTION = 'i_code_review_user_create_multiline_mr_comment'
       MR_EDIT_MULTILINE_COMMENT_ACTION = 'i_code_review_user_edit_multiline_mr_comment'
       MR_REMOVE_MULTILINE_COMMENT_ACTION = 'i_code_review_user_remove_multiline_mr_comment'
+      MR_ADD_SUGGESTION_ACTION = 'i_code_review_user_add_suggestion'
+      MR_APPLY_SUGGESTION_ACTION = 'i_code_review_user_apply_suggestion'
+      MR_MARKED_AS_DRAFT_ACTION = 'i_code_review_user_marked_as_draft'
+      MR_UNMARKED_AS_DRAFT_ACTION = 'i_code_review_user_unmarked_as_draft'
+      MR_RESOLVE_THREAD_ACTION = 'i_code_review_user_resolve_thread'
+      MR_UNRESOLVE_THREAD_ACTION = 'i_code_review_user_unresolve_thread'
+      MR_ASSIGNED_USERS_ACTION = 'i_code_review_user_assigned'
+      MR_REVIEW_REQUESTED_USERS_ACTION = 'i_code_review_user_review_requested'
+      MR_TASK_ITEM_STATUS_CHANGED_ACTION = 'i_code_review_user_toggled_task_item_status'
+      MR_APPROVAL_RULE_ADDED_USERS_ACTION = 'i_code_review_user_approval_rule_added'
+      MR_APPROVAL_RULE_EDITED_USERS_ACTION = 'i_code_review_user_approval_rule_edited'
+      MR_APPROVAL_RULE_DELETED_USERS_ACTION = 'i_code_review_user_approval_rule_deleted'
+      MR_EDIT_MR_TITLE_ACTION = 'i_code_review_edit_mr_title'
+      MR_EDIT_MR_DESC_ACTION = 'i_code_review_edit_mr_desc'
+      MR_CREATE_FROM_ISSUE_ACTION = 'i_code_review_user_create_mr_from_issue'
 
       class << self
         def track_mr_diffs_action(merge_request:)
@@ -45,6 +62,22 @@ module Gitlab
           track_unique_action_by_user(MR_REOPEN_ACTION, user)
         end
 
+        def track_approve_mr_action(user:)
+          track_unique_action_by_user(MR_APPROVE_ACTION, user)
+        end
+
+        def track_unapprove_mr_action(user:)
+          track_unique_action_by_user(MR_UNAPPROVE_ACTION, user)
+        end
+
+        def track_resolve_thread_action(user:)
+          track_unique_action_by_user(MR_RESOLVE_THREAD_ACTION, user)
+        end
+
+        def track_unresolve_thread_action(user:)
+          track_unique_action_by_user(MR_UNRESOLVE_THREAD_ACTION, user)
+        end
+
         def track_create_comment_action(note:)
           track_unique_action_by_user(MR_CREATE_COMMENT_ACTION, note.author)
           track_multiline_unique_action(MR_CREATE_MULTILINE_COMMENT_ACTION, note)
@@ -68,6 +101,58 @@ module Gitlab
           track_unique_action_by_user(MR_PUBLISH_REVIEW_ACTION, user)
         end
 
+        def track_add_suggestion_action(user:)
+          track_unique_action_by_user(MR_ADD_SUGGESTION_ACTION, user)
+        end
+
+        def track_marked_as_draft_action(user:)
+          track_unique_action_by_user(MR_MARKED_AS_DRAFT_ACTION, user)
+        end
+
+        def track_unmarked_as_draft_action(user:)
+          track_unique_action_by_user(MR_UNMARKED_AS_DRAFT_ACTION, user)
+        end
+
+        def track_apply_suggestion_action(user:)
+          track_unique_action_by_user(MR_APPLY_SUGGESTION_ACTION, user)
+        end
+
+        def track_users_assigned_to_mr(users:)
+          track_unique_action_by_users(MR_ASSIGNED_USERS_ACTION, users)
+        end
+
+        def track_users_review_requested(users:)
+          track_unique_action_by_users(MR_REVIEW_REQUESTED_USERS_ACTION, users)
+        end
+
+        def track_title_edit_action(user:)
+          track_unique_action_by_user(MR_EDIT_MR_TITLE_ACTION, user)
+        end
+
+        def track_description_edit_action(user:)
+          track_unique_action_by_user(MR_EDIT_MR_DESC_ACTION, user)
+        end
+
+        def track_approval_rule_added_action(user:)
+          track_unique_action_by_user(MR_APPROVAL_RULE_ADDED_USERS_ACTION, user)
+        end
+
+        def track_approval_rule_edited_action(user:)
+          track_unique_action_by_user(MR_APPROVAL_RULE_EDITED_USERS_ACTION, user)
+        end
+
+        def track_approval_rule_deleted_action(user:)
+          track_unique_action_by_user(MR_APPROVAL_RULE_DELETED_USERS_ACTION, user)
+        end
+
+        def track_task_item_status_changed(user:)
+          track_unique_action_by_user(MR_TASK_ITEM_STATUS_CHANGED_ACTION, user)
+        end
+
+        def track_mr_create_from_issue(user:)
+          track_unique_action_by_user(MR_CREATE_FROM_ISSUE_ACTION, user)
+        end
+
         private
 
         def track_unique_action_by_merge_request(action, merge_request)
@@ -80,6 +165,12 @@ module Gitlab
           track_unique_action(action, user.id)
         end
 
+        def track_unique_action_by_users(action, users)
+          return if users.blank?
+
+          track_unique_action(action, users.map(&:id))
+        end
+
         def track_unique_action(action, value)
           Gitlab::UsageDataCounters::HLLRedisCounter.track_usage_event(action, value)
         end