Merge branch '354853-fix-service-ping-failing-metrics-for-create-stage-5' into 'master'

Resolve "Fix Service ping failing metrics for create stage (5)"

See merge request gitlab-org/gitlab!83940

config/metrics/counts_28d/20210216175055_merge_requests.yml

@@ -7,7 +7,8 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.10'
 time_frame: 28d
 data_source: database
 distribution:

config/metrics/counts_all/20210216175045_merge_requests.yml

@@ -7,7 +7,8 @@ product_stage: create
 product_group: group::code review
 product_category: code_review
 value_type: number
-status: active
+status: removed
+milestone_removed: '14.10'
 time_frame: all
 data_source: database
 distribution:

lib/gitlab/usage_data.rb

@@ -507,7 +507,6 @@ module Gitlab
         {
           deploy_keys: distinct_count(::DeployKey.where(time_period), :user_id),
           keys: distinct_count(::Key.regular_keys.where(time_period), :user_id),
-          merge_requests: distinct_count(::MergeRequest.where(time_period), :author_id),
           projects_with_disable_overriding_approvers_per_merge_request: count(::Project.where(time_period.merge(disable_overriding_approvers_per_merge_request: true))),
           projects_without_disable_overriding_approvers_per_merge_request: count(::Project.where(time_period.merge(disable_overriding_approvers_per_merge_request: [false, nil]))),
           remote_mirrors: distinct_count(::Project.with_remote_mirrors.where(time_period), :creator_id),

spec/lib/gitlab/usage_data_spec.rb

@@ -166,7 +166,6 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
       expect(described_class.usage_activity_by_stage_create({})).to include(
         deploy_keys: 2,
         keys: 2,
-        merge_requests: 2,
         projects_with_disable_overriding_approvers_per_merge_request: 2,
         projects_without_disable_overriding_approvers_per_merge_request: 6,
         remote_mirrors: 2,
@@ -175,7 +174,6 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
       expect(described_class.usage_activity_by_stage_create(described_class.monthly_time_range_db_params)).to include(
         deploy_keys: 1,
         keys: 1,
-        merge_requests: 1,
         projects_with_disable_overriding_approvers_per_merge_request: 1,
         projects_without_disable_overriding_approvers_per_merge_request: 3,
         remote_mirrors: 1,