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

Remove deprecated package metrics

See merge request gitlab-org/gitlab!76710

config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml

@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: container registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml

@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml

@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml

@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml

@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: container registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml

@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml

@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml

@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml

@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: container registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml

@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml

@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml

@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml

@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: container registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml

@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml

@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml

@@ -8,7 +8,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric

config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml

@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: redis
 distribution:

config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml

@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: redis
 distribution:

config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml

@@ -7,7 +7,7 @@ product_stage: package
 product_group: group::package
 product_category: package registry
 value_type: number
-status: deprecated
+status: removed
 time_frame: all
 data_source: redis
 distribution:

ee/spec/config/metrics/every_metric_definition_spec.rb

@@ -12,10 +12,6 @@ RSpec.describe 'Every metric definition' do
       license_add_ons
       testing_total_unique_counts
       user_auth_by_provider
-      package_events_i_package_container_push_package
-      package_events_i_package_container_pull_package
-      package_events_i_package_debian_push_package
-      package_events_i_package_container_delete_package
     ).freeze
   end
 

lib/api/debian_project_packages.rb

@@ -83,7 +83,6 @@ module API
               ::Packages::Debian::ProcessChangesWorker.perform_async(package_file.id, current_user.id) # rubocop:disable CodeReuse/Worker
             end
 
-            track_package_event('push_package', :debian, user: current_user, project: authorized_user_project, namespace: authorized_user_project.namespace)
             created!
           rescue ObjectStorage::RemoteStoreError => e
             Gitlab::ErrorTracking.track_exception(e, extra: { file_name: params[:file_name], project_id: authorized_user_project.id })

lib/gitlab/usage_data_counters/counter_events/package_events.yml

@@ -5,12 +5,8 @@
 - i_package_conan_delete_package
 - i_package_conan_pull_package
 - i_package_conan_push_package
-- i_package_container_delete_package
-- i_package_container_pull_package
-- i_package_container_push_package
 - i_package_debian_delete_package
 - i_package_debian_pull_package
-- i_package_debian_push_package
 - i_package_delete_package
 - i_package_delete_package_by_deploy_token
 - i_package_delete_package_by_guest
@@ -56,9 +52,6 @@
 - i_package_rubygems_delete_package
 - i_package_rubygems_pull_package
 - i_package_rubygems_push_package
-- i_package_tag_delete_package
-- i_package_tag_pull_package
-- i_package_tag_push_package
 - i_package_terraform_module_delete_package
 - i_package_terraform_module_pull_package
 - i_package_terraform_module_push_package

lib/gitlab/usage_data_counters/known_events/package_events.yml

@@ -15,22 +15,6 @@
   category: user_packages
   aggregation: weekly
   redis_slot: package
-- name: i_package_container_deploy_token
-  category: deploy_token_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_container_user
-  category: user_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_debian_deploy_token
-  category: deploy_token_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_debian_user
-  category: user_packages
-  aggregation: weekly
-  redis_slot: package
 - name: i_package_generic_deploy_token
   category: deploy_token_packages
   aggregation: weekly
@@ -39,14 +23,6 @@
   category: user_packages
   aggregation: weekly
   redis_slot: package
-- name: i_package_golang_deploy_token
-  category: deploy_token_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_golang_user
-  category: user_packages
-  aggregation: weekly
-  redis_slot: package
 - name: i_package_helm_deploy_token
   category: deploy_token_packages
   aggregation: weekly
@@ -95,14 +71,6 @@
   category: user_packages
   aggregation: weekly
   redis_slot: package
-- name: i_package_tag_deploy_token
-  category: deploy_token_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_tag_user
-  category: user_packages
-  aggregation: weekly
-  redis_slot: package
 - name: i_package_terraform_module_deploy_token
   category: deploy_token_packages
   aggregation: weekly

spec/lib/gitlab/usage_data_counters/package_event_counter_spec.rb

@@ -13,10 +13,6 @@ RSpec.describe Gitlab::UsageDataCounters::PackageEventCounter, :clean_gitlab_red
     end
   end
 
-  it 'includes the right events' do
-    expect(described_class::KNOWN_EVENTS.size).to eq 63
-  end
-
   described_class::KNOWN_EVENTS.each do |event|
     it_behaves_like 'usage counter with totals', event
   end
@@ -24,8 +20,8 @@ RSpec.describe Gitlab::UsageDataCounters::PackageEventCounter, :clean_gitlab_red
   describe '.fetch_supported_event' do
     subject { described_class.fetch_supported_event(event_name) }
 
-    let(:event_name) { 'package_events_i_package_composer_push_package' }
+    let(:event_name) { 'package_events_i_package_conan_push_package' }
 
-    it { is_expected.to eq 'i_package_composer_push_package' }
+    it { is_expected.to eq 'i_package_conan_push_package' }
   end
 end

spec/services/packages/create_event_service_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 RSpec.describe Packages::CreateEventService do
-  let(:scope) { 'container' }
+  let(:scope) { 'generic' }
   let(:event_name) { 'push_package' }
 
   let(:params) do
@@ -75,24 +75,24 @@ RSpec.describe Packages::CreateEventService do
     context 'with a user' do
       let(:user) { create(:user) }
 
-      it_behaves_like 'db package event creation', 'user', 'container'
-      it_behaves_like 'redis package unique event creation', 'user', 'container'
-      it_behaves_like 'redis package count event creation', 'user', 'container'
+      it_behaves_like 'db package event creation', 'user', 'generic'
+      it_behaves_like 'redis package unique event creation', 'user', 'generic'
+      it_behaves_like 'redis package count event creation', 'user', 'generic'
     end
 
     context 'with a deploy token' do
       let(:user) { create(:deploy_token) }
 
-      it_behaves_like 'db package event creation', 'deploy_token', 'container'
-      it_behaves_like 'redis package unique event creation', 'deploy_token', 'container'
-      it_behaves_like 'redis package count event creation', 'deploy_token', 'container'
+      it_behaves_like 'db package event creation', 'deploy_token', 'generic'
+      it_behaves_like 'redis package unique event creation', 'deploy_token', 'generic'
+      it_behaves_like 'redis package count event creation', 'deploy_token', 'generic'
     end
 
     context 'with no user' do
       let(:user) { nil }
 
-      it_behaves_like 'db package event creation', 'guest', 'container'
-      it_behaves_like 'redis package count event creation', 'guest', 'container'
+      it_behaves_like 'db package event creation', 'guest', 'generic'
+      it_behaves_like 'redis package count event creation', 'guest', 'generic'
     end
 
     context 'with a package as scope' do

spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb

@@ -40,7 +40,6 @@ RSpec.shared_examples 'Debian packages upload request' do |status, body = nil|
         expect(response.body).to match(body)
       end
     end
-    it_behaves_like 'a package tracking event', described_class.name, 'push_package'
   else
     it "returns #{status}#{and_body}", :aggregate_failures do
       subject