fix(sourcemaps): Exclude skipped files from bundle file count (#2397)

closes #2136

Author: a-hariti

src/utils/file_upload.rs

@@ -510,6 +510,8 @@ fn build_artifact_bundle(
         bundle.set_attribute("dist".to_owned(), dist.to_owned());
     }
 
+    let mut bundle_file_count = 0;
+
     for file in files.values() {
         pb.inc(1);
         pb.set_message(&file.url);
@@ -533,6 +535,7 @@ fn build_artifact_bundle(
                 return Err(e.into());
             }
         }
+        bundle_file_count += 1;
     }
 
     bundle.finish()?;
@@ -542,8 +545,8 @@ fn build_artifact_bundle(
     println!(
         "{} Bundled {} {} for upload",
         style(">").dim(),
-        style(files.len()).yellow(),
-        match files.len() {
+        style(bundle_file_count).yellow(),
+        match bundle_file_count {
             1 => "file",
             _ => "files",
         }

tests/integration/_cases/sourcemaps/sourcemaps-with-invalid-utf8.trycmd

@@ -0,0 +1,8 @@
+```
+$ sentry-cli sourcemaps upload tests/integration/_fixtures/invalid-utf8.txt tests/integration/_fixtures/bundle.min.js.map
+? success
+...
+> Bundled 1 file for upload
+...
+
+```

tests/integration/_fixtures/invalid-utf8.txt

@@ -0,0 +1 @@
+��

tests/integration/sourcemaps/upload.rs

@@ -183,3 +183,11 @@ fn command_sourcemaps_upload_complex_extension() {
         .register_trycmd_test("sourcemaps/sourcemaps-upload-complex-extension.trycmd")
         .with_default_token();
 }
+
+#[test]
+fn command_sourcemaps_upload_skip_invalid_utf8() {
+    TestManager::new()
+        .mock_common_upload_endpoints(ServerBehavior::Modern, Default::default())
+        .register_trycmd_test("sourcemaps/sourcemaps-with-invalid-utf8.trycmd")
+        .with_default_token();
+}