Merge branch '333117-migrate-quickactions-events-redishll' into 'master'

Add instrumentation_class to quickactions event metrics See merge request gitlab-org/gitlab!67716

Merge branch '333117-migrate-quickactions-events-redishll' into 'master'
Add instrumentation_class to quickactions event metrics See merge request gitlab-org/gitlab!67716
4288ff72 · Alper Akgun · ed394300 · 12c99ada · 4288ff72 · 4288ff72
Commit 4288ff72 authored Aug 12, 2021 by Alper Akgun
140 changed files
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -11,6 +11,10 @@ status: data_available
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_approve
+instrumentation_class: RedisHLLMetric
 options:
  events:
    - i_quickactions_approve

--- a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
+++ b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_single
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
+++ b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_self
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_reviewer
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
+++ b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_award
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_board_move
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_clone
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
+++ b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_close
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_confidential
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_copy_metadata_merge_request
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_copy_metadata_issue
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_create_merge_request
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
+++ b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_done
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_draft
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
+++ b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_due
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_duplicate
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_estimate
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
+++ b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_label
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_lock
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
+++ b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_merge
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_milestone
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_move
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
+++ b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_reassign
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_reassign_reviewer
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
+++ b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_rebase
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
+++ b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_relabel
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_relate
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
+++ b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_due_date
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_estimate
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_milestone
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
+++ b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_time_spent
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_zoom
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
+++ b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_reopen
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
+++ b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_shrug
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
+++ b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_spend_subtract
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
+++ b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_spend_add
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_submit_review
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_subscribe
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_tableflip
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
+++ b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_tag
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
+++ b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_target_branch
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_title
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_todo
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unassign_specific
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unassign_all
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unassign_reviewer
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unlabel_specific
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unlabel_all
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unlock
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unsubscribe
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_wip
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_zoom
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
@@ -10,6 +10,77 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_approve
+    - i_quickactions_assign_single
+    - i_quickactions_assign_multiple
+    - i_quickactions_assign_self
+    - i_quickactions_assign_reviewer
+    - i_quickactions_award
+    - i_quickactions_board_move
+    - i_quickactions_child_epic
+    - i_quickactions_clear_weight
+    - i_quickactions_clone
+    - i_quickactions_close
+    - i_quickactions_confidential
+    - i_quickactions_copy_metadata_merge_request
+    - i_quickactions_copy_metadata_issue
+    - i_quickactions_create_merge_request
+    - i_quickactions_done
+    - i_quickactions_draft
+    - i_quickactions_due
+    - i_quickactions_duplicate
+    - i_quickactions_epic
+    - i_quickactions_estimate
+    - i_quickactions_iteration
+    - i_quickactions_label
+    - i_quickactions_lock
+    - i_quickactions_merge
+    - i_quickactions_milestone
+    - i_quickactions_move
+    - i_quickactions_parent_epic
+    - i_quickactions_promote
+    - i_quickactions_publish
+    - i_quickactions_reassign
+    - i_quickactions_reassign_reviewer
+    - i_quickactions_rebase
+    - i_quickactions_relabel
+    - i_quickactions_relate
+    - i_quickactions_remove_child_epic
+    - i_quickactions_remove_due_date
+    - i_quickactions_remove_epic
+    - i_quickactions_remove_estimate
+    - i_quickactions_remove_iteration
+    - i_quickactions_remove_milestone
+    - i_quickactions_remove_parent_epic
+    - i_quickactions_remove_time_spent
+    - i_quickactions_remove_zoom
+    - i_quickactions_reopen
+    - i_quickactions_severity
+    - i_quickactions_shrug
+    - i_quickactions_spend_subtract
+    - i_quickactions_spend_add
+    - i_quickactions_submit_review
+    - i_quickactions_subscribe
+    - i_quickactions_tableflip
+    - i_quickactions_tag
+    - i_quickactions_target_branch
+    - i_quickactions_title
+    - i_quickactions_todo
+    - i_quickactions_unassign_specific
+    - i_quickactions_unassign_all
+    - i_quickactions_unassign_reviewer
+    - i_quickactions_unlabel_specific
+    - i_quickactions_unlabel_all
+    - i_quickactions_unlock
+    - i_quickactions_unsubscribe
+    - i_quickactions_weight
+    - i_quickactions_wip
+    - i_quickactions_zoom
+    - i_quickactions_invite_email_single
+    - i_quickactions_invite_email_multiple
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
+++ b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_invite_email_single
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
+++ b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_invite_email_multiple
 distribution:
 - ce
 tier:

--- a/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
+++ b/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
@@ -11,6 +11,10 @@ milestone: "14.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66422
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_severity
 data_category: Optional
 distribution:
 - ce

--- a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
+++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
@@ -11,6 +11,10 @@ status: data_available
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_approve
+instrumentation_class: RedisHLLMetric
 options:
  events:
    - i_quickactions_approve

--- a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
+++ b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_single
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
+++ b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_self
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_reviewer
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
+++ b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_award
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_board_move
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_clone
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
+++ b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_close
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_confidential
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_copy_metadata_merge_request
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_copy_metadata_issue
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_create_merge_request
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
+++ b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_done
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_draft
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
+++ b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_due
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_duplicate
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_estimate
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
+++ b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_label
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_lock
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
+++ b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_merge
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_milestone
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_move
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
+++ b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_reassign
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_reassign_reviewer
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
+++ b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_rebase
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
+++ b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_relabel
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_relate
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
+++ b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_due_date
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_estimate
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_milestone
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
+++ b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_time_spent
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_zoom
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
+++ b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_reopen
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
+++ b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_shrug
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
+++ b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_spend_subtract
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
+++ b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_spend_add
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_submit_review
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_subscribe
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_tableflip
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
+++ b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_tag
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
+++ b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_target_branch
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_title
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_todo
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unassign_specific
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unassign_all
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unassign_reviewer
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unlabel_specific
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unlabel_all
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unlock
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unsubscribe
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_wip
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_zoom
 distribution:
 - ce
 - ee 

--- a/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
+++ b/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_invite_email_single
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
+++ b/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_invite_email_multiple
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
+++ b/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
@@ -11,6 +11,10 @@ milestone: "14.2"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66422
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_severity
 data_category: Optional
 distribution:
 - ce

--- a/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_multiple
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_child_epic
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_clear_weight
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_epic
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_iteration
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_parent_epic
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_promote
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_publish
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_child_epic
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_epic
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_iteration
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_parent_epic
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_weight
 distribution:
 - ee
 tier: 

--- a/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_multiple
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_child_epic
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_clear_weight
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_epic
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_iteration
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_parent_epic
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_promote
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_publish
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_child_epic
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_epic
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_iteration
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_parent_epic
 distribution:
 - ee
 tier:

--- a/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_weight
 distribution:
 - ee
 tier: 

--- a/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
@@ -10,6 +10,77 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_approve
+    - i_quickactions_assign_single
+    - i_quickactions_assign_multiple
+    - i_quickactions_assign_self
+    - i_quickactions_assign_reviewer
+    - i_quickactions_award
+    - i_quickactions_board_move
+    - i_quickactions_child_epic
+    - i_quickactions_clear_weight
+    - i_quickactions_clone
+    - i_quickactions_close
+    - i_quickactions_confidential
+    - i_quickactions_copy_metadata_merge_request
+    - i_quickactions_copy_metadata_issue
+    - i_quickactions_create_merge_request
+    - i_quickactions_done
+    - i_quickactions_draft
+    - i_quickactions_due
+    - i_quickactions_duplicate
+    - i_quickactions_epic
+    - i_quickactions_estimate
+    - i_quickactions_iteration
+    - i_quickactions_label
+    - i_quickactions_lock
+    - i_quickactions_merge
+    - i_quickactions_milestone
+    - i_quickactions_move
+    - i_quickactions_parent_epic
+    - i_quickactions_promote
+    - i_quickactions_publish
+    - i_quickactions_reassign
+    - i_quickactions_reassign_reviewer
+    - i_quickactions_rebase
+    - i_quickactions_relabel
+    - i_quickactions_relate
+    - i_quickactions_remove_child_epic
+    - i_quickactions_remove_due_date
+    - i_quickactions_remove_epic
+    - i_quickactions_remove_estimate
+    - i_quickactions_remove_iteration
+    - i_quickactions_remove_milestone
+    - i_quickactions_remove_parent_epic
+    - i_quickactions_remove_time_spent
+    - i_quickactions_remove_zoom
+    - i_quickactions_reopen
+    - i_quickactions_severity
+    - i_quickactions_shrug
+    - i_quickactions_spend_subtract
+    - i_quickactions_spend_add
+    - i_quickactions_submit_review
+    - i_quickactions_subscribe
+    - i_quickactions_tableflip
+    - i_quickactions_tag
+    - i_quickactions_target_branch
+    - i_quickactions_title
+    - i_quickactions_todo
+    - i_quickactions_unassign_specific
+    - i_quickactions_unassign_all
+    - i_quickactions_unassign_reviewer
+    - i_quickactions_unlabel_specific
+    - i_quickactions_unlabel_all
+    - i_quickactions_unlock
+    - i_quickactions_unsubscribe
+    - i_quickactions_weight
+    - i_quickactions_wip
+    - i_quickactions_zoom
+    - i_quickactions_invite_email_single
+    - i_quickactions_invite_email_multiple
 distribution:
 - ee
 tier: []

--- a/ee/spec/lib/gitlab/usage_data_metrics_spec.rb
+++ b/ee/spec/lib/gitlab/usage_data_metrics_spec.rb
@@ -96,6 +96,25 @@ RSpec.describe Gitlab::UsageDataMetrics do
          :testing_total_unique_counts_weekly
        )
      end
+
+      it 'includes quickactions monthly and weekly keys' do
+        expect(subject[:redis_hll_counters][:quickactions].keys).to include(
+          :i_quickactions_assign_multiple_monthly, :i_quickactions_assign_multiple_weekly,
+          :i_quickactions_child_epic_monthly, :i_quickactions_child_epic_weekly,
+          :i_quickactions_clear_weight_monthly, :i_quickactions_clear_weight_weekly,
+          :i_quickactions_epic_monthly, :i_quickactions_epic_weekly,
+          :i_quickactions_iteration_monthly, :i_quickactions_iteration_weekly,
+          :i_quickactions_parent_epic_monthly, :i_quickactions_parent_epic_weekly,
+          :i_quickactions_promote_monthly, :i_quickactions_promote_weekly,
+          :i_quickactions_publish_monthly, :i_quickactions_publish_weekly,
+          :i_quickactions_remove_child_epic_monthly, :i_quickactions_remove_child_epic_weekly,
+          :i_quickactions_remove_epic_monthly, :i_quickactions_remove_epic_weekly,
+          :i_quickactions_remove_iteration_monthly, :i_quickactions_remove_iteration_weekly,
+          :i_quickactions_remove_parent_epic_monthly, :i_quickactions_remove_parent_epic_weekly,
+          :i_quickactions_weight_monthly, :i_quickactions_weight_weekly,
+          :quickactions_total_unique_counts_weekly
+        )
+      end
    end
  end
 end
--- a/spec/lib/gitlab/usage_data_metrics_spec.rb
+++ b/spec/lib/gitlab/usage_data_metrics_spec.rb
@@ -26,130 +26,54 @@ RSpec.describe Gitlab::UsageDataMetrics do
        expect(subject[:counts]).to include(:boards)
      end

-      it 'includes i_quickactions_approve monthly and weekly key' do
-        expect(subject[:redis_hll_counters][:quickactions]).to include(:i_quickactions_approve_monthly)
-        expect(subject[:redis_hll_counters][:quickactions]).to include(:i_quickactions_approve_weekly)
+      describe 'Redis_HLL_counters' do
+        # categories to be merged on future MR
+        let(:ignored_metric_files_key_patterns) do
+          %w(
+            analytics
+            ci_templates
+            ecosystem
+            deploy_token_packages
+            user_packages
+            epic_events
+            snippets
+            epics_usage
+            network_policies
+          ).freeze
+        end
+
+        let(:metric_files_key_paths) do
+          Gitlab::Usage::MetricDefinition
+            .definitions
+            .select { |k, v| v.attributes[:data_source] == 'redis_hll' && v.key_path.starts_with?('redis_hll_counters') }
+            .reject { |k, v| v.key_path =~ Regexp.union(ignored_metric_files_key_patterns) }
+            .keys
+            .sort
+        end
+
+        # Recursively traverse nested Hash of a generated Usage Ping to return an Array of key paths
+        # in the dotted format used in metric definition YAML files, e.g.: 'count.category.metric_name'
+        def parse_service_ping_keys(object, key_path = [])
+          if object.is_a?(Hash)
+            object.each_with_object([]) do |(key, value), result|
+              result.append parse_service_ping_keys(value, key_path + [key])
+            end
+          else
+            key_path.join('.')
+          end
+        end
+
+        let(:usage_ping_key_paths) do
+          parse_service_ping_keys(subject)
+            .flatten
+            .select { |k| k.starts_with?('redis_hll_counters') }
+            .reject {|k| k =~ Regexp.union(ignored_metric_files_key_patterns) }
+            .sort
+        end
+
+        it 'is included in the Usage Ping hash structure' do
+          expect(metric_files_key_paths).to match_array(usage_ping_key_paths)
        end
-
-      it 'includes ide_edit monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:ide_edit].keys).to contain_exactly(*[
-          :g_edit_by_web_ide_monthly, :g_edit_by_web_ide_weekly,
-          :g_edit_by_sfe_monthly, :g_edit_by_sfe_weekly,
-          :g_edit_by_sse_monthly, :g_edit_by_sse_weekly,
-          :g_edit_by_snippet_ide_monthly, :g_edit_by_snippet_ide_weekly,
-          :ide_edit_total_unique_counts_monthly, :ide_edit_total_unique_counts_weekly
-        ])
-      end
-
-      it 'includes incident_management_alerts monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:incident_management_alerts].keys).to contain_exactly(*[
-          :incident_management_alert_create_incident_monthly, :incident_management_alert_create_incident_weekly
-      ])
-      end
-
-      it 'includes incident_management monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:incident_management]).to include(
-          :incident_management_incident_created_monthly, :incident_management_incident_created_weekly,
-          :incident_management_incident_reopened_monthly, :incident_management_incident_reopened_weekly,
-          :incident_management_incident_closed_monthly, :incident_management_incident_closed_weekly,
-          :incident_management_incident_assigned_monthly, :incident_management_incident_assigned_weekly,
-          :incident_management_incident_todo_monthly, :incident_management_incident_todo_weekly,
-          :incident_management_incident_comment_monthly, :incident_management_incident_comment_weekly,
-          :incident_management_incident_zoom_meeting_monthly, :incident_management_incident_zoom_meeting_weekly,
-          :incident_management_incident_relate_monthly, :incident_management_incident_relate_weekly,
-          :incident_management_incident_unrelate_monthly, :incident_management_incident_unrelate_weekly,
-          :incident_management_incident_change_confidential_monthly, :incident_management_incident_change_confidential_weekly,
-          :incident_management_alert_status_changed_monthly, :incident_management_alert_status_changed_weekly,
-          :incident_management_alert_assigned_monthly, :incident_management_alert_assigned_weekly,
-          :incident_management_alert_todo_monthly, :incident_management_alert_todo_weekly,
-          :incident_management_total_unique_counts_monthly, :incident_management_total_unique_counts_weekly
-        )
-      end
-
-      it 'includes testing monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:testing]).to include(
-          :i_testing_test_case_parsed_monthly, :i_testing_test_case_parsed_weekly,
-          :users_expanding_testing_code_quality_report_monthly, :users_expanding_testing_code_quality_report_weekly,
-          :users_expanding_testing_accessibility_report_monthly, :users_expanding_testing_accessibility_report_weekly,
-          :i_testing_summary_widget_total_monthly, :i_testing_summary_widget_total_weekly,
-          :testing_total_unique_counts_monthly
-        )
-      end
-
-      it 'includes source_code monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:source_code].keys).to contain_exactly(*[
-          :wiki_action_monthly, :wiki_action_weekly,
-          :design_action_monthly, :design_action_weekly,
-          :project_action_monthly, :project_action_weekly,
-          :git_write_action_monthly, :git_write_action_weekly,
-          :merge_request_action_monthly, :merge_request_action_weekly,
-          :i_source_code_code_intelligence_monthly, :i_source_code_code_intelligence_weekly
-        ])
-      end
-
-      it 'includes code_review monthly and weekly keys' do
-        category = 'code_review'
-        events = Gitlab::UsageDataCounters::HLLRedisCounter.known_events.select { |event| event['category'] == category}.map { |event| event['name'] }
-        known_events_keys = []
-        events.each do |event_name|
-          known_events_keys << "#{event_name}_monthly".to_sym
-          known_events_keys << "#{event_name}_weekly".to_sym
-        end
-        known_events_keys << "#{category}_total_unique_counts_monthly".to_sym
-        known_events_keys << "#{category}_total_unique_counts_weekly".to_sym
-
-        expect(subject[:redis_hll_counters][:code_review].keys).to contain_exactly(*known_events_keys)
-      end
-
-      it 'includes terraform monthly key' do
-        expect(subject[:redis_hll_counters][:terraform].keys).to include(:p_terraform_state_api_unique_users_monthly)
-      end
-
-      it 'includes terraform monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:pipeline_authoring].keys).to contain_exactly(*[
-          :o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly, :o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly,
-          :o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly, :o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly,
-          :pipeline_authoring_total_unique_counts_monthly, :pipeline_authoring_total_unique_counts_weekly
-        ])
-      end
-
-      it 'includes users_expanding_secure_security_report monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:secure].keys).to contain_exactly(*[
-          :users_expanding_secure_security_report_monthly, :users_expanding_secure_security_report_weekly
-        ])
-      end
-
-      it 'includes issues_edit monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:issues_edit].keys).to include(
-          :g_project_management_issue_title_changed_monthly, :g_project_management_issue_title_changed_weekly,
-          :g_project_management_issue_description_changed_monthly, :g_project_management_issue_description_changed_weekly,
-          :g_project_management_issue_assignee_changed_monthly, :g_project_management_issue_assignee_changed_weekly,
-          :g_project_management_issue_made_confidential_monthly, :g_project_management_issue_made_confidential_weekly,
-          :g_project_management_issue_made_visible_monthly, :g_project_management_issue_made_visible_weekly,
-          :g_project_management_issue_created_monthly, :g_project_management_issue_created_weekly,
-          :g_project_management_issue_closed_monthly, :g_project_management_issue_closed_weekly,
-          :g_project_management_issue_reopened_monthly, :g_project_management_issue_reopened_weekly,
-          :g_project_management_issue_label_changed_monthly, :g_project_management_issue_label_changed_weekly,
-          :g_project_management_issue_milestone_changed_monthly, :g_project_management_issue_milestone_changed_weekly,
-          :g_project_management_issue_cross_referenced_monthly, :g_project_management_issue_cross_referenced_weekly,
-          :g_project_management_issue_moved_monthly, :g_project_management_issue_moved_weekly,
-          :g_project_management_issue_related_monthly, :g_project_management_issue_related_weekly,
-          :g_project_management_issue_unrelated_monthly, :g_project_management_issue_unrelated_weekly,
-          :g_project_management_issue_marked_as_duplicate_monthly, :g_project_management_issue_marked_as_duplicate_weekly,
-          :g_project_management_issue_locked_monthly, :g_project_management_issue_locked_weekly,
-          :g_project_management_issue_unlocked_monthly, :g_project_management_issue_unlocked_weekly,
-          :g_project_management_issue_designs_added_monthly, :g_project_management_issue_designs_added_weekly,
-          :g_project_management_issue_designs_modified_monthly, :g_project_management_issue_designs_modified_weekly,
-          :g_project_management_issue_designs_removed_monthly, :g_project_management_issue_designs_removed_weekly,
-          :g_project_management_issue_due_date_changed_monthly, :g_project_management_issue_due_date_changed_weekly,
-          :g_project_management_issue_time_estimate_changed_monthly, :g_project_management_issue_time_estimate_changed_weekly,
-          :g_project_management_issue_time_spent_changed_monthly, :g_project_management_issue_time_spent_changed_weekly,
-          :g_project_management_issue_comment_added_monthly, :g_project_management_issue_comment_added_weekly,
-          :g_project_management_issue_comment_edited_monthly, :g_project_management_issue_comment_edited_weekly,
-          :g_project_management_issue_comment_removed_monthly, :g_project_management_issue_comment_removed_weekly,
-          :g_project_management_issue_cloned_monthly, :g_project_management_issue_cloned_weekly,
-          :issues_edit_total_unique_counts_monthly, :issues_edit_total_unique_counts_weekly
-        )
      end

      it 'includes counts keys' do