Add latest changes from gitlab-org/gitlab@master

10 files changed, 42 insertions, 22 deletions

diff --git a/config/feature_flags/development/ci_custom_yaml_tags.yml b/config/feature_flags/development/ci_custom_yaml_tags.yml
new file mode 100644
index 00000000000..37b7e17044d
--- /dev/null
+++ b/config/feature_flags/development/ci_custom_yaml_tags.yml
@@ -0,0 +1,8 @@
+---
+name: ci_custom_yaml_tags
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52104
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300155
+milestone: '13.9'
+type: development
+group: group::pipeline authoring
+default_enabled: false
diff --git a/config/feature_flags/development/database_sourced_aggregated_metrics.yml b/config/feature_flags/development/database_sourced_aggregated_metrics.yml
new file mode 100644
index 00000000000..d971ad0b9d2
--- /dev/null
+++ b/config/feature_flags/development/database_sourced_aggregated_metrics.yml
@@ -0,0 +1,8 @@
+---
+name: database_sourced_aggregated_metrics
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52784
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/300411
+milestone: '13.9'
+type: development
+group: group::product intelligence
+default_enabled: false
diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb
index d0e22187454..7da1779f87b 100644
--- a/config/initializers/zz_metrics.rb
+++ b/config/initializers/zz_metrics.rb
@@ -90,6 +90,7 @@ def instrument_classes(instrumentation)
 
   instrumentation.instrument_methods(Gitlab::Highlight)
   instrumentation.instrument_instance_methods(Gitlab::Highlight)
+  instrumentation.instrument_instance_method(Gitlab::Ci::Config::Yaml::Tags::Resolver, :to_hash)
 
   Gitlab.ee do
     instrumentation.instrument_instance_methods(Elastic::Latest::GitInstanceProxy)
diff --git a/config/metrics/counts_28d/deployments.yml b/config/metrics/counts_28d/deployments.yml
index 02d620c214e..2f07db2b1d1 100644
--- a/config/metrics/counts_28d/deployments.yml
+++ b/config/metrics/counts_28d/deployments.yml
@@ -1,11 +1,11 @@
 key_path: counts_monthly.deployments
 description: Total deployments count for recent 28 days
 value_type: integer
-stage: release
+product_stage: release
 status: data_available
 milestone: 13.2
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35493
-group: 'group::ops release'
+product_group: 'group::ops release'
 time_frame: 28d
 data_source: database
 distribution: [ee, ce]
diff --git a/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
index 5f8492f13c1..3f67789131f 100644
--- a/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
@@ -2,11 +2,11 @@ key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_change
 description: Distinct users count that changed issue title in a group for last recent week
 value_type: integer
 product_category: issue_tracking
-stage: plan
+product_stage: plan
 status: data_available
 milestone: 13.6
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: 'group::project management'
+product_group: 'group::project management'
 time_frame: 7d
 data_source: redis_hll
 distribution: [ee, ce]
diff --git a/config/metrics/counts_all/deployments.yml b/config/metrics/counts_all/deployments.yml
index abddb09c3dd..a6c25cda085 100644
--- a/config/metrics/counts_all/deployments.yml
+++ b/config/metrics/counts_all/deployments.yml
@@ -1,11 +1,11 @@
 key_path: counts.deployments
 description: Total deployments count
 value_type: integer
-stage: release
+product_stage: release
 status: data_available
 milestone: 8.12
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/735
-group: 'group::ops release'
+product_group: 'group::ops release'
 time_frame: all
 data_source: database
 distribution: [ee, ce]
diff --git a/config/metrics/license/recorded_at.yml b/config/metrics/license/recorded_at.yml
index 0ffb65de671..529e700b684 100644
--- a/config/metrics/license/recorded_at.yml
+++ b/config/metrics/license/recorded_at.yml
@@ -2,11 +2,11 @@ key_path: recorded_at
 description: When the Usage Ping computation was started
 value_type: string
 product_category: collection
-stage: growth
+product_stage: growth
 status: data_available
 milestone: 8.10
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
-group: group::product analytics
+product_group: group::product intelligence
 time_frame: none
 data_source: ruby
 distribution: [ee, ce]
diff --git a/config/metrics/license/uuid.yml b/config/metrics/license/uuid.yml
index 86b38a26cbc..6ecf7f7ef11 100644
--- a/config/metrics/license/uuid.yml
+++ b/config/metrics/license/uuid.yml
@@ -2,11 +2,11 @@ key_path: uuid
 description: GitLab instance unique identifier
 value_type: string
 product_category: collection
-stage: growth
+product_stage: growth
 status: data_available
 milestone: 9.1
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521
-group: group::product analytics
+product_group: group::product intelligence
 time_frame: none
 data_source: database
 distribution: [ee, ce]
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index d9a53c88e5d..d71eddab469 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "required": ["key_path", "description", "value_type", "status", "group", "time_frame", "data_source", "distribution", "tier"],
+  "required": ["key_path", "description", "value_type", "status", "product_group", "time_frame", "data_source", "distribution", "tier"],
   "properties": {
     "key_path": {
       "type": "string"
@@ -8,19 +8,25 @@
     "description": {
       "type": "string"
     },
-    "value_type": {
-      "type": "string",
-      "enum": ["integer", "string", "number", "boolean"]
+    "product_section": {
+      "type": ["string", "null"]
     },
-    "product_category": {
+    "product_stage": {
       "type": ["string", "null"]
     },
-    "stage": {
+    "product_group": {
+      "type": "string"
+    },
+    "product_category": {
       "type": ["string", "null"]
     },
+    "value_type": {
+      "type": "string",
+      "enum": ["integer", "string", "number", "boolean"]
+    },
     "status": {
       "type": ["string"],
-      "enum": ["data_available", "planned", "in_progress", "implmented"]
+      "enum": ["data_available", "planned", "in_progress", "implemented"]
     },
     "milestone": {
       "type": ["number", "null"]
@@ -31,9 +37,6 @@
     "introduced_by_url": {
       "type": ["string", "null"]
     },
-    "group": {
-      "type": "string"
-    },
     "time_frame": {
       "type": "string",
       "enum": ["7d", "28d", "all", "none"]
diff --git a/config/metrics/settings/database_adapter.yml b/config/metrics/settings/database_adapter.yml
index b80906ab025..428559a05f0 100644
--- a/config/metrics/settings/database_adapter.yml
+++ b/config/metrics/settings/database_adapter.yml
@@ -2,9 +2,9 @@ key_path: database.adapter
 description: This metric only returns a value of PostgreSQL in supported versions of GitLab. It could be removed from the usage ping. Historically MySQL was also supported.
 value_type: string
 product_category: collection
-stage: growth
+product_stage: growth
 status: data_available
-group: group::enablement distribution
+product_group: group::enablement distribution
 time_frame: none
 data_source: database
 distribution: [ee, ce]