Merge branch '340847-remove-deprecated-metric-status-3' into 'master'

Remove deprecateds Stage Manage metrics See merge request gitlab-org/gitlab!76701

Merge branch '340847-remove-deprecated-metric-status-3' into 'master'
Remove deprecateds Stage Manage metrics See merge request gitlab-org/gitlab!76701
aaead3d2 · Stan Hu · 84804e8c · b193734a · aaead3d2 · aaead3d2
Commit aaead3d2 authored Dec 22, 2021 by Stan Hu
32 changed files
--- a/config/metrics/counts_28d/20210216183640_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183640_gitlab.yml
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.bulk_imports.gitlab
-description: DEPRECATED - Count of projects imported using bulk imports
+description: REMOVED - Count of projects imported using bulk imports
 product_section: dev
 product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183712_total.yml
+++ b/config/metrics/counts_28d/20210216183712_total.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183714_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183716_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183716_gitlab.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183718_github.yml
+++ b/config/metrics/counts_28d/20210216183718_github.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183720_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183720_bitbucket.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183724_gitea.yml
+++ b/config/metrics/counts_28d/20210216183724_gitea.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183726_git.yml
+++ b/config/metrics/counts_28d/20210216183726_git.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183728_manifest.yml
+++ b/config/metrics/counts_28d/20210216183728_manifest.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183730_jira.yml
+++ b/config/metrics/counts_28d/20210216183730_jira.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183731_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183731_fogbugz.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183733_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183733_phabricator.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183735_csv.yml
+++ b/config/metrics/counts_28d/20210216183735_csv.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_28d/20210216183737_groups_imported.yml
+++ b/config/metrics/counts_28d/20210216183737_groups_imported.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180634_gitlab.yml
+++ b/config/metrics/counts_all/20210216180634_gitlab.yml
@@ -8,7 +8,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180705_total.yml
+++ b/config/metrics/counts_all/20210216180705_total.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180707_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180707_gitlab_project.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180709_gitlab.yml
+++ b/config/metrics/counts_all/20210216180709_gitlab.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180711_github.yml
+++ b/config/metrics/counts_all/20210216180711_github.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180713_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180713_bitbucket.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180715_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180716_gitea.yml
+++ b/config/metrics/counts_all/20210216180716_gitea.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180718_git.yml
+++ b/config/metrics/counts_all/20210216180718_git.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180720_manifest.yml
+++ b/config/metrics/counts_all/20210216180720_manifest.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180722_jira.yml
+++ b/config/metrics/counts_all/20210216180722_jira.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180724_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180724_fogbugz.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180726_phabricator.yml
+++ b/config/metrics/counts_all/20210216180726_phabricator.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180727_csv.yml
+++ b/config/metrics/counts_all/20210216180727_csv.yml
@@ -8,7 +8,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/config/metrics/counts_all/20210216180729_groups_imported.yml
+++ b/config/metrics/counts_all/20210216180729_groups_imported.yml
@@ -7,7 +7,7 @@ product_stage: manage
 product_group: group::import
 product_category: importers
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: database
 distribution:

--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -553,33 +553,11 @@ module Gitlab
          user_auth_by_provider: distinct_count_user_auth_by_provider(time_period),
          unique_users_all_imports: unique_users_all_imports(time_period),
          bulk_imports: {
-            gitlab: DEPRECATED_VALUE,
            gitlab_v1: count(::BulkImport.where(**time_period, source_type: :gitlab))
          },
          project_imports: project_imports(time_period),
          issue_imports: issue_imports(time_period),
-          group_imports: group_imports(time_period),
-
-          # Deprecated data to be removed
-          projects_imported: {
-            total: DEPRECATED_VALUE,
-            gitlab_project: DEPRECATED_VALUE,
-            gitlab: DEPRECATED_VALUE,
-            github: DEPRECATED_VALUE,
-            bitbucket: DEPRECATED_VALUE,
-            bitbucket_server: DEPRECATED_VALUE,
-            gitea: DEPRECATED_VALUE,
-            git: DEPRECATED_VALUE,
-            manifest: DEPRECATED_VALUE
-          },
-          issues_imported: {
-            jira: DEPRECATED_VALUE,
-            fogbugz: DEPRECATED_VALUE,
-            phabricator: DEPRECATED_VALUE,
-            csv: DEPRECATED_VALUE
-          },
-          groups_imported: DEPRECATED_VALUE
-          # End of deprecated keys
+          group_imports: group_imports(time_period)
        }
      end
      # rubocop: enable CodeReuse/ActiveRecord

--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -279,8 +279,7 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
      expect(described_class.usage_activity_by_stage_manage({})).to include(
        {
          bulk_imports: {
-            gitlab_v1: 2,
-            gitlab: Gitlab::UsageData::DEPRECATED_VALUE
+            gitlab_v1: 2
          },
          project_imports: {
            bitbucket: 2,
@@ -303,32 +302,13 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
          group_imports: {
            group_import: 2,
            gitlab_migration: 2
-          },
-          projects_imported: {
-            total: Gitlab::UsageData::DEPRECATED_VALUE,
-            gitlab_project: Gitlab::UsageData::DEPRECATED_VALUE,
-            gitlab: Gitlab::UsageData::DEPRECATED_VALUE,
-            github: Gitlab::UsageData::DEPRECATED_VALUE,
-            bitbucket: Gitlab::UsageData::DEPRECATED_VALUE,
-            bitbucket_server: Gitlab::UsageData::DEPRECATED_VALUE,
-            gitea: Gitlab::UsageData::DEPRECATED_VALUE,
-            git: Gitlab::UsageData::DEPRECATED_VALUE,
-            manifest: Gitlab::UsageData::DEPRECATED_VALUE
-          },
-          issues_imported: {
-            jira: Gitlab::UsageData::DEPRECATED_VALUE,
-            fogbugz: Gitlab::UsageData::DEPRECATED_VALUE,
-            phabricator: Gitlab::UsageData::DEPRECATED_VALUE,
-            csv: Gitlab::UsageData::DEPRECATED_VALUE
-          },
-          groups_imported: Gitlab::UsageData::DEPRECATED_VALUE
+          }
        }
      )
      expect(described_class.usage_activity_by_stage_manage(described_class.monthly_time_range_db_params)).to include(
        {
          bulk_imports: {
-            gitlab_v1: 1,
-            gitlab: Gitlab::UsageData::DEPRECATED_VALUE
+            gitlab_v1: 1
          },
          project_imports: {
            bitbucket: 1,
@@ -351,25 +331,7 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
          group_imports: {
            group_import: 1,
            gitlab_migration: 1
-          },
-          projects_imported: {
-            total: Gitlab::UsageData::DEPRECATED_VALUE,
-            gitlab_project: Gitlab::UsageData::DEPRECATED_VALUE,
-            gitlab: Gitlab::UsageData::DEPRECATED_VALUE,
-            github: Gitlab::UsageData::DEPRECATED_VALUE,
-            bitbucket: Gitlab::UsageData::DEPRECATED_VALUE,
-            bitbucket_server: Gitlab::UsageData::DEPRECATED_VALUE,
-            gitea: Gitlab::UsageData::DEPRECATED_VALUE,
-            git: Gitlab::UsageData::DEPRECATED_VALUE,
-            manifest: Gitlab::UsageData::DEPRECATED_VALUE
-          },
-          issues_imported: {
-            jira: Gitlab::UsageData::DEPRECATED_VALUE,
-            fogbugz: Gitlab::UsageData::DEPRECATED_VALUE,
-            phabricator: Gitlab::UsageData::DEPRECATED_VALUE,
-            csv: Gitlab::UsageData::DEPRECATED_VALUE
-          },
-          groups_imported: Gitlab::UsageData::DEPRECATED_VALUE
+          }
        }
      )
    end