Add latest changes from gitlab-org/gitlab@master

99 files changed, 40 insertions, 179 deletions

diff --git a/config/feature_flags/development/truncate_ci_merge_request_description.yml b/config/feature_flags/development/truncate_ci_merge_request_description.yml
new file mode 100644
index 00000000000..816632f0da2
--- /dev/null
+++ b/config/feature_flags/development/truncate_ci_merge_request_description.yml
@@ -0,0 +1,8 @@
+---
+name: truncate_ci_merge_request_description
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139605
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435099
+milestone: '16.7'
+type: development
+group: group::pipeline security
+default_enabled: false
\ No newline at end of file
diff --git a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
index 2e01a7cced1..d56be888031 100644
--- a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
+++ b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - i_analytics_dev_ops_score
diff --git a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
index f14964f5b76..2f0438d580a 100644
--- a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - i_code_review_user_create_mr
diff --git a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
index 08ae78ceb3b..cbf0833df00 100644
--- a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_edit_by_web_ide
diff --git a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
index f4212cf9c27..b224962de67 100644
--- a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
+++ b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_edit_by_sfe
diff --git a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
index dc801b5c139..9c165f348ae 100644
--- a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_edit_by_snippet_ide
diff --git a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
index 66ca4a56ef6..58912c1d72a 100644
--- a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_title_changed
diff --git a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
index 394b6264191..fd79979a24e 100644
--- a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_description_changed
diff --git a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
index 97b0022a4f8..1e7b2c5e65b 100644
--- a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_assignee_changed
diff --git a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
index e0e88ba0c13..5beba665e0e 100644
--- a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_made_confidential
diff --git a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
index bcf7829efc9..b20ae68f126 100644
--- a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
+++ b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_made_visible
diff --git a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
index 1171cf48812..0e6f5fb78df 100644
--- a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_created
diff --git a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
index 31c7889f4e0..08ad3d7644d 100644
--- a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_closed
diff --git a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
index f0db7f63c41..5420a9213b1 100644
--- a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_reopened
diff --git a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
index 1498b8bfe36..793e6a71813 100644
--- a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_label_changed
diff --git a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
index fa4b3d5ec13..6b8a1a91fa0 100644
--- a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_milestone_changed
diff --git a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
index 22dff1fb97f..be3c37585b9 100644
--- a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
+++ b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_cross_referenced
diff --git a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
index 64a5362684a..69461d90a88 100644
--- a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
+++ b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_moved
diff --git a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
index aa9cf1b373f..2145cbf1420 100644
--- a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
+++ b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_related
diff --git a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
index 1ade783a86c..4ee4a48be4d 100644
--- a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
+++ b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_unrelated
diff --git a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
index 2f74e5c02b1..04df5221d5e 100644
--- a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_marked_as_duplicate
diff --git a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
index 3052d347ac3..7472ef1fc13 100644
--- a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_locked
diff --git a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
index 6bbd951b728..8c815c0851e 100644
--- a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_unlocked
diff --git a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
index cb7626f3d6a..075f99170d0 100644
--- a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_designs_added
diff --git a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
index ac5aeca179b..7b5166fe177 100644
--- a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
+++ b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_designs_modified
diff --git a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
index a3c1c8659e7..ac8ae1696e6 100644
--- a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_designs_removed
diff --git a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
index 7215fe72399..3719726cfd8 100644
--- a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_due_date_changed
diff --git a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
index 59f7cf04dc2..7cba6c77a2b 100644
--- a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_time_estimate_changed
diff --git a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
index e83f0c531bf..587b1f58bcb 100644
--- a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_time_spent_changed
diff --git a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
index 9bc1680c659..eae1ca2225e 100644
--- a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_comment_added
diff --git a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
index 1883c7e8c86..2c5338173ac 100644
--- a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_comment_edited
diff --git a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
index ccc547dfe70..2fafdf51764 100644
--- a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_comment_removed
diff --git a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
index bcacebdc77f..9ebe2a6f117 100644
--- a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
+++ b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_cloned
diff --git a/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
index 76faa236247..ce90456d60e 100644
--- a/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 events:
   - name: p_analytics_ci_cd_pipelines
diff --git a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
index 12a7b7c1503..b245b964051 100644
--- a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
+++ b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 28d
 data_source: internal_events
 data_category: operational
-instrumentation_class: RedisHLLMetric
 performance_indicator_type:
 - customer_health_score
 events:
diff --git a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
index ee6a2d72058..538f73ae4c4 100644
--- a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
+++ b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 28d
 data_source: internal_events
 data_category: operational
-instrumentation_class: RedisHLLMetric
 performance_indicator_type:
 - customer_health_score
 events:
diff --git a/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml b/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
index c1506710e62..a87de425c4e 100644
--- a/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
+++ b/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108307
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 options:
   events:
diff --git a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_ci_access_monthly.yml b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_ci_access_monthly.yml
index 177bfdd75a7..3c21dc37144 100644
--- a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_ci_access_monthly.yml
+++ b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_ci_access_monthly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124147
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 options:
   events:
     - k8s_api_proxy_requests_unique_users_via_ci_access
diff --git a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_monthly.yml b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_monthly.yml
index bcda6d21dcf..2b93e4dc248 100644
--- a/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_monthly.yml
+++ b/config/metrics/counts_28d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_monthly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124147
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 options:
   events:
     - k8s_api_proxy_requests_unique_users_via_user_access
diff --git a/config/metrics/counts_28d/20230724140653_i_code_review_saved_replies_create_monthly.yml b/config/metrics/counts_28d/20230724140653_i_code_review_saved_replies_create_monthly.yml
index 2728c2b28ee..d523bd9a43a 100644
--- a/config/metrics/counts_28d/20230724140653_i_code_review_saved_replies_create_monthly.yml
+++ b/config/metrics/counts_28d/20230724140653_i_code_review_saved_replies_create_monthly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126884
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20230725194658_i_code_review_saved_replies_use_monthly.yml b/config/metrics/counts_28d/20230725194658_i_code_review_saved_replies_use_monthly.yml
index 1be1b6f2c80..d4ec580116a 100644
--- a/config/metrics/counts_28d/20230725194658_i_code_review_saved_replies_use_monthly.yml
+++ b/config/metrics/counts_28d/20230725194658_i_code_review_saved_replies_use_monthly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127442
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20230809194743_i_code_review_saved_replies_use_in_mr_monthly.yml b/config/metrics/counts_28d/20230809194743_i_code_review_saved_replies_use_in_mr_monthly.yml
index 41274753ae8..b79068c92f4 100644
--- a/config/metrics/counts_28d/20230809194743_i_code_review_saved_replies_use_in_mr_monthly.yml
+++ b/config/metrics/counts_28d/20230809194743_i_code_review_saved_replies_use_in_mr_monthly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128821
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20230815171559_i_code_review_saved_replies_use_in_other_monthly.yml b/config/metrics/counts_28d/20230815171559_i_code_review_saved_replies_use_in_other_monthly.yml
index a604a4f1955..7ba8a34253a 100644
--- a/config/metrics/counts_28d/20230815171559_i_code_review_saved_replies_use_in_other_monthly.yml
+++ b/config/metrics/counts_28d/20230815171559_i_code_review_saved_replies_use_in_other_monthly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128822
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_monthly.yml b/config/metrics/counts_28d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_monthly.yml
index faee9fee9e8..c6fb6c75b64 100644
--- a/config/metrics/counts_28d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_monthly.yml
+++ b/config/metrics/counts_28d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_monthly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129463
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 options:
   events:
     - k8s_api_proxy_requests_unique_users_via_pat_access
diff --git a/config/metrics/counts_28d/count_distinct_project_id_from_ci_template_included_28d.yml b/config/metrics/counts_28d/count_distinct_project_id_from_ci_template_included_28d.yml
index 6050662f99c..350ccd5f348 100644
--- a/config/metrics/counts_28d/count_distinct_project_id_from_ci_template_included_28d.yml
+++ b/config/metrics/counts_28d/count_distinct_project_id_from_ci_template_included_28d.yml
@@ -12,7 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132819
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_28d.yml b/config/metrics/counts_28d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_28d.yml
index 45e3b6fdb8c..506ea07c7c7 100644
--- a/config/metrics/counts_28d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_28d.yml
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_28d.yml
@@ -12,7 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137564
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/count_total_code_suggestions_authenticate_28d.yml b/config/metrics/counts_28d/count_total_code_suggestions_authenticate_28d.yml
index 3688d770c53..e16fdef1e6f 100644
--- a/config/metrics/counts_28d/count_total_code_suggestions_authenticate_28d.yml
+++ b/config/metrics/counts_28d/count_total_code_suggestions_authenticate_28d.yml
@@ -12,7 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138848
 time_frame: 28d
 data_source: internal_events
 data_category: optional
-instrumentation_class: TotalCountMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
index 0a02bafbcf8..c956b597606 100644
--- a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -11,7 +11,6 @@ milestone: "13.6"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_title_changed
diff --git a/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
index e8356d5395b..ec22a97b025 100644
--- a/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
+++ b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - i_analytics_dev_ops_score
diff --git a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
index 71a0be2fe13..953f35c14f3 100644
--- a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - i_code_review_user_create_mr
diff --git a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
index 67c06a60d17..a9cd4e5318a 100644
--- a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_edit_by_web_ide
diff --git a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
index 18d2f77b2a4..feb39509973 100644
--- a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
+++ b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_edit_by_sfe
diff --git a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
index faaf35cd648..d84a80be1c6 100644
--- a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_edit_by_snippet_ide
diff --git a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
index e8122d51032..3e9f34edca3 100644
--- a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_description_changed
diff --git a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
index a77403bc36c..3882e44df20 100644
--- a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_assignee_changed
diff --git a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
index bae0105a84b..1f52751bfb7 100644
--- a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_made_confidential
diff --git a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
index ea60d6448ad..2744b7606f6 100644
--- a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
+++ b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_made_visible
diff --git a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
index 97c32f8f7ae..ab31bf2ffce 100644
--- a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_created
diff --git a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
index ef4de1fecbc..c0c287a4ed9 100644
--- a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_closed
diff --git a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
index 88c4b06a85c..862572f5df0 100644
--- a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_reopened
diff --git a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
index 7e6fbf1100d..8263186dc9d 100644
--- a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_label_changed
diff --git a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
index 2f22e39d755..3bbe2f09739 100644
--- a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_milestone_changed
diff --git a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
index 3a30243e957..fbbcb98fb2c 100644
--- a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
+++ b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_cross_referenced
diff --git a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
index 0c1d763602a..b306fb7b918 100644
--- a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
+++ b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_moved
diff --git a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
index 968fec1bcb6..f7ef09248a5 100644
--- a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
+++ b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_related
diff --git a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
index 35ef8eeaded..d1c1a641dcc 100644
--- a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
+++ b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_unrelated
diff --git a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
index 9f0bec1398c..314287dcec7 100644
--- a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_marked_as_duplicate
diff --git a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
index 20d04fa08ac..c526b1832b6 100644
--- a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_locked
diff --git a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
index e76cd94222f..eeb2f0f82c3 100644
--- a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_unlocked
diff --git a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
index d283b0e2356..ca03adbb81d 100644
--- a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_designs_added
diff --git a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
index f1a8f436bbf..b463794db4b 100644
--- a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
+++ b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_designs_modified
diff --git a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
index 43ecbbfd127..80ef0b6b93e 100644
--- a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_designs_removed
diff --git a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
index b2b92df10fb..7651406f9ed 100644
--- a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_due_date_changed
diff --git a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
index aab69e960d0..222df5f22ed 100644
--- a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_time_estimate_changed
diff --git a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
index 7cb085d24b4..f9624fa3ae5 100644
--- a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_time_spent_changed
diff --git a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
index fb7ac35af79..34bd0ce8bd3 100644
--- a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_comment_added
diff --git a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
index 7e18898086e..6b92e88144f 100644
--- a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_comment_edited
diff --git a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
index 6fb3f52f47e..fab024466b8 100644
--- a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_comment_removed
diff --git a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
index 545d66aec4f..83d2e618c2d 100644
--- a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
+++ b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
@@ -9,7 +9,6 @@ value_type: number
 status: active
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - g_project_management_issue_cloned
diff --git a/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
index 9b7efed1b2b..ef70bf573e9 100644
--- a/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
+++ b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
@@ -10,7 +10,6 @@ status: active
 milestone: "13.11"
 time_frame: 7d
 data_source: internal_events
-instrumentation_class: RedisHLLMetric
 options:
   events:
   - i_analytics_dev_ops_adoption
diff --git a/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
index bb0e42314e6..507e0819c5f 100644
--- a/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 events:
   - name: p_analytics_ci_cd_pipelines
diff --git a/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
index 6f89676da0c..511d2f9ca2b 100644
--- a/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
+++ b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 events:
   - name: p_analytics_ci_cd_deployment_frequency
diff --git a/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
index 1fa1a07d7bb..1fee82190a2 100644
--- a/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
+++ b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 events:
   - name: p_analytics_ci_cd_lead_time
diff --git a/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml b/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
index 3466b0a7f50..e0de5e7d2e6 100644
--- a/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
+++ b/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108307
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 options:
   events:
diff --git a/config/metrics/counts_7d/20230620070722_k8s_api_proxy_requests_unique_users_via_ci_access_weekly.yml b/config/metrics/counts_7d/20230620070722_k8s_api_proxy_requests_unique_users_via_ci_access_weekly.yml
index 52e486e551c..7345d209e88 100644
--- a/config/metrics/counts_7d/20230620070722_k8s_api_proxy_requests_unique_users_via_ci_access_weekly.yml
+++ b/config/metrics/counts_7d/20230620070722_k8s_api_proxy_requests_unique_users_via_ci_access_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124147
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 options:
   events:
     - k8s_api_proxy_requests_unique_users_via_ci_access
diff --git a/config/metrics/counts_7d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_weekly.yml b/config/metrics/counts_7d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_weekly.yml
index 9a60fe9f54d..2ff0bceef50 100644
--- a/config/metrics/counts_7d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_weekly.yml
+++ b/config/metrics/counts_7d/20230620070723_k8s_api_proxy_requests_unique_users_via_user_access_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124147
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 options:
   events:
     - k8s_api_proxy_requests_unique_users_via_user_access
diff --git a/config/metrics/counts_7d/20230724140652_i_code_review_saved_replies_create_weekly.yml b/config/metrics/counts_7d/20230724140652_i_code_review_saved_replies_create_weekly.yml
index 29d097fa59e..42c90f75357 100644
--- a/config/metrics/counts_7d/20230724140652_i_code_review_saved_replies_create_weekly.yml
+++ b/config/metrics/counts_7d/20230724140652_i_code_review_saved_replies_create_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126884
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20230725194657_i_code_review_saved_replies_use_weekly.yml b/config/metrics/counts_7d/20230725194657_i_code_review_saved_replies_use_weekly.yml
index 162b26d7b9d..d910be7ffc3 100644
--- a/config/metrics/counts_7d/20230725194657_i_code_review_saved_replies_use_weekly.yml
+++ b/config/metrics/counts_7d/20230725194657_i_code_review_saved_replies_use_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127442
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml b/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml
index ea6af631c9f..1ba00ce2a68 100644
--- a/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml
+++ b/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128821
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20230815171559_i_code_review_saved_replies_use_in_other_weekly.yml b/config/metrics/counts_7d/20230815171559_i_code_review_saved_replies_use_in_other_weekly.yml
index d913cbd7fc7..1725e2c7480 100644
--- a/config/metrics/counts_7d/20230815171559_i_code_review_saved_replies_use_in_other_weekly.yml
+++ b/config/metrics/counts_7d/20230815171559_i_code_review_saved_replies_use_in_other_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128822
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_weekly.yml b/config/metrics/counts_7d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_weekly.yml
index 96a07104165..8048a66f411 100644
--- a/config/metrics/counts_7d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_weekly.yml
+++ b/config/metrics/counts_7d/20230816085153_k8s_api_proxy_requests_unique_users_via_pat_access_weekly.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129463
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 options:
   events:
     - k8s_api_proxy_requests_unique_users_via_pat_access
diff --git a/config/metrics/counts_7d/count_distinct_project_id_from_ci_template_included_7d.yml b/config/metrics/counts_7d/count_distinct_project_id_from_ci_template_included_7d.yml
index 4c6be227130..e16de34f970 100644
--- a/config/metrics/counts_7d/count_distinct_project_id_from_ci_template_included_7d.yml
+++ b/config/metrics/counts_7d/count_distinct_project_id_from_ci_template_included_7d.yml
@@ -12,7 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132819
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_7d.yml b/config/metrics/counts_7d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_7d.yml
index 1709265b9ce..867c9f75189 100644
--- a/config/metrics/counts_7d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_7d.yml
+++ b/config/metrics/counts_7d/count_distinct_user_id_from_unique_users_visiting_ci_catalog_7d.yml
@@ -12,7 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137564
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/count_total_code_suggestions_authenticate_7d.yml b/config/metrics/counts_7d/count_total_code_suggestions_authenticate_7d.yml
index a2fe5a36c9b..e7a5ada2e4e 100644
--- a/config/metrics/counts_7d/count_total_code_suggestions_authenticate_7d.yml
+++ b/config/metrics/counts_7d/count_total_code_suggestions_authenticate_7d.yml
@@ -12,7 +12,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138848
 time_frame: 7d
 data_source: internal_events
 data_category: optional
-instrumentation_class: TotalCountMetric
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml b/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
index cf7aab39202..fa5b892e34f 100644
--- a/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
+++ b/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127442
 time_frame: all
 data_source: internal_events
 data_category: optional
-instrumentation_class: TotalCountMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml b/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
index ffeb777fc55..ada90084ff4 100644
--- a/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
+++ b/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126884
 time_frame: all
 data_source: internal_events
 data_category: optional
-instrumentation_class: TotalCountMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml b/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
index 506ad82f4f4..d05bf23dd41 100644
--- a/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
+++ b/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128821
 time_frame: all
 data_source: internal_events
 data_category: optional
-instrumentation_class: TotalCountMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml b/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
index 83fb5630d16..44e4d4ed7fa 100644
--- a/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
+++ b/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
@@ -11,7 +11,6 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/128822
 time_frame: all
 data_source: internal_events
 data_category: optional
-instrumentation_class: TotalCountMetric
 performance_indicator_type: []
 distribution:
 - ce
diff --git a/config/metrics/schema/internal_events.json b/config/metrics/schema/internal_events.json
index 75378db054d..d35a2fa22d7 100644
--- a/config/metrics/schema/internal_events.json
+++ b/config/metrics/schema/internal_events.json
@@ -7,100 +7,50 @@
     }
   },
   "then": {
-    "oneOf": [
-      {
+    "properties": {
+      "instrumentation_class": false,
+      "options": {
+        "type": "object",
         "properties": {
-          "instrumentation_class": {
-            "const": "RedisHLLMetric"
-          },
-          "options": {
-            "type": "object",
-            "properties": {
-              "events": {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              }
-            },
-            "required": [
-              "events"
-            ],
-            "additionalProperties": false
-          },
           "events": {
             "type": "array",
             "items": {
-              "type": "object",
-              "required": [
-                "name",
-                "unique"
-              ],
-              "properties": {
-                "name": {
-                  "type": "string"
-                },
-                "unique": {
-                  "type": "string",
-                  "enum": [
-                    "user.id",
-                    "project.id",
-                    "namespace.id"
-                  ]
-                }
-              },
-              "additionalProperties": false
+              "type": "string"
             }
           }
         },
         "required": [
-          "events",
-          "options",
-          "instrumentation_class"
-        ]
+          "events"
+        ],
+        "additionalProperties": false
       },
-      {
-        "properties": {
-          "instrumentation_class": {
-            "const": "TotalCountMetric"
-          },
-          "options": {
-            "type": "object",
-            "properties": {
-              "events": {
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              }
+      "events": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "required": [
+            "name"
+          ],
+          "properties": {
+            "name": {
+              "type": "string"
             },
-            "required": [
-              "events"
-            ],
-            "additionalProperties": false
-          },
-          "events": {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "required": [
-                "name"
-              ],
-              "properties": {
-                "name": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
+            "unique": {
+              "type": "string",
+              "enum": [
+                "user.id",
+                "project.id",
+                "namespace.id"
+              ]
             }
-          }
-        },
-        "required": [
-          "events",
-          "options",
-          "instrumentation_class"
-        ]
+          },
+          "additionalProperties": false
+        }
       }
+    },
+    "required": [
+      "events",
+      "options"
     ]
   }
 }