Merge branch '331455-generic-package-usage-ping' into 'master'

Update Generic packages events to be captured with usage ping

See merge request gitlab-org/gitlab!68176

lib/api/generic_packages.rb

@@ -62,7 +62,7 @@ module API
             authorize_upload!(project)
             bad_request!('File is too large') if max_file_size_exceeded?
 
-            ::Gitlab::Tracking.event(self.options[:for].name, 'push_package', user: current_user, project: project, namespace: project.namespace)
+            track_package_event('push_package', :generic, project: project, user: current_user, namespace: project.namespace)
 
             create_package_file_params = declared_params.merge(build: current_authenticated_job)
             ::Packages::Generic::CreatePackageFileService
@@ -96,7 +96,7 @@ module API
             package = ::Packages::Generic::PackageFinder.new(project).execute!(params[:package_name], params[:package_version])
             package_file = ::Packages::PackageFileFinder.new(package, params[:file_name]).execute!
 
-            ::Gitlab::Tracking.event(self.options[:for].name, 'pull_package', user: current_user, project: project, namespace: project.namespace)
+            track_package_event('pull_package', :generic, project: project, user: current_user, namespace: project.namespace)
 
             present_carrierwave_file!(package_file.file)
           end

spec/requests/api/generic_packages_spec.rb

@@ -388,9 +388,11 @@ RSpec.describe API::GenericPackages do
       end
 
       context 'event tracking' do
+        let(:snowplow_gitlab_standard_context) { { project: project, namespace: project.namespace, user: user } }
+
         subject { upload_file(params, workhorse_headers.merge(personal_access_token_header)) }
 
-        it_behaves_like 'a gitlab tracking event', described_class.name, 'push_package'
+        it_behaves_like 'a package tracking event', described_class.name, 'push_package'
       end
 
       it 'rejects request without a file from workhorse' do
@@ -542,13 +544,15 @@ RSpec.describe API::GenericPackages do
     end
 
     context 'event tracking' do
+      let(:snowplow_gitlab_standard_context) { { project: project, namespace: project.namespace, user: user } }
+
       before do
         project.add_developer(user)
       end
 
       subject { download_file(personal_access_token_header) }
 
-      it_behaves_like 'a gitlab tracking event', described_class.name, 'pull_package'
+      it_behaves_like 'a package tracking event', described_class.name, 'pull_package'
     end
 
     it 'rejects a malicious file name request' do