Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

12 files changed, 137 insertions, 125 deletions

diff --git a/lib/gitlab/usage_data_counters/base_counter.rb b/lib/gitlab/usage_data_counters/base_counter.rb
index 4ab310a2519..5d2ab5eaf74 100644
--- a/lib/gitlab/usage_data_counters/base_counter.rb
+++ b/lib/gitlab/usage_data_counters/base_counter.rb
@@ -10,7 +10,9 @@ module Gitlab::UsageDataCounters
       def redis_key(event)
         require_known_event(event)
 
-        "USAGE_#{prefix}_#{event}".upcase
+        usage_prefix = Gitlab::Usage::Metrics::Instrumentations::RedisMetric::USAGE_PREFIX
+
+        "#{usage_prefix}#{prefix}_#{event}".upcase
       end
 
       def count(event)
diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
index a5db8ba4dcc..f0cb9bcbe94 100644
--- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb
+++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
@@ -20,11 +20,7 @@ module Gitlab
 
       CATEGORIES_FOR_TOTALS = %w[
         analytics
-        code_review
         compliance
-        deploy_token_packages
-        ecosystem
-        epic_boards_usage
         epics_usage
         error_tracking
         ide_edit
@@ -32,11 +28,13 @@ module Gitlab
         issues_edit
         pipeline_authoring
         quickactions
-        user_packages
       ].freeze
 
       CATEGORIES_COLLECTED_FROM_METRICS_DEFINITIONS = %w[
         ci_users
+        deploy_token_packages
+        code_review
+        ecosystem
         error_tracking
         ide_edit
         importer
@@ -49,6 +47,7 @@ module Gitlab
         source_code
         terraform
         testing
+        user_packages
         work_items
       ].freeze
 
diff --git a/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
index 316d9bb3dc1..dda72f7fa3b 100644
--- a/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/issue_activity_unique_counter.rb
@@ -36,95 +36,118 @@ module Gitlab
       ISSUE_COMMENT_REMOVED = 'g_project_management_issue_comment_removed'
 
       class << self
-        def track_issue_created_action(author:)
+        def track_issue_created_action(author:, project:)
+          track_snowplow_action(ISSUE_CREATED, author, project)
           track_unique_action(ISSUE_CREATED, author)
         end
 
-        def track_issue_title_changed_action(author:)
+        def track_issue_title_changed_action(author:, project:)
+          track_snowplow_action(ISSUE_TITLE_CHANGED, author, project)
           track_unique_action(ISSUE_TITLE_CHANGED, author)
         end
 
-        def track_issue_description_changed_action(author:)
+        def track_issue_description_changed_action(author:, project:)
+          track_snowplow_action(ISSUE_DESCRIPTION_CHANGED, author, project)
           track_unique_action(ISSUE_DESCRIPTION_CHANGED, author)
         end
 
-        def track_issue_assignee_changed_action(author:)
+        def track_issue_assignee_changed_action(author:, project:)
+          track_snowplow_action(ISSUE_ASSIGNEE_CHANGED, author, project)
           track_unique_action(ISSUE_ASSIGNEE_CHANGED, author)
         end
 
-        def track_issue_made_confidential_action(author:)
+        def track_issue_made_confidential_action(author:, project:)
+          track_snowplow_action(ISSUE_MADE_CONFIDENTIAL, author, project)
           track_unique_action(ISSUE_MADE_CONFIDENTIAL, author)
         end
 
-        def track_issue_made_visible_action(author:)
+        def track_issue_made_visible_action(author:, project:)
+          track_snowplow_action(ISSUE_MADE_VISIBLE, author, project)
           track_unique_action(ISSUE_MADE_VISIBLE, author)
         end
 
-        def track_issue_closed_action(author:)
+        def track_issue_closed_action(author:, project:)
+          track_snowplow_action(ISSUE_CLOSED, author, project)
           track_unique_action(ISSUE_CLOSED, author)
         end
 
-        def track_issue_reopened_action(author:)
+        def track_issue_reopened_action(author:, project:)
+          track_snowplow_action(ISSUE_REOPENED, author, project)
           track_unique_action(ISSUE_REOPENED, author)
         end
 
-        def track_issue_label_changed_action(author:)
+        def track_issue_label_changed_action(author:, project:)
+          track_snowplow_action(ISSUE_LABEL_CHANGED, author, project)
           track_unique_action(ISSUE_LABEL_CHANGED, author)
         end
 
-        def track_issue_milestone_changed_action(author:)
+        def track_issue_milestone_changed_action(author:, project:)
+          track_snowplow_action(ISSUE_MILESTONE_CHANGED, author, project)
           track_unique_action(ISSUE_MILESTONE_CHANGED, author)
         end
 
-        def track_issue_cross_referenced_action(author:)
+        def track_issue_cross_referenced_action(author:, project:)
+          track_snowplow_action(ISSUE_CROSS_REFERENCED, author, project)
           track_unique_action(ISSUE_CROSS_REFERENCED, author)
         end
 
-        def track_issue_moved_action(author:)
+        def track_issue_moved_action(author:, project:)
+          track_snowplow_action(ISSUE_MOVED, author, project)
           track_unique_action(ISSUE_MOVED, author)
         end
 
-        def track_issue_related_action(author:)
+        def track_issue_related_action(author:, project:)
+          track_snowplow_action(ISSUE_RELATED, author, project)
           track_unique_action(ISSUE_RELATED, author)
         end
 
-        def track_issue_unrelated_action(author:)
+        def track_issue_unrelated_action(author:, project:)
+          track_snowplow_action(ISSUE_UNRELATED, author, project)
           track_unique_action(ISSUE_UNRELATED, author)
         end
 
-        def track_issue_marked_as_duplicate_action(author:)
+        def track_issue_marked_as_duplicate_action(author:, project:)
+          track_snowplow_action(ISSUE_MARKED_AS_DUPLICATE, author, project)
           track_unique_action(ISSUE_MARKED_AS_DUPLICATE, author)
         end
 
-        def track_issue_locked_action(author:)
+        def track_issue_locked_action(author:, project:)
+          track_snowplow_action(ISSUE_LOCKED, author, project)
           track_unique_action(ISSUE_LOCKED, author)
         end
 
-        def track_issue_unlocked_action(author:)
+        def track_issue_unlocked_action(author:, project:)
+          track_snowplow_action(ISSUE_UNLOCKED, author, project)
           track_unique_action(ISSUE_UNLOCKED, author)
         end
 
-        def track_issue_designs_added_action(author:)
+        def track_issue_designs_added_action(author:, project:)
+          track_snowplow_action(ISSUE_DESIGNS_ADDED, author, project)
           track_unique_action(ISSUE_DESIGNS_ADDED, author)
         end
 
-        def track_issue_designs_modified_action(author:)
+        def track_issue_designs_modified_action(author:, project:)
+          track_snowplow_action(ISSUE_DESIGNS_MODIFIED, author, project)
           track_unique_action(ISSUE_DESIGNS_MODIFIED, author)
         end
 
-        def track_issue_designs_removed_action(author:)
+        def track_issue_designs_removed_action(author:, project:)
+          track_snowplow_action(ISSUE_DESIGNS_REMOVED, author, project)
           track_unique_action(ISSUE_DESIGNS_REMOVED, author)
         end
 
-        def track_issue_due_date_changed_action(author:)
+        def track_issue_due_date_changed_action(author:, project:)
+          track_snowplow_action(ISSUE_DUE_DATE_CHANGED, author, project)
           track_unique_action(ISSUE_DUE_DATE_CHANGED, author)
         end
 
-        def track_issue_time_estimate_changed_action(author:)
+        def track_issue_time_estimate_changed_action(author:, project:)
+          track_snowplow_action(ISSUE_TIME_ESTIMATE_CHANGED, author, project)
           track_unique_action(ISSUE_TIME_ESTIMATE_CHANGED, author)
         end
 
-        def track_issue_time_spent_changed_action(author:)
+        def track_issue_time_spent_changed_action(author:, project:)
+          track_snowplow_action(ISSUE_TIME_SPENT_CHANGED, author, project)
           track_unique_action(ISSUE_TIME_SPENT_CHANGED, author)
         end
 
diff --git a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
index a8f1bab1f20..10e36a75a3a 100644
--- a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
@@ -139,6 +139,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_security_container_scanning_latest
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_security_api_fuzzing
   category: ci_templates
   redis_slot: ci_templates
@@ -231,6 +235,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_katalon
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_mono
   category: ci_templates
   redis_slot: ci_templates
@@ -319,6 +327,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_jobs_license_scanning_latest
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_jobs_deploy
   category: ci_templates
   redis_slot: ci_templates
@@ -331,6 +343,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_jobs_dependency_scanning_latest
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_jobs_test
   category: ci_templates
   redis_slot: ci_templates
@@ -523,6 +539,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_implicit_jobs_license_scanning_latest
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_implicit_jobs_deploy
   category: ci_templates
   redis_slot: ci_templates
@@ -535,6 +555,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_implicit_jobs_dependency_scanning_latest
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_implicit_jobs_test
   category: ci_templates
   redis_slot: ci_templates
@@ -635,6 +659,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_implicit_security_container_scanning_latest
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_implicit_security_api_fuzzing
   category: ci_templates
   redis_slot: ci_templates
diff --git a/lib/gitlab/usage_data_counters/known_events/code_review_events.yml b/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
index c21b99ba834..0bd809f8aa5 100644
--- a/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
@@ -1,9 +1,29 @@
 ---
-- name: i_code_review_mr_diffs
+- name: i_code_review_create_note_in_ipynb_diff
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_create_note_in_ipynb_diff_mr
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_create_note_in_ipynb_diff_commit
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_user_create_note_in_ipynb_diff
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_user_create_note_in_ipynb_diff_mr
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_user_create_note_in_ipynb_diff_commit
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-- name: i_code_review_mr_with_invalid_approvers
+- name: i_code_review_mr_diffs
   redis_slot: code_review
   category: code_review
   aggregation: weekly
@@ -135,12 +155,10 @@
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_jetbrains_api_request
 - name: i_code_review_user_gitlab_cli_api_request
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_i_code_review_user_gitlab_cli_api_request
 - name: i_code_review_user_create_mr_from_issue
   redis_slot: code_review
   category: code_review
@@ -177,30 +195,6 @@
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-- name: i_code_review_create_note_in_ipynb_diff
-  redis_slot: code_review
-  category: code_review
-  aggregation: weekly
-- name: i_code_review_user_create_note_in_ipynb_diff
-  redis_slot: code_review
-  category: code_review
-  aggregation: weekly
-- name: i_code_review_create_note_in_ipynb_diff_mr
-  redis_slot: code_review
-  category: code_review
-  aggregation: weekly
-- name: i_code_review_user_create_note_in_ipynb_diff_mr
-  redis_slot: code_review
-  category: code_review
-  aggregation: weekly
-- name: i_code_review_create_note_in_ipynb_diff_commit
-  redis_slot: code_review
-  category: code_review
-  aggregation: weekly
-- name: i_code_review_user_create_note_in_ipynb_diff_commit
-  redis_slot: code_review
-  category: code_review
-  aggregation: weekly
 # Diff settings events
 - name: i_code_review_click_diff_view_setting
   redis_slot: code_review
@@ -400,53 +394,36 @@
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-## Metrics
-- name: i_code_review_merge_request_widget_metrics_view
-  redis_slot: code_review
-  category: code_review
-  aggregation: weekly
-- name: i_code_review_merge_request_widget_metrics_full_report_clicked
-  redis_slot: code_review
-  category: code_review
-  aggregation: weekly
-- name: i_code_review_merge_request_widget_metrics_expand
-  redis_slot: code_review
-  category: code_review
-  aggregation: weekly
-- name: i_code_review_merge_request_widget_metrics_expand_success
-  redis_slot: code_review
-  category: code_review
-  aggregation: weekly
-- name: i_code_review_merge_request_widget_metrics_expand_warning
+- name: i_code_review_submit_review_approve
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-- name: i_code_review_merge_request_widget_metrics_expand_failed
+- name: i_code_review_submit_review_comment
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-## Status Checks
-- name: i_code_review_merge_request_widget_status_checks_view
+## License Compliance
+- name: i_code_review_merge_request_widget_license_compliance_view
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-- name: i_code_review_merge_request_widget_status_checks_full_report_clicked
+- name: i_code_review_merge_request_widget_license_compliance_full_report_clicked
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-- name: i_code_review_merge_request_widget_status_checks_expand
+- name: i_code_review_merge_request_widget_license_compliance_expand
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-- name: i_code_review_merge_request_widget_status_checks_expand_success
+- name: i_code_review_merge_request_widget_license_compliance_expand_success
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-- name: i_code_review_merge_request_widget_status_checks_expand_warning
+- name: i_code_review_merge_request_widget_license_compliance_expand_warning
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-- name: i_code_review_merge_request_widget_status_checks_expand_failed
+- name: i_code_review_merge_request_widget_license_compliance_expand_failed
   redis_slot: code_review
   category: code_review
   aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml
index 6c4754ae19f..29b231f88f8 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -146,6 +146,11 @@
   category: testing
   redis_slot: testing
   aggregation: weekly
+- name: i_testing_test_report_uploaded
+  category: testing
+  redis_slot: testing
+  aggregation: weekly
+  feature_flag: usage_data_ci_i_testing_test_report_uploaded
 # Project Management group
 - name: g_project_management_issue_title_changed
   category: issues_edit
@@ -332,11 +337,6 @@
   redis_slot: testing
   category: testing
   aggregation: weekly
-# Container Security - Network Policies
-- name: clusters_using_network_policies_ui
-  redis_slot: network_policies
-  category: network_policies
-  aggregation: weekly
 # Geo group
 - name: g_geo_proxied_requests
   category: geo
@@ -352,3 +352,8 @@
   category: manage
   aggregation: weekly
   expiry: 42
+# Environments page
+- name: users_visiting_environments_pages
+  category: environments
+  redis_slot: users
+  aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/ecosystem.yml b/lib/gitlab/usage_data_counters/known_events/ecosystem.yml
index f594c6a1b7c..7f7c9166086 100644
--- a/lib/gitlab/usage_data_counters/known_events/ecosystem.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ecosystem.yml
@@ -8,14 +8,6 @@
   category: ecosystem
   redis_slot: ecosystem
   aggregation: weekly
-- name: i_ecosystem_jira_service_list_issues
-  category: ecosystem
-  redis_slot: ecosystem
-  aggregation: weekly
-- name: i_ecosystem_jira_service_create_issue
-  category: ecosystem
-  redis_slot: ecosystem
-  aggregation: weekly
 - name: i_ecosystem_slack_service_issue_notification
   category: ecosystem
   redis_slot: ecosystem
diff --git a/lib/gitlab/usage_data_counters/known_events/epic_board_events.yml b/lib/gitlab/usage_data_counters/known_events/epic_board_events.yml
deleted file mode 100644
index 3879c561cc4..00000000000
--- a/lib/gitlab/usage_data_counters/known_events/epic_board_events.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Epic board events
-#
-# We are using the same slot of issue events 'project_management' for
-# epic events to allow data aggregation.
-# More information in: https://gitlab.com/gitlab-org/gitlab/-/issues/322405
-- name: g_project_management_users_creating_epic_boards
-  category: epic_boards_usage
-  redis_slot: project_management
-  aggregation: daily
-
-- name: g_project_management_users_viewing_epic_boards
-  category: epic_boards_usage
-  redis_slot: project_management
-  aggregation: daily
-
-- name: g_project_management_users_updating_epic_board_names
-  category: epic_boards_usage
-  redis_slot: project_management
-  aggregation: daily
diff --git a/lib/gitlab/usage_data_counters/known_events/kubernetes_agent.yml b/lib/gitlab/usage_data_counters/known_events/kubernetes_agent.yml
index e1de74a3d07..966e6c584c7 100644
--- a/lib/gitlab/usage_data_counters/known_events/kubernetes_agent.yml
+++ b/lib/gitlab/usage_data_counters/known_events/kubernetes_agent.yml
@@ -2,4 +2,3 @@
   category: kubernetes_agent
   redis_slot: agent
   aggregation: weekly
-  feature_flag: track_agent_users_using_ci_tunnel
diff --git a/lib/gitlab/usage_data_counters/known_events/quickactions.yml b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
index f980503b4bf..58a0c0695af 100644
--- a/lib/gitlab/usage_data_counters/known_events/quickactions.yml
+++ b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
@@ -127,6 +127,10 @@
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
+- name: i_quickactions_timeline
+  category: quickactions
+  redis_slot: quickactions
+  aggregation: weekly
 - name: i_quickactions_page
   category: quickactions
   redis_slot: quickactions
@@ -303,11 +307,3 @@
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
-- name: i_quickactions_attention
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
-- name: i_quickactions_remove_attention
-  category: quickactions
-  redis_slot: quickactions
-  aggregation: weekly
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 fbb03a31a6f..93137b762ec 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
@@ -49,6 +49,8 @@ module Gitlab
       MR_LOAD_CONFLICT_UI_ACTION = 'i_code_review_user_load_conflict_ui'
       MR_RESOLVE_CONFLICT_ACTION = 'i_code_review_user_resolve_conflict'
       MR_RESOLVE_THREAD_IN_ISSUE_ACTION = 'i_code_review_user_resolve_thread_in_issue'
+      MR_SUBMIT_REVIEW_APPROVE = 'i_code_review_submit_review_approve'
+      MR_SUBMIT_REVIEW_COMMENT = 'i_code_review_submit_review_comment'
 
       class << self
         def track_mr_diffs_action(merge_request:)
@@ -230,6 +232,14 @@ module Gitlab
           track_unique_action_by_user(MR_RESOLVE_THREAD_IN_ISSUE_ACTION, user)
         end
 
+        def track_submit_review_approve(user:)
+          track_unique_action_by_user(MR_SUBMIT_REVIEW_APPROVE, user)
+        end
+
+        def track_submit_review_comment(user:)
+          track_unique_action_by_user(MR_SUBMIT_REVIEW_COMMENT, user)
+        end
+
         private
 
         def track_unique_action_by_merge_request(action, merge_request)
diff --git a/lib/gitlab/usage_data_counters/merge_request_widget_extension_counter.rb b/lib/gitlab/usage_data_counters/merge_request_widget_extension_counter.rb
index dafc36ab7ce..f88bbc41c70 100644
--- a/lib/gitlab/usage_data_counters/merge_request_widget_extension_counter.rb
+++ b/lib/gitlab/usage_data_counters/merge_request_widget_extension_counter.rb
@@ -5,7 +5,7 @@ module Gitlab
     class MergeRequestWidgetExtensionCounter < BaseCounter
       KNOWN_EVENTS = %w[view full_report_clicked expand expand_success expand_warning expand_failed].freeze
       PREFIX = 'i_code_review_merge_request_widget'
-      WIDGETS = %w[accessibility code_quality status_checks terraform test_summary metrics].freeze
+      WIDGETS = %w[accessibility code_quality license_compliance status_checks terraform test_summary metrics].freeze
 
       class << self
         private