Merge branch '324206-extraction-error-rescue' into 'master'

Package extraction workers catch more errors

See merge request gitlab-org/gitlab!61745

app/workers/packages/nuget/extraction_worker.rb

@@ -17,8 +17,7 @@ module Packages
 
         ::Packages::Nuget::UpdatePackageFromMetadataService.new(package_file).execute
 
-      rescue ::Packages::Nuget::MetadataExtractionService::ExtractionError,
-             ::Packages::Nuget::UpdatePackageFromMetadataService::InvalidMetadataError => e
+      rescue StandardError => e
         Gitlab::ErrorTracking.log_exception(e, project_id: package_file.project_id)
         package_file.package.update_column(:status, :error)
       end

app/workers/packages/rubygems/extraction_worker.rb

@@ -19,7 +19,7 @@ module Packages
 
         ::Packages::Rubygems::ProcessGemService.new(package_file).execute
 
-      rescue ::Packages::Rubygems::ProcessGemService::ExtractionError => e
+      rescue StandardError => e
         Gitlab::ErrorTracking.log_exception(e, project_id: package_file.project_id)
         package_file.package.update_column(:status, :error)
       end

changelogs/unreleased/324206-extraction-error-rescue.yml

+---
+title: Log additional package extraction errors
+merge_request: 61745
+author:
+type: other

spec/workers/packages/nuget/extraction_worker_spec.rb

@@ -103,5 +103,14 @@ RSpec.describe Packages::Nuget::ExtractionWorker, type: :worker do
         it_behaves_like 'handling the metadata error'
       end
     end
+
+    context 'handles a processing an unaccounted for error' do
+      before do
+        expect(::Packages::Nuget::UpdatePackageFromMetadataService).to receive(:new)
+          .and_raise(Zip::Error)
+      end
+
+      it_behaves_like 'handling the metadata error', exception_class: Zip::Error
+    end
   end
 end

spec/workers/packages/rubygems/extraction_worker_spec.rb

@@ -37,6 +37,20 @@ RSpec.describe Packages::Rubygems::ExtractionWorker, type: :worker do
       expect(package.reload).to be_error
     end
 
+    it 'handles processing an unaccounted for error', :aggregate_failures do
+      expect(::Packages::Rubygems::ProcessGemService).to receive(:new)
+        .and_raise(Zip::Error)
+
+      expect(Gitlab::ErrorTracking).to receive(:log_exception).with(
+        instance_of(Zip::Error),
+        project_id: package.project_id
+      )
+
+      subject
+
+      expect(package.reload).to be_error
+    end
+
     context 'returns when there is no package file' do
       let(:package_file_id) { 999999 }