From 9f529c01335084af49a193895d75307b7d5bb9d9 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Tue, 7 Oct 2025 14:29:44 +0200
Subject: [PATCH 01/23] feat: Print messages when not using progress bar

---
 src/utils/progress.rs | 108 +++++++++++++++++++++++++++++-------------
 1 file changed, 76 insertions(+), 32 deletions(-)

diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index d0355c618f..3707f54e98 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -1,6 +1,6 @@
 use parking_lot::RwLock;
 use std::env;
-use std::ops::Deref;
+use std::io::IsTerminal;
 use std::sync::Arc;
 use std::time::Instant;
 
@@ -8,69 +8,113 @@ use crate::utils::logging;
 
 pub use indicatif::ProgressStyle;
 
-pub fn is_progress_bar_visible() -> bool {
-    env::var("SENTRY_NO_PROGRESS_BAR") != Ok("1".into())
+pub fn use_progress_bar() -> bool {
+    (env::var("SENTRY_NO_PROGRESS_BAR") != Ok("1".into())) || std::io::stdout().is_terminal()
 }
 
 pub struct ProgressBar {
-    inner: Arc<indicatif::ProgressBar>,
+    inner: Option<Arc<indicatif::ProgressBar>>,
     start: Instant,
 }
 
 impl ProgressBar {
     pub fn new(len: usize) -> Self {
-        if is_progress_bar_visible() {
-            indicatif::ProgressBar::new(len as u64).into()
+        if use_progress_bar() {
+            Self::from_indicatif(indicatif::ProgressBar::new(len as u64))
         } else {
-            Self::hidden()
+            Self::no_progress_bar()
         }
     }
 
     pub fn new_spinner() -> Self {
-        if is_progress_bar_visible() {
-            indicatif::ProgressBar::new_spinner().into()
+        if use_progress_bar() {
+            Self::from_indicatif(indicatif::ProgressBar::new_spinner())
         } else {
-            Self::hidden()
+            Self::no_progress_bar()
         }
     }
 
-    pub fn hidden() -> Self {
-        indicatif::ProgressBar::hidden().into()
+    fn from_indicatif(pb: indicatif::ProgressBar) -> Self {
+        let inner = Arc::new(pb);
+        logging::set_progress_bar(Some(Arc::downgrade(&inner)));
+        ProgressBar {
+            inner: Some(inner),
+            start: Instant::now(),
+        }
+    }
+
+    fn no_progress_bar() -> Self {
+        ProgressBar {
+            inner: None,
+            start: Instant::now(),
+        }
     }
 
     pub fn finish_with_duration(&self, op: &str) {
         let dur = self.start.elapsed();
         // We could use `dur.as_secs_f64()`, but its unnecessarily precise (micros). Millis are enough for our purpose.
         let msg = format!("{op} completed in {}s", dur.as_millis() as f64 / 1000.0);
-        let progress_style = ProgressStyle::default_bar().template("{prefix:.dim} {msg}");
-        self.inner.set_style(progress_style);
-        self.inner.set_prefix(">");
-        self.inner.finish_with_message(&msg);
-        logging::set_progress_bar(None);
+
+        if let Some(inner) = &self.inner {
+            let progress_style = ProgressStyle::default_bar().template("{prefix:.dim} {msg}");
+            inner.set_style(progress_style);
+            inner.set_prefix(">");
+            inner.finish_with_message(&msg);
+            logging::set_progress_bar(None);
+        } else {
+            println!("{}", msg);
+        }
     }
 
     pub fn finish_and_clear(&self) {
-        self.inner.finish_and_clear();
-        logging::set_progress_bar(None);
+        if let Some(inner) = &self.inner {
+            inner.finish_and_clear();
+            logging::set_progress_bar(None);
+        }
     }
-}
 
-impl From<indicatif::ProgressBar> for ProgressBar {
-    fn from(pb: indicatif::ProgressBar) -> Self {
-        let inner = Arc::new(pb);
-        logging::set_progress_bar(Some(Arc::downgrade(&inner)));
-        ProgressBar {
-            inner,
-            start: Instant::now(),
+    pub fn set_style(&self, style: ProgressStyle) {
+        if let Some(inner) = &self.inner {
+            inner.set_style(style);
+        }
+    }
+
+    pub fn set_message<S: AsRef<str>>(&self, msg: S) {
+        if let Some(inner) = &self.inner {
+            inner.set_message(msg.as_ref());
+        } else {
+            println!("{}", msg.as_ref());
+        }
+    }
+
+    pub fn tick(&self) {
+        if let Some(inner) = &self.inner {
+            inner.tick();
         }
     }
-}
 
-impl Deref for ProgressBar {
-    type Target = indicatif::ProgressBar;
+    pub fn set_prefix<S: AsRef<str>>(&self, prefix: S) {
+        if let Some(inner) = &self.inner {
+            inner.set_prefix(prefix.as_ref());
+        }
+    }
+
+    pub fn set_position(&self, pos: u64) {
+        if let Some(inner) = &self.inner {
+            inner.set_position(pos);
+        }
+    }
 
-    fn deref(&self) -> &Self::Target {
-        &self.inner
+    pub fn inc(&self, delta: u64) {
+        if let Some(inner) = &self.inner {
+            inner.inc(delta);
+        }
+    }
+
+    pub fn enable_steady_tick(&self, interval: u64) {
+        if let Some(inner) = &self.inner {
+            inner.enable_steady_tick(interval);
+        }
     }
 }
 

From e78c4629d2daa382afb26e93f8634bae6910d407 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Thu, 9 Oct 2025 14:24:26 +0200
Subject: [PATCH 02/23] cargo clippy --fix

---
 src/commands/debug_files/find.rs | 2 +-
 src/utils/dif_upload/mod.rs      | 2 +-
 src/utils/file_search.rs         | 4 ++--
 src/utils/progress.rs            | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/commands/debug_files/find.rs b/src/commands/debug_files/find.rs
index 4b63cf2517..52843dc856 100644
--- a/src/commands/debug_files/find.rs
+++ b/src/commands/debug_files/find.rs
@@ -136,7 +136,7 @@ fn find_ids(
             pb.set_message(p);
         }
         pb.tick();
-        pb.set_prefix(&format!("{}", found_files.len()));
+        pb.set_prefix(format!("{}", found_files.len()));
 
         let found: Vec<_> = types
             .iter()
diff --git a/src/utils/dif_upload/mod.rs b/src/utils/dif_upload/mod.rs
index 319e06c58f..f04c9d6177 100644
--- a/src/utils/dif_upload/mod.rs
+++ b/src/utils/dif_upload/mod.rs
@@ -668,7 +668,7 @@ fn search_difs(options: &DifUpload) -> Result<Vec<DifMatch<'static>>> {
                 }
             };
 
-            pb.set_prefix(&collected.len().to_string());
+            pb.set_prefix(collected.len().to_string());
             Ok(())
         })?;
     }
diff --git a/src/utils/file_search.rs b/src/utils/file_search.rs
index 539f0400e1..dab73b4035 100644
--- a/src/utils/file_search.rs
+++ b/src/utils/file_search.rs
@@ -139,7 +139,7 @@ impl ReleaseFileSearch {
             if file.file_type().is_some_and(|t| t.is_dir()) {
                 continue;
             }
-            pb.set_message(&format!("{}", file.path().display()));
+            pb.set_message(format!("{}", file.path().display()));
 
             info!("found: {} ({} bytes)", file.path().display(), {
                 #[expect(clippy::unwrap_used, reason = "legacy code")]
@@ -164,7 +164,7 @@ impl ReleaseFileSearch {
             };
             collected.push(file_match);
 
-            pb.set_prefix(&collected.len().to_string());
+            pb.set_prefix(collected.len().to_string());
         }
 
         pb.finish_and_clear();
diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index 3707f54e98..22e66a5779 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -1,6 +1,6 @@
 use parking_lot::RwLock;
 use std::env;
-use std::io::IsTerminal;
+use std::io::IsTerminal as _;
 use std::sync::Arc;
 use std::time::Instant;
 
@@ -62,7 +62,7 @@ impl ProgressBar {
             inner.finish_with_message(&msg);
             logging::set_progress_bar(None);
         } else {
-            println!("{}", msg);
+            println!("{msg}");
         }
     }
 

From 32c2ac77ac6e8c97d7303f24a92b98cb1937c13c Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Fri, 10 Oct 2025 12:05:05 +0200
Subject: [PATCH 03/23] improve

---
 src/utils/progress.rs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index 22e66a5779..9165f7cee9 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -8,10 +8,19 @@ use crate::utils::logging;
 
 pub use indicatif::ProgressStyle;
 
+/// By default, use the progress bar when we can detect we're running in a terminal.
+/// `SENTRY_NO_PROGRESS_BAR` takes precedence and can be used to disable the progress bar
+/// regardless of whether or not we're in a terminal.
 pub fn use_progress_bar() -> bool {
-    (env::var("SENTRY_NO_PROGRESS_BAR") != Ok("1".into())) || std::io::stdout().is_terminal()
+    if env::var("SENTRY_NO_PROGRESS_BAR") == Ok("1".into()) {
+        return false;
+    }
+    std::io::stdout().is_terminal() && std::io::stderr().is_terminal()
 }
 
+/// Wrapper that optionally holds a progress bar.
+/// If there's a progress bar, forward calls to it.
+/// Otherwise, log messages normally.
 pub struct ProgressBar {
     inner: Option<Arc<indicatif::ProgressBar>>,
     start: Instant,
@@ -62,7 +71,7 @@ impl ProgressBar {
             inner.finish_with_message(&msg);
             logging::set_progress_bar(None);
         } else {
-            println!("{msg}");
+            log::info!("{msg}");
         }
     }
 
@@ -83,7 +92,7 @@ impl ProgressBar {
         if let Some(inner) = &self.inner {
             inner.set_message(msg.as_ref());
         } else {
-            println!("{}", msg.as_ref());
+            log::debug!("{}", msg.as_ref());
         }
     }
 

From 287646c4acb9aa9b696affd93364a8090c2831d9 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Fri, 10 Oct 2025 12:06:30 +0200
Subject: [PATCH 04/23] improve

---
 src/utils/progress.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index 9165f7cee9..0649df4c9b 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -20,7 +20,7 @@ pub fn use_progress_bar() -> bool {
 
 /// Wrapper that optionally holds a progress bar.
 /// If there's a progress bar, forward calls to it.
-/// Otherwise, log messages normally.
+/// Otherwise, forward messages to `log` calls.
 pub struct ProgressBar {
     inner: Option<Arc<indicatif::ProgressBar>>,
     start: Instant,

From 6f033ba4349d63303aeadb2cc75e594d48186b54 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Fri, 10 Oct 2025 12:18:42 +0200
Subject: [PATCH 05/23] handle prefix

---
 src/utils/progress.rs | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index 0649df4c9b..ba20fa2a28 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -1,4 +1,5 @@
 use parking_lot::RwLock;
+use std::borrow::Cow;
 use std::env;
 use std::io::IsTerminal as _;
 use std::sync::Arc;
@@ -24,6 +25,7 @@ pub fn use_progress_bar() -> bool {
 pub struct ProgressBar {
     inner: Option<Arc<indicatif::ProgressBar>>,
     start: Instant,
+    prefix: Option<String>,
 }
 
 impl ProgressBar {
@@ -49,6 +51,7 @@ impl ProgressBar {
         ProgressBar {
             inner: Some(inner),
             start: Instant::now(),
+            prefix: None,
         }
     }
 
@@ -56,6 +59,7 @@ impl ProgressBar {
         ProgressBar {
             inner: None,
             start: Instant::now(),
+            prefix: None,
         }
     }
 
@@ -71,7 +75,7 @@ impl ProgressBar {
             inner.finish_with_message(&msg);
             logging::set_progress_bar(None);
         } else {
-            log::info!("{msg}");
+            log::info!("> {msg}");
         }
     }
 
@@ -92,7 +96,14 @@ impl ProgressBar {
         if let Some(inner) = &self.inner {
             inner.set_message(msg.as_ref());
         } else {
-            log::debug!("{}", msg.as_ref());
+            log::debug!(
+                "{}{}",
+                self.prefix
+                    .as_deref()
+                    .map(|s| format!("{s} "))
+                    .unwrap_or_else(|| String::new()),
+                msg.as_ref()
+            );
         }
     }
 
@@ -102,9 +113,11 @@ impl ProgressBar {
         }
     }
 
-    pub fn set_prefix<S: AsRef<str>>(&self, prefix: S) {
+    pub fn set_prefix<S: AsRef<str>>(&mut self, prefix: S) {
         if let Some(inner) = &self.inner {
             inner.set_prefix(prefix.as_ref());
+        } else {
+            self.prefix = Some(prefix.as_ref().to_owned());
         }
     }
 

From a94a938e9da3120fbd16fc740524a1562797f03c Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Fri, 10 Oct 2025 12:35:48 +0200
Subject: [PATCH 06/23] handle prefix as well

---
 src/commands/debug_files/find.rs |  2 +-
 src/utils/chunks/upload.rs       |  2 +-
 src/utils/dif_upload/mod.rs      | 10 +++++-----
 src/utils/file_search.rs         |  2 +-
 src/utils/file_upload.rs         |  2 +-
 src/utils/progress.rs            |  1 -
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/commands/debug_files/find.rs b/src/commands/debug_files/find.rs
index 52843dc856..f1e1fa907d 100644
--- a/src/commands/debug_files/find.rs
+++ b/src/commands/debug_files/find.rs
@@ -117,7 +117,7 @@ fn find_ids(
         .filter(|e| e.file_type().is_file());
 
     let mut found_files = vec![];
-    let pb = ProgressBar::new_spinner();
+    let mut pb = ProgressBar::new_spinner();
     pb.set_style(
         ProgressStyle::default_spinner()
             .tick_chars("/|\\- ")
diff --git a/src/utils/chunks/upload.rs b/src/utils/chunks/upload.rs
index a05c8425af..7425fe104f 100644
--- a/src/utils/chunks/upload.rs
+++ b/src/utils/chunks/upload.rs
@@ -182,7 +182,7 @@ where
     );
 
     let api = Api::current();
-    let pb = ProgressBar::new(chunked_objects.len());
+    let mut pb = ProgressBar::new(chunked_objects.len());
     pb.set_style(progress_style);
     pb.set_prefix(">");
 
diff --git a/src/utils/dif_upload/mod.rs b/src/utils/dif_upload/mod.rs
index f04c9d6177..aa07fa886a 100644
--- a/src/utils/dif_upload/mod.rs
+++ b/src/utils/dif_upload/mod.rs
@@ -636,7 +636,7 @@ fn search_difs(options: &DifUpload) -> Result<Vec<DifMatch<'static>>> {
          \n  found {prefix:.yellow} {msg:.dim}",
     );
 
-    let pb = ProgressBar::new_spinner();
+    let mut pb = ProgressBar::new_spinner();
     pb.enable_steady_tick(100);
     pb.set_style(progress_style);
 
@@ -958,7 +958,7 @@ where
          \n{wide_bar}  {pos}/{len}",
     );
 
-    let pb = ProgressBar::new(items.len());
+    let mut pb = ProgressBar::new(items.len());
     pb.set_style(progress_style);
     pb.set_prefix(">");
 
@@ -1019,7 +1019,7 @@ fn process_symbol_maps<'a>(
          \n{wide_bar}  {pos}/{len}",
     );
 
-    let pb = ProgressBar::new(len);
+    let mut pb = ProgressBar::new(len);
     pb.set_style(progress_style);
     pb.set_prefix(">");
 
@@ -1110,7 +1110,7 @@ fn create_source_bundles<'a>(
          \n{wide_bar}  {pos}/{len}",
     );
 
-    let pb = ProgressBar::new(difs.len());
+    let mut pb = ProgressBar::new(difs.len());
     pb.set_style(progress_style);
     pb.set_prefix(">");
 
@@ -1166,7 +1166,7 @@ fn create_il2cpp_mappings<'a>(difs: &[DifMatch<'a>]) -> Result<Vec<DifMatch<'a>>
          \n{wide_bar}  {pos}/{len}",
     );
 
-    let pb = ProgressBar::new(difs.len());
+    let mut pb = ProgressBar::new(difs.len());
     pb.set_style(progress_style);
     pb.set_prefix(">");
 
diff --git a/src/utils/file_search.rs b/src/utils/file_search.rs
index dab73b4035..1fdb50fb14 100644
--- a/src/utils/file_search.rs
+++ b/src/utils/file_search.rs
@@ -98,7 +98,7 @@ impl ReleaseFileSearch {
         \n  found {prefix:.yellow} {msg:.dim}",
         );
 
-        let pb = ProgressBar::new_spinner();
+        let mut pb = ProgressBar::new_spinner();
         pb.enable_steady_tick(100);
         pb.set_style(progress_style);
 
diff --git a/src/utils/file_upload.rs b/src/utils/file_upload.rs
index 2379efe8d4..00a4b563da 100644
--- a/src/utils/file_upload.rs
+++ b/src/utils/file_upload.rs
@@ -680,7 +680,7 @@ fn build_artifact_bundle(
        \n{wide_bar}  {pos}/{len}",
     );
 
-    let pb = ProgressBar::new(files.len());
+    let mut pb = ProgressBar::new(files.len());
     pb.set_style(progress_style);
     pb.set_prefix(">");
 
diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index ba20fa2a28..8eb9117787 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -1,5 +1,4 @@
 use parking_lot::RwLock;
-use std::borrow::Cow;
 use std::env;
 use std::io::IsTerminal as _;
 use std::sync::Arc;

From f1deb838a4f4c2a1cafb4d6366c2eab7fc444717 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Fri, 10 Oct 2025 12:39:09 +0200
Subject: [PATCH 07/23] cargo clippy --fix

---
 src/utils/progress.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index 8eb9117787..1bbe87bf67 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -100,7 +100,7 @@ impl ProgressBar {
                 self.prefix
                     .as_deref()
                     .map(|s| format!("{s} "))
-                    .unwrap_or_else(|| String::new()),
+                    .unwrap_or_else(String::new),
                 msg.as_ref()
             );
         }

From 0794f30c2ff9b6ebb28176e95ca920259a4997c9 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Fri, 10 Oct 2025 14:37:13 +0200
Subject: [PATCH 08/23] improve

---
 src/utils/progress.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index 1bbe87bf67..03dcc6a38f 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -100,7 +100,7 @@ impl ProgressBar {
                 self.prefix
                     .as_deref()
                     .map(|s| format!("{s} "))
-                    .unwrap_or_else(String::new),
+                    .unwrap_or_default();
                 msg.as_ref()
             );
         }

From adbebfa67e8aa8e7077ef40f6fa4394d37691551 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Fri, 10 Oct 2025 14:39:16 +0200
Subject: [PATCH 09/23] improve

---
 src/utils/progress.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index 03dcc6a38f..76719a7c0b 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -15,7 +15,7 @@ pub fn use_progress_bar() -> bool {
     if env::var("SENTRY_NO_PROGRESS_BAR") == Ok("1".into()) {
         return false;
     }
-    std::io::stdout().is_terminal() && std::io::stderr().is_terminal()
+    std::io::stdout().is_terminal()
 }
 
 /// Wrapper that optionally holds a progress bar.

From 12795b64f999e67808f6d57d410739b80cb1f268 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Fri, 10 Oct 2025 14:44:14 +0200
Subject: [PATCH 10/23] improve

---
 src/utils/progress.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index 76719a7c0b..6c2fcf54d4 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -100,7 +100,7 @@ impl ProgressBar {
                 self.prefix
                     .as_deref()
                     .map(|s| format!("{s} "))
-                    .unwrap_or_default();
+                    .unwrap_or_default(),
                 msg.as_ref()
             );
         }

From 912bb2d1c8ed0def5681d866b063761eaa477691 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Fri, 10 Oct 2025 14:47:52 +0200
Subject: [PATCH 11/23] changelog

---
 CHANGELOG.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d69ef8fb3..23bb9c281b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 "You know what they say. Fool me once, strike one, but fool me twice... strike three." — Michael Scott
 
+## Unreleased
+
+### Fixes
+
+- Don't use hidden progress bar ([#2830](https://github.com/getsentry/sentry-cli/pull/2830)) by @lcian
+  - Fixed an issue where log messages would not show up when redirecting stdout to a file and using any subcommand that uses a progress bar, such as `sentry-cli debug-files bundle-jvm` and `sentry-cli sourcemaps upload`.
+
 ## 2.56.1
 
 ### Deprecations
@@ -444,7 +451,7 @@ We made several refactors and added several tests in this release. These changes
 
 <details>
 <summary><h3>Changes to tests</h3></summary>
-  
+
 - ref(test): Broaden `with_header_matcher` types (#2261) by @szokeasaurusrex
 - ref(test): Accept `impl Into<Matcher>` for `with_matcher` (#2260) by @szokeasaurusrex
 - ref(test): Align `with_reponse_body` parameter to `mockito` (#2259) by @szokeasaurusrex

From cea674003b3976dbaab5e815a0b82ae2481bec47 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Fri, 10 Oct 2025 14:58:48 +0200
Subject: [PATCH 12/23] update test

---
 .../upload/debug_files-upload-mixed-embedded-sources.trycmd    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd b/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
index 2bd43d4ac9..74bd2b1687 100644
--- a/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
+++ b/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
@@ -4,7 +4,10 @@ $ sentry-cli --log-level=debug debug-files upload --include-sources tests/integr
   INFO    [..] Loaded config from [CWD]/.sentryclirc
 ...
 > Found 1 debug information file (1 with embedded sources)
+  DEBUG   [..] > SrcGenSampleApp.pdb
+...
 > Resolved source code for 0 debug information files
+  DEBUG   [..] > SrcGenSampleApp.pdb
 > Prepared debug information file for upload
 ...
 

From 0f75ca19fabb5bc59227f5c8cd8f62552c27f92c Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Fri, 10 Oct 2025 15:22:39 +0200
Subject: [PATCH 13/23] improve

---
 src/utils/progress.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index 6c2fcf54d4..bee6236357 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -15,7 +15,7 @@ pub fn use_progress_bar() -> bool {
     if env::var("SENTRY_NO_PROGRESS_BAR") == Ok("1".into()) {
         return false;
     }
-    std::io::stdout().is_terminal()
+    std::io::stdout().is_terminal() && std::io::stderr().is_terminal()
 }
 
 /// Wrapper that optionally holds a progress bar.

From 43e12ceaf75f87535846dbd60d632df5562d696e Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Fri, 10 Oct 2025 15:23:49 +0200
Subject: [PATCH 14/23] improve

---
 src/utils/progress.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index bee6236357..cc912fd5b7 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -15,7 +15,7 @@ pub fn use_progress_bar() -> bool {
     if env::var("SENTRY_NO_PROGRESS_BAR") == Ok("1".into()) {
         return false;
     }
-    std::io::stdout().is_terminal() && std::io::stderr().is_terminal()
+    std::io::stderr().is_terminal()
 }
 
 /// Wrapper that optionally holds a progress bar.

From fddd24599c1dd7c6c7975ce68a98696fb39dc937 Mon Sep 17 00:00:00 2001
From: Lorenzo Cian <17258265+lcian@users.noreply.github.com>
Date: Fri, 10 Oct 2025 15:26:01 +0200
Subject: [PATCH 15/23] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23bb9c281b..cfbdd645a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 ### Fixes
 
 - Don't use hidden progress bar ([#2830](https://github.com/getsentry/sentry-cli/pull/2830)) by @lcian
-  - Fixed an issue where log messages would not show up when redirecting stdout to a file and using any subcommand that uses a progress bar, such as `sentry-cli debug-files bundle-jvm` and `sentry-cli sourcemaps upload`.
+  - Fixed an issue where log messages would not show up when redirecting stderr to a file and using any subcommand that uses a progress bar, such as `sentry-cli debug-files bundle-jvm` and `sentry-cli sourcemaps upload`.
 
 ## 2.56.1
 
@@ -451,7 +451,7 @@ We made several refactors and added several tests in this release. These changes
 
 <details>
 <summary><h3>Changes to tests</h3></summary>
-
+  
 - ref(test): Broaden `with_header_matcher` types (#2261) by @szokeasaurusrex
 - ref(test): Accept `impl Into<Matcher>` for `with_matcher` (#2260) by @szokeasaurusrex
 - ref(test): Align `with_reponse_body` parameter to `mockito` (#2259) by @szokeasaurusrex

From db0c9ec7806ec6d3a1bbe3490f575057241f4aef Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Wed, 15 Oct 2025 15:51:20 +0200
Subject: [PATCH 16/23] address feedback

---
 src/utils/progress.rs | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index cc912fd5b7..722bd16079 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -24,7 +24,6 @@ pub fn use_progress_bar() -> bool {
 pub struct ProgressBar {
     inner: Option<Arc<indicatif::ProgressBar>>,
     start: Instant,
-    prefix: Option<String>,
 }
 
 impl ProgressBar {
@@ -50,7 +49,6 @@ impl ProgressBar {
         ProgressBar {
             inner: Some(inner),
             start: Instant::now(),
-            prefix: None,
         }
     }
 
@@ -58,7 +56,6 @@ impl ProgressBar {
         ProgressBar {
             inner: None,
             start: Instant::now(),
-            prefix: None,
         }
     }
 
@@ -74,7 +71,7 @@ impl ProgressBar {
             inner.finish_with_message(&msg);
             logging::set_progress_bar(None);
         } else {
-            log::info!("> {msg}");
+            eprintln!("> {msg}");
         }
     }
 
@@ -94,15 +91,6 @@ impl ProgressBar {
     pub fn set_message<S: AsRef<str>>(&self, msg: S) {
         if let Some(inner) = &self.inner {
             inner.set_message(msg.as_ref());
-        } else {
-            log::debug!(
-                "{}{}",
-                self.prefix
-                    .as_deref()
-                    .map(|s| format!("{s} "))
-                    .unwrap_or_default(),
-                msg.as_ref()
-            );
         }
     }
 
@@ -115,8 +103,6 @@ impl ProgressBar {
     pub fn set_prefix<S: AsRef<str>>(&mut self, prefix: S) {
         if let Some(inner) = &self.inner {
             inner.set_prefix(prefix.as_ref());
-        } else {
-            self.prefix = Some(prefix.as_ref().to_owned());
         }
     }
 

From b11a94a2314d71f5090078f6bc7b38d4f852e27e Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:01:18 +0200
Subject: [PATCH 17/23] remove now useless mut

---
 src/commands/debug_files/find.rs |  2 +-
 src/utils/chunks/upload.rs       |  2 +-
 src/utils/dif_upload/mod.rs      | 10 +++++-----
 src/utils/file_search.rs         |  2 +-
 src/utils/file_upload.rs         |  2 +-
 src/utils/progress.rs            |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/commands/debug_files/find.rs b/src/commands/debug_files/find.rs
index f1e1fa907d..52843dc856 100644
--- a/src/commands/debug_files/find.rs
+++ b/src/commands/debug_files/find.rs
@@ -117,7 +117,7 @@ fn find_ids(
         .filter(|e| e.file_type().is_file());
 
     let mut found_files = vec![];
-    let mut pb = ProgressBar::new_spinner();
+    let pb = ProgressBar::new_spinner();
     pb.set_style(
         ProgressStyle::default_spinner()
             .tick_chars("/|\\- ")
diff --git a/src/utils/chunks/upload.rs b/src/utils/chunks/upload.rs
index 7425fe104f..a05c8425af 100644
--- a/src/utils/chunks/upload.rs
+++ b/src/utils/chunks/upload.rs
@@ -182,7 +182,7 @@ where
     );
 
     let api = Api::current();
-    let mut pb = ProgressBar::new(chunked_objects.len());
+    let pb = ProgressBar::new(chunked_objects.len());
     pb.set_style(progress_style);
     pb.set_prefix(">");
 
diff --git a/src/utils/dif_upload/mod.rs b/src/utils/dif_upload/mod.rs
index 9f4b6a9344..1e28c2e016 100644
--- a/src/utils/dif_upload/mod.rs
+++ b/src/utils/dif_upload/mod.rs
@@ -636,7 +636,7 @@ fn search_difs(options: &DifUpload) -> Result<Vec<DifMatch<'static>>> {
          \n  found {prefix:.yellow} {msg:.dim}",
     );
 
-    let mut pb = ProgressBar::new_spinner();
+    let pb = ProgressBar::new_spinner();
     pb.enable_steady_tick(100);
     pb.set_style(progress_style);
 
@@ -958,7 +958,7 @@ where
          \n{wide_bar}  {pos}/{len}",
     );
 
-    let mut pb = ProgressBar::new(items.len());
+    let pb = ProgressBar::new(items.len());
     pb.set_style(progress_style);
     pb.set_prefix(">");
 
@@ -1019,7 +1019,7 @@ fn process_symbol_maps<'a>(
          \n{wide_bar}  {pos}/{len}",
     );
 
-    let mut pb = ProgressBar::new(len);
+    let pb = ProgressBar::new(len);
     pb.set_style(progress_style);
     pb.set_prefix(">");
 
@@ -1110,7 +1110,7 @@ fn create_source_bundles<'a>(
          \n{wide_bar}  {pos}/{len}",
     );
 
-    let mut pb = ProgressBar::new(difs.len());
+    let pb = ProgressBar::new(difs.len());
     pb.set_style(progress_style);
     pb.set_prefix(">");
 
@@ -1166,7 +1166,7 @@ fn create_il2cpp_mappings<'a>(difs: &[DifMatch<'a>]) -> Result<Vec<DifMatch<'a>>
          \n{wide_bar}  {pos}/{len}",
     );
 
-    let mut pb = ProgressBar::new(difs.len());
+    let pb = ProgressBar::new(difs.len());
     pb.set_style(progress_style);
     pb.set_prefix(">");
 
diff --git a/src/utils/file_search.rs b/src/utils/file_search.rs
index 1fdb50fb14..dab73b4035 100644
--- a/src/utils/file_search.rs
+++ b/src/utils/file_search.rs
@@ -98,7 +98,7 @@ impl ReleaseFileSearch {
         \n  found {prefix:.yellow} {msg:.dim}",
         );
 
-        let mut pb = ProgressBar::new_spinner();
+        let pb = ProgressBar::new_spinner();
         pb.enable_steady_tick(100);
         pb.set_style(progress_style);
 
diff --git a/src/utils/file_upload.rs b/src/utils/file_upload.rs
index bdcfe74687..402a8e608a 100644
--- a/src/utils/file_upload.rs
+++ b/src/utils/file_upload.rs
@@ -714,7 +714,7 @@ fn build_artifact_bundle(
        \n{wide_bar}  {pos}/{len}",
     );
 
-    let mut pb = ProgressBar::new(files.len());
+    let pb = ProgressBar::new(files.len());
     pb.set_style(progress_style);
     pb.set_prefix(">");
 
diff --git a/src/utils/progress.rs b/src/utils/progress.rs
index 722bd16079..0293c7694d 100644
--- a/src/utils/progress.rs
+++ b/src/utils/progress.rs
@@ -100,7 +100,7 @@ impl ProgressBar {
         }
     }
 
-    pub fn set_prefix<S: AsRef<str>>(&mut self, prefix: S) {
+    pub fn set_prefix<S: AsRef<str>>(&self, prefix: S) {
         if let Some(inner) = &self.inner {
             inner.set_prefix(prefix.as_ref());
         }

From 638f23aa77789908c6c8901458a3b49593daf874 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:11:23 +0200
Subject: [PATCH 18/23] TRYCMD=overwrite cargo test --workspace

---
 .../build/build-upload-apk-all-uploaded.trycmd     |  3 ++-
 .../_cases/build/build-upload-apk.trycmd           |  4 +++-
 .../_cases/build/build-upload-ipa.trycmd           |  3 ++-
 .../debug_files-bundle-jvm-input-dir-empty.trycmd  |  3 ++-
 .../debug_files-bundle-jvm-output-is-file.trycmd   |  3 ++-
 .../debug_files-bundle-jvm-output-not-found.trycmd |  3 ++-
 .../bundle_jvm/debug_files-bundle-jvm.trycmd       |  3 ++-
 ...ebug_files-upload-mixed-embedded-sources.trycmd |  3 +--
 .../xcode-upload-source-maps-invalid-plist.trycmd  |  2 ++
 ...ad-source-maps-release_and_dist_from_env.trycmd |  8 +++++++-
 .../releases-files-upload-sourcemaps.trycmd        |  1 +
 .../sourcemaps/sourcemaps-inject-bundlers.trycmd   |  1 +
 .../sourcemaps-inject-double-association.trycmd    |  1 +
 .../sourcemaps/sourcemaps-inject-embedded.trycmd   |  1 +
 .../sourcemaps/sourcemaps-inject-nomappings.trycmd |  1 +
 .../sourcemaps-inject-split-ambiguous.trycmd       |  7 ++++---
 .../sourcemaps/sourcemaps-inject-split.trycmd      |  1 +
 .../_cases/sourcemaps/sourcemaps-inject.trycmd     |  1 +
 .../sourcemaps-upload-debugid-alias.trycmd         |  8 +++++++-
 ...ad-file-hermes-bundle-reference-debug-id.trycmd |  6 ++++++
 .../sourcemaps-upload-file-ram-bundle.trycmd       |  8 +++++++-
 .../sourcemaps-upload-indexed-ram-bundle.trycmd    |  8 +++++++-
 .../sourcemaps/sourcemaps-upload-modern.trycmd     | 14 +++++++++++++-
 .../sourcemaps-upload-no-debugids.trycmd           |  2 ++
 .../sourcemaps/sourcemaps-upload-no-dedupe.trycmd  |  9 ++++++++-
 .../sourcemaps-upload-skip-already-uploaded.trycmd |  9 ++++++++-
 .../sourcemaps-upload-some-debugids.trycmd         | 14 +++++++++++++-
 ...urcemaps-upload-successfully-upload-file.trycmd |  9 ++++++++-
 28 files changed, 115 insertions(+), 21 deletions(-)

diff --git a/tests/integration/_cases/build/build-upload-apk-all-uploaded.trycmd b/tests/integration/_cases/build/build-upload-apk-all-uploaded.trycmd
index b3b929bf40..4ac4c06677 100644
--- a/tests/integration/_cases/build/build-upload-apk-all-uploaded.trycmd
+++ b/tests/integration/_cases/build/build-upload-apk-all-uploaded.trycmd
@@ -2,7 +2,8 @@
 $ sentry-cli build upload tests/integration/_fixtures/build/apk.apk
 ? success
   WARN    [..] EXPERIMENTAL: The build subcommand is experimental. The command is subject to breaking changes and may be removed without notice in any release.
+> Preparing for upload completed in 0s
 Successfully uploaded 1 file to Sentry
-  - tests/integration/_fixtures/build/apk.apk (http[..]/wat-org/preprod/wat-project/42)
+  - tests/integration/_fixtures/build/apk.apk (https://sentry.io/wat-org/preprod/wat-project/42)
 
 ```
diff --git a/tests/integration/_cases/build/build-upload-apk.trycmd b/tests/integration/_cases/build/build-upload-apk.trycmd
index f4625f9d93..56762eb43d 100644
--- a/tests/integration/_cases/build/build-upload-apk.trycmd
+++ b/tests/integration/_cases/build/build-upload-apk.trycmd
@@ -2,7 +2,9 @@
 $ sentry-cli build upload tests/integration/_fixtures/build/apk.apk --head-sha test_head_sha
 ? success
   WARN    [..] EXPERIMENTAL: The build subcommand is experimental. The command is subject to breaking changes and may be removed without notice in any release.
+> Preparing for upload completed in 0s
+> Uploading completed in 0.103s
 Successfully uploaded 1 file to Sentry
-  - tests/integration/_fixtures/build/apk.apk (http[..]/wat-org/preprod/wat-project/42)
+  - tests/integration/_fixtures/build/apk.apk (http://sentry.io/wat-org/preprod/wat-project/42)
 
 ```
diff --git a/tests/integration/_cases/build/build-upload-ipa.trycmd b/tests/integration/_cases/build/build-upload-ipa.trycmd
index 375b3dc1d6..d5a7aadb06 100644
--- a/tests/integration/_cases/build/build-upload-ipa.trycmd
+++ b/tests/integration/_cases/build/build-upload-ipa.trycmd
@@ -2,7 +2,8 @@
 $ sentry-cli build upload tests/integration/_fixtures/build/ipa.ipa --head-sha test_head_sha
 ? success
   WARN    [..] EXPERIMENTAL: The build subcommand is experimental. The command is subject to breaking changes and may be removed without notice in any release.
+> Preparing for upload completed in 0s
 Successfully uploaded 1 file to Sentry
-  - tests/integration/_fixtures/build/ipa.ipa (http[..]/wat-org/preprod/wat-project/some-text-id)
+  - tests/integration/_fixtures/build/ipa.ipa (http://sentry.io/wat-org/preprod/wat-project/some-text-id)
 
 ```
diff --git a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-input-dir-empty.trycmd b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-input-dir-empty.trycmd
index b7cb28d0d2..ae298530b0 100644
--- a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-input-dir-empty.trycmd
+++ b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-input-dir-empty.trycmd
@@ -2,8 +2,9 @@
 $ sentry-cli debug-files bundle-jvm --output . --debug-id 48dee70b-4f3f-4a49-9223-de441738f7cd empty-dir
 ? success
 > Found 0 files
+> Bundling completed in 0.005s
 > Bundled 0 files for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: 48dee70b-4f3f-4a49-9223-de441738f7cd
 Created ./48dee70b-4f3f-4a49-9223-de441738f7cd.zip
 
 ```
diff --git a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-is-file.trycmd b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-is-file.trycmd
index 5520b51cc7..56bf8e04dc 100644
--- a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-is-file.trycmd
+++ b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-is-file.trycmd
@@ -2,8 +2,9 @@
 $ sentry-cli debug-files bundle-jvm --output ./file.txt --debug-id D384DC3B-AB2F-4DC7-903D-2C851E27E094 ./io
 ? failed
 > Found 2 files
+> Bundling completed in 0.012s
 > Bundled 2 files for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: d384dc3b-ab2f-4dc7-903d-2c851e27e094
 error: Unable to write source bundle
 
 Caused by:
diff --git a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-not-found.trycmd b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-not-found.trycmd
index 4bbf0b0c64..b7a6bb1ed8 100644
--- a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-not-found.trycmd
+++ b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-not-found.trycmd
@@ -2,8 +2,9 @@
 $ sentry-cli debug-files bundle-jvm --output i-do-not-exist --debug-id 0B693ABA-531C-4EB6-99E4-B7320C3C85DA jvm
 ? success
 > Found 2 files
+> Bundling completed in 0.012s
 > Bundled 2 files for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: 0b693aba-531c-4eb6-99e4-b7320c3c85da
 Created i-do-not-exist/0b693aba-531c-4eb6-99e4-b7320c3c85da.zip
 
 ```
diff --git a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm.trycmd b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm.trycmd
index a3f6be3437..d2d10d0b68 100644
--- a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm.trycmd
+++ b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm.trycmd
@@ -2,8 +2,9 @@
 $ sentry-cli debug-files bundle-jvm --output . --debug-id a4368a48-0880-40d7-9a26-c9ef5a84d156 ./io
 ? success
 > Found 2 files
+> Bundling completed in 0.017s
 > Bundled 2 files for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: a4368a48-0880-40d7-9a26-c9ef5a84d156
 Created ./a4368a48-0880-40d7-9a26-c9ef5a84d156.zip
 
 ```
diff --git a/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd b/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
index 74bd2b1687..1703ad5c35 100644
--- a/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
+++ b/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
@@ -4,10 +4,9 @@ $ sentry-cli --log-level=debug debug-files upload --include-sources tests/integr
   INFO    [..] Loaded config from [CWD]/.sentryclirc
 ...
 > Found 1 debug information file (1 with embedded sources)
-  DEBUG   [..] > SrcGenSampleApp.pdb
+  DEBUG   2025-10-15 16:02:36.445165 +02:00 trying to collect sources for SrcGenSampleApp.pdb
 ...
 > Resolved source code for 0 debug information files
-  DEBUG   [..] > SrcGenSampleApp.pdb
 > Prepared debug information file for upload
 ...
 
diff --git a/tests/integration/_cases/react_native/xcode-upload-source-maps-invalid-plist.trycmd b/tests/integration/_cases/react_native/xcode-upload-source-maps-invalid-plist.trycmd
index faf097c98a..c06817c437 100644
--- a/tests/integration/_cases/react_native/xcode-upload-source-maps-invalid-plist.trycmd
+++ b/tests/integration/_cases/react_native/xcode-upload-source-maps-invalid-plist.trycmd
@@ -5,7 +5,9 @@ react-native-xcode.sh called with args:
 Using React Native Packager bundle and source map.
 Processing react-native sourcemaps for Sentry upload.
 > Analyzing 2 sources
+> Analyzing completed in 0s
 > Rewriting sources
+> Rewriting completed in 0s
 > Adding source map references
 error: Info.plist was not found or an parsing error occurred
 
diff --git a/tests/integration/_cases/react_native/xcode-upload-source-maps-release_and_dist_from_env.trycmd b/tests/integration/_cases/react_native/xcode-upload-source-maps-release_and_dist_from_env.trycmd
index 7aaee62536..0a78f630cc 100644
--- a/tests/integration/_cases/react_native/xcode-upload-source-maps-release_and_dist_from_env.trycmd
+++ b/tests/integration/_cases/react_native/xcode-upload-source-maps-release_and_dist_from_env.trycmd
@@ -8,11 +8,17 @@ react-native-xcode.sh called with args:
 Using React Native Packager bundle and source map.
 Processing react-native sourcemaps for Sentry upload.
 > Analyzing 2 sources
+> Analyzing completed in 0s
 > Rewriting sources
+> Rewriting completed in 0s
 > Adding source map references
+> Bundling completed in 0.023s
 > Bundled 2 files for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: d1c0c04c-7540-5c1a-9f16-872493ee070d
+> Optimizing completed in 0s
+> Uploading completed in 0.003s
 > Uploaded files to Sentry
+> Processing completed in 0s
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/releases/releases-files-upload-sourcemaps.trycmd b/tests/integration/_cases/releases/releases-files-upload-sourcemaps.trycmd
index 0d639cb487..893cee8817 100644
--- a/tests/integration/_cases/releases/releases-files-upload-sourcemaps.trycmd
+++ b/tests/integration/_cases/releases/releases-files-upload-sourcemaps.trycmd
@@ -3,6 +3,7 @@ $ sentry-cli releases files wat-release upload-sourcemaps --url-prefix '~/assets
 ? success
 ⚠ DEPRECATION NOTICE: This functionality will be removed in a future version of `sentry-cli`. Use the `sourcemaps` command instead.
 > Rewriting sources
+> Rewriting completed in 0s
 > Adding source map references
 > Nothing to upload
 
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject-bundlers.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject-bundlers.trycmd
index adcd32fa2a..47f1bf9f19 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject-bundlers.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject-bundlers.trycmd
@@ -4,6 +4,7 @@ $ sentry-cli sourcemaps inject .
 > Searching .
 > Found 18 files
 > Analyzing 18 sources
+> Analyzing completed in 0s
 > Injecting debug ids
 
 Source Map Debug ID Injection Report
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject-double-association.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject-double-association.trycmd
index ceb04440fb..d73b41c3ec 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject-double-association.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject-double-association.trycmd
@@ -4,6 +4,7 @@ $ sentry-cli sourcemaps inject ./
 > Searching ./
 > Found 11 files
 > Analyzing 11 sources
+> Analyzing completed in 0s
 > Injecting debug ids
 
 Source Map Debug ID Injection Report
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject-embedded.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject-embedded.trycmd
index 62a5b84a1b..dc6869ee9e 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject-embedded.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject-embedded.trycmd
@@ -4,6 +4,7 @@ $ sentry-cli sourcemaps inject .
 > Searching .
 > Found 1 file
 > Analyzing 1 sources
+> Analyzing completed in 0s
 > Injecting debug ids
 
 Source Map Debug ID Injection Report
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject-nomappings.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject-nomappings.trycmd
index 547ad0dbf4..dd409b132e 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject-nomappings.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject-nomappings.trycmd
@@ -6,6 +6,7 @@ $ sentry-cli sourcemaps inject ./server ./static
 > Searching ./static
 > Found 8 files
 > Analyzing 19 sources
+> Analyzing completed in 0.028s
 > Injecting debug ids
 
 Source Map Debug ID Injection Report
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject-split-ambiguous.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject-split-ambiguous.trycmd
index 4d9cd2fd61..6098740e27 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject-split-ambiguous.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject-split-ambiguous.trycmd
@@ -8,10 +8,11 @@ $ sentry-cli sourcemaps inject ./code ./maps ./maps2 --log-level warn
 > Searching ./maps2
 > Found 1 file
 > Analyzing 5 sources
+> Analyzing completed in 0s
 > Injecting debug ids
-  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] Ambiguous matches for sourcemap path ./code/foo/index.js.map:
-  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] ./maps/foo/index.js.map
-  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] ./maps2/foo/index.js.map
+  WARN    2025-10-15 16:02:36.907355 +02:00 Ambiguous matches for sourcemap path ./code/foo/index.js.map:
+  WARN    2025-10-15 16:02:36.907899 +02:00 ./maps/foo/index.js.map
+  WARN    2025-10-15 16:02:36.907909 +02:00 ./maps2/foo/index.js.map
 
 Source Map Debug ID Injection Report
   Modified: The following source files have been modified to have debug ids
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject-split.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject-split.trycmd
index b88097c090..3dc3341f42 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject-split.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject-split.trycmd
@@ -6,6 +6,7 @@ $ sentry-cli sourcemaps inject ./code ./maps
 > Searching ./maps
 > Found 2 files
 > Analyzing 4 sources
+> Analyzing completed in 0s
 > Injecting debug ids
 
 Source Map Debug ID Injection Report
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject.trycmd
index ff97c5d7a0..fb47f6a5b1 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject.trycmd
@@ -6,6 +6,7 @@ $ sentry-cli sourcemaps inject ./server ./static
 > Searching ./static
 > Found 8 files
 > Analyzing 24 sources
+> Analyzing completed in 0.026s
 > Injecting debug ids
 
 Source Map Debug ID Injection Report
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-debugid-alias.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-debugid-alias.trycmd
index 90efc2ed53..720892fe7a 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-debugid-alias.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-debugid-alias.trycmd
@@ -3,11 +3,17 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/upload_debugid_alias
 ? success
 > Found 2 files
 > Analyzing 2 sources
+> Analyzing completed in 0s
 > Rewriting sources
+> Rewriting completed in 0s
 > Adding source map references
+> Bundling completed in 0.018s
 > Bundled 2 files for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: 267ff9c5-2d00-5fb5-9a19-00978fbfd398
+> Optimizing completed in 0s
+> Uploading completed in 0.002s
 > Uploaded files to Sentry
+> Processing completed in 0.001s
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-hermes-bundle-reference-debug-id.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-hermes-bundle-reference-debug-id.trycmd
index 03ab6cc3bc..468ec545fd 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-hermes-bundle-reference-debug-id.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-hermes-bundle-reference-debug-id.trycmd
@@ -3,11 +3,17 @@ $ sentry-cli sourcemaps upload --bundle tests/integration/_fixtures/file-hermes-
 ? success
   WARN    [..] Regular bundle found
 > Analyzing 2 sources
+> Analyzing completed in 0.065s
 > Rewriting sources
+> Rewriting completed in 0.511s
 > Adding source map references
+> Bundling completed in 1.113s
 > Bundled 2 files for upload
 > Bundle ID: 0b10dfbf-7d11-52a5-9107-d16f625896ad
+> Optimizing completed in 0.045s
+> Uploading completed in 0.011s
 > Uploaded files to Sentry
+> Processing completed in 0s
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-ram-bundle.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-ram-bundle.trycmd
index c62cd8a7c3..4ef02dd06b 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-ram-bundle.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-ram-bundle.trycmd
@@ -2,11 +2,17 @@
 $ sentry-cli sourcemaps upload --bundle tests/integration/_fixtures/file-ram-bundle/index.android.bundle --bundle-sourcemap tests/integration/_fixtures/file-ram-bundle/index.android.bundle.packager.map --release=wat-release
 ? success
 > Analyzing 1 sources
+> Analyzing completed in 0s
 > Rewriting sources
+> Rewriting completed in 0.008s
 > Adding source map references
+> Bundling completed in 0.086s
 > Bundled 14 files for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: 388c172d-ba7d-53f3-b533-66ace21dfd78
+> Optimizing completed in 0.001s
+> Uploading completed in 0.002s
 > Uploaded files to Sentry
+> Processing completed in 0s
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-indexed-ram-bundle.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-indexed-ram-bundle.trycmd
index 613e717b43..58bf9b16ac 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-indexed-ram-bundle.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-indexed-ram-bundle.trycmd
@@ -2,11 +2,17 @@
 $ sentry-cli sourcemaps upload --bundle tests/integration/_fixtures/indexed-ram-bundle/main.jsbundle --bundle-sourcemap tests/integration/_fixtures/indexed-ram-bundle/main.jsbundle.packager.map --release=wat-release
 ? success
 > Analyzing 1 sources
+> Analyzing completed in 0s
 > Rewriting sources
+> Rewriting completed in 0.7s
 > Adding source map references
+> Bundling completed in 9.755s
 > Bundled 2107 files for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: 42cba25d-4463-546b-b515-bbe467fca122
+> Optimizing completed in 0.098s
+> Uploading completed in 0.02s
 > Uploaded files to Sentry
+> Processing completed in 0s
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-modern.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-modern.trycmd
index 277828294c..014af98b9e 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-modern.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-modern.trycmd
@@ -4,11 +4,17 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/bundle.min.js.map tes
 > Found 1 file
 > Found 1 file
 > Analyzing 2 sources
+> Analyzing completed in 0s
 > Rewriting sources
+> Rewriting completed in 0.001s
 > Adding source map references
+> Bundling completed in 0.019s
 > Bundled 2 files for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: ef321dda-d768-5296-82da-0e5150e02a27
+> Optimizing completed in 0s
+> Uploading completed in 0.005s
 > Uploaded files to Sentry
+> Processing completed in 0s
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
@@ -16,6 +22,12 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/bundle.min.js.map tes
 > Dist: None
 > Upload type: artifact bundle
 
+Source Map Upload Report
+  Source Maps
+    ~/bundle.min.js.map
+    ~/vendor.min.js.map
+
+
 Source Map Upload Report
   Source Maps
     ~/bundle.min.js.map
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-debugids.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-debugids.trycmd
index be66b68e7a..6e44ebe038 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-debugids.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-debugids.trycmd
@@ -3,7 +3,9 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/upload_no_debugids
 ? 1
 > Found 20 files
 > Analyzing 20 sources
+> Analyzing completed in 0.025s
 > Rewriting sources
+> Rewriting completed in 0.244s
 > Adding source map references
 error: Cannot upload: You must either specify a release or have debug ids injected into your sources
 
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-dedupe.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-dedupe.trycmd
index 0cabf9902f..29d061fbf9 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-dedupe.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-dedupe.trycmd
@@ -4,11 +4,18 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/bundle.min.js.map tes
 > Found 1 file
 > Found 1 file
 > Analyzing 2 sources
+> Analyzing completed in 0s
 > Rewriting sources
+> Rewriting completed in 0s
 > Adding source map references
+> Bundling completed in 0.014s
 > Bundled 2 files for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: ef321dda-d768-5296-82da-0e5150e02a27
+> Optimizing completed in 0s
+> Uploading completed in 0.004s
 > Uploaded files to Sentry
+  WARN    2025-10-15 16:02:36.982072 +02:00 [DEPRECATION NOTICE] Your Sentry server does not support artifact bundle uploads. Falling back to deprecated release bundle upload. Support for this deprecated upload method will be removed in Sentry CLI 3.0.0. Please upgrade your Sentry server, or if you cannot upgrade, pin your Sentry CLI version to 2.x, so you don't get upgraded to 3.x when it is released.
+> Processing completed in 0.002s
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-skip-already-uploaded.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-skip-already-uploaded.trycmd
index b300f9c29d..d9dc50e99c 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-skip-already-uploaded.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-skip-already-uploaded.trycmd
@@ -4,11 +4,18 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/bundle.min.js.map tes
 > Found 1 file
 > Found 1 file
 > Analyzing 2 sources
+> Analyzing completed in 0s
 > Rewriting sources
+> Rewriting completed in 0s
 > Adding source map references
+> Bundling completed in 0.011s
 > Bundled 1 file for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: 0648a722-b56c-560f-bb28-ee2d8df113d0
+> Optimizing completed in 0s
+> Uploading completed in 0.003s
 > Uploaded files to Sentry
+  WARN    2025-10-15 16:02:37.000664 +02:00 [DEPRECATION NOTICE] Your Sentry server does not support artifact bundle uploads. Falling back to deprecated release bundle upload. Support for this deprecated upload method will be removed in Sentry CLI 3.0.0. Please upgrade your Sentry server, or if you cannot upgrade, pin your Sentry CLI version to 2.x, so you don't get upgraded to 3.x when it is released.
+> Processing completed in 0.001s
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-some-debugids.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-some-debugids.trycmd
index be5b8e9f18..9985c770b9 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-some-debugids.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-some-debugids.trycmd
@@ -3,7 +3,9 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/upload_some_debugids
 ? success
 > Found 20 files
 > Analyzing 20 sources
+> Analyzing completed in 0.035s
 > Rewriting sources
+> Rewriting completed in 0.239s
 > Adding source map references
   WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] Some source files don't have debug ids:
   WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/server/app/page.js
@@ -13,9 +15,13 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/upload_some_debugids
   WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/server/pages/api/hello.js
   WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/static/chunks/575-bb7d7e0e6de8d623.js
   WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/static/chunks/pages/asdf-05b39167abbe433b.js
+> Bundling completed in 0.542s
 > Bundled 20 files for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: b398cc10-5607-5c32-b6b7-eae773f1ac77
+> Optimizing completed in 0.02s
+> Uploading completed in 0.005s
 > Uploaded files to Sentry
+> Processing completed in 0s
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
@@ -51,4 +57,10 @@ Source Map Upload Report
     ~/static/chunks/app/client/page-d5742c254d9533f8.js.map
     ~/static/chunks/pages/asdf-05b39167abbe433b.js.map (debug id 2297b93d-928d-421e-8910-127c786382df)
 
+    ~/server/pages/_document.js.map
+    ~/server/pages/asdf.js.map
+    ~/static/chunks/575-bb7d7e0e6de8d623.js.map
+    ~/static/chunks/app/client/page-d5742c254d9533f8.js.map
+    ~/static/chunks/pages/asdf-05b39167abbe433b.js.map (debug id 2297b93d-928d-421e-8910-127c786382df)
+
 ```
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-successfully-upload-file.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-successfully-upload-file.trycmd
index 19f4e03602..cfccbbd919 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-successfully-upload-file.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-successfully-upload-file.trycmd
@@ -3,11 +3,18 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/bundle.min.js.map --r
 ? success
 > Found 1 file
 > Analyzing 1 sources
+> Analyzing completed in 0s
 > Rewriting sources
+> Rewriting completed in 0s
 > Adding source map references
+> Bundling completed in 0.011s
 > Bundled 1 file for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: 0648a722-b56c-560f-bb28-ee2d8df113d0
+> Optimizing completed in 0s
+> Uploading completed in 0.002s
 > Uploaded files to Sentry
+  WARN    2025-10-15 16:02:37.034578 +02:00 [DEPRECATION NOTICE] Your Sentry server does not support artifact bundle uploads. Falling back to deprecated release bundle upload. Support for this deprecated upload method will be removed in Sentry CLI 3.0.0. Please upgrade your Sentry server, or if you cannot upgrade, pin your Sentry CLI version to 2.x, so you don't get upgraded to 3.x when it is released.
+> Processing completed in 0.001s
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project

From 7b8261c53834c9e3c514f6020ade51fce85d5f94 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:41:59 +0200
Subject: [PATCH 19/23] use wildcards in snapshot files

---
 .../build-upload-apk-all-uploaded.trycmd      |  2 +-
 .../_cases/build/build-upload-apk.trycmd      |  4 +-
 .../_cases/build/build-upload-ipa.trycmd      |  2 +-
 ...ug_files-bundle-jvm-input-dir-empty.trycmd |  4 +-
 ...bug_files-bundle-jvm-output-is-file.trycmd |  4 +-
 ...g_files-bundle-jvm-output-not-found.trycmd |  4 +-
 .../bundle_jvm/debug_files-bundle-jvm.trycmd  |  4 +-
 ...files-upload-mixed-embedded-sources.trycmd |  2 +-
 ...de-upload-source-maps-invalid-plist.trycmd |  4 +-
 ...urce-maps-release_and_dist_from_env.trycmd | 14 +++----
 .../releases-files-upload-sourcemaps.trycmd   |  2 +-
 .../sourcemaps-inject-bundlers.trycmd         |  2 +-
 ...ourcemaps-inject-double-association.trycmd |  2 +-
 .../sourcemaps-inject-embedded.trycmd         |  2 +-
 .../sourcemaps-inject-nomappings.trycmd       |  2 +-
 .../sourcemaps-inject-split-ambiguous.trycmd  |  8 ++--
 .../sourcemaps/sourcemaps-inject-split.trycmd |  2 +-
 .../sourcemaps/sourcemaps-inject.trycmd       |  2 +-
 .../sourcemaps-upload-debugid-alias.trycmd    | 14 +++----
 ...le-hermes-bundle-reference-debug-id.trycmd | 14 +++----
 .../sourcemaps-upload-file-ram-bundle.trycmd  | 14 +++----
 ...ourcemaps-upload-indexed-ram-bundle.trycmd | 14 +++----
 .../sourcemaps-upload-modern.trycmd           | 21 ++++-------
 .../sourcemaps-upload-no-debugids.trycmd      |  4 +-
 .../sourcemaps-upload-no-dedupe.trycmd        | 16 ++++----
 ...cemaps-upload-skip-already-uploaded.trycmd | 16 ++++----
 .../sourcemaps-upload-some-debugids.trycmd    | 37 ++++++++-----------
 ...aps-upload-successfully-upload-file.trycmd | 16 ++++----
 28 files changed, 109 insertions(+), 123 deletions(-)

diff --git a/tests/integration/_cases/build/build-upload-apk-all-uploaded.trycmd b/tests/integration/_cases/build/build-upload-apk-all-uploaded.trycmd
index 4ac4c06677..99cd44e520 100644
--- a/tests/integration/_cases/build/build-upload-apk-all-uploaded.trycmd
+++ b/tests/integration/_cases/build/build-upload-apk-all-uploaded.trycmd
@@ -2,7 +2,7 @@
 $ sentry-cli build upload tests/integration/_fixtures/build/apk.apk
 ? success
   WARN    [..] EXPERIMENTAL: The build subcommand is experimental. The command is subject to breaking changes and may be removed without notice in any release.
-> Preparing for upload completed in 0s
+> Preparing for upload completed in [..]
 Successfully uploaded 1 file to Sentry
   - tests/integration/_fixtures/build/apk.apk (https://sentry.io/wat-org/preprod/wat-project/42)
 
diff --git a/tests/integration/_cases/build/build-upload-apk.trycmd b/tests/integration/_cases/build/build-upload-apk.trycmd
index 56762eb43d..8780aa060d 100644
--- a/tests/integration/_cases/build/build-upload-apk.trycmd
+++ b/tests/integration/_cases/build/build-upload-apk.trycmd
@@ -2,8 +2,8 @@
 $ sentry-cli build upload tests/integration/_fixtures/build/apk.apk --head-sha test_head_sha
 ? success
   WARN    [..] EXPERIMENTAL: The build subcommand is experimental. The command is subject to breaking changes and may be removed without notice in any release.
-> Preparing for upload completed in 0s
-> Uploading completed in 0.103s
+> Preparing for upload completed in [..]
+> Uploading completed in [..]
 Successfully uploaded 1 file to Sentry
   - tests/integration/_fixtures/build/apk.apk (http://sentry.io/wat-org/preprod/wat-project/42)
 
diff --git a/tests/integration/_cases/build/build-upload-ipa.trycmd b/tests/integration/_cases/build/build-upload-ipa.trycmd
index d5a7aadb06..61679e815f 100644
--- a/tests/integration/_cases/build/build-upload-ipa.trycmd
+++ b/tests/integration/_cases/build/build-upload-ipa.trycmd
@@ -2,7 +2,7 @@
 $ sentry-cli build upload tests/integration/_fixtures/build/ipa.ipa --head-sha test_head_sha
 ? success
   WARN    [..] EXPERIMENTAL: The build subcommand is experimental. The command is subject to breaking changes and may be removed without notice in any release.
-> Preparing for upload completed in 0s
+> Preparing for upload completed in [..]
 Successfully uploaded 1 file to Sentry
   - tests/integration/_fixtures/build/ipa.ipa (http://sentry.io/wat-org/preprod/wat-project/some-text-id)
 
diff --git a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-input-dir-empty.trycmd b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-input-dir-empty.trycmd
index ae298530b0..87a08b0a67 100644
--- a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-input-dir-empty.trycmd
+++ b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-input-dir-empty.trycmd
@@ -2,9 +2,9 @@
 $ sentry-cli debug-files bundle-jvm --output . --debug-id 48dee70b-4f3f-4a49-9223-de441738f7cd empty-dir
 ? success
 > Found 0 files
-> Bundling completed in 0.005s
+> Bundling completed in [..]
 > Bundled 0 files for upload
-> Bundle ID: 48dee70b-4f3f-4a49-9223-de441738f7cd
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
 Created ./48dee70b-4f3f-4a49-9223-de441738f7cd.zip
 
 ```
diff --git a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-is-file.trycmd b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-is-file.trycmd
index 56bf8e04dc..bf002ebca1 100644
--- a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-is-file.trycmd
+++ b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-is-file.trycmd
@@ -2,9 +2,9 @@
 $ sentry-cli debug-files bundle-jvm --output ./file.txt --debug-id D384DC3B-AB2F-4DC7-903D-2C851E27E094 ./io
 ? failed
 > Found 2 files
-> Bundling completed in 0.012s
+> Bundling completed in [..]
 > Bundled 2 files for upload
-> Bundle ID: d384dc3b-ab2f-4dc7-903d-2c851e27e094
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
 error: Unable to write source bundle
 
 Caused by:
diff --git a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-not-found.trycmd b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-not-found.trycmd
index b7a6bb1ed8..9d6a109c25 100644
--- a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-not-found.trycmd
+++ b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm-output-not-found.trycmd
@@ -2,9 +2,9 @@
 $ sentry-cli debug-files bundle-jvm --output i-do-not-exist --debug-id 0B693ABA-531C-4EB6-99E4-B7320C3C85DA jvm
 ? success
 > Found 2 files
-> Bundling completed in 0.012s
+> Bundling completed in [..]
 > Bundled 2 files for upload
-> Bundle ID: 0b693aba-531c-4eb6-99e4-b7320c3c85da
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
 Created i-do-not-exist/0b693aba-531c-4eb6-99e4-b7320c3c85da.zip
 
 ```
diff --git a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm.trycmd b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm.trycmd
index d2d10d0b68..244adf1060 100644
--- a/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm.trycmd
+++ b/tests/integration/_cases/debug_files/bundle_jvm/debug_files-bundle-jvm.trycmd
@@ -2,9 +2,9 @@
 $ sentry-cli debug-files bundle-jvm --output . --debug-id a4368a48-0880-40d7-9a26-c9ef5a84d156 ./io
 ? success
 > Found 2 files
-> Bundling completed in 0.017s
+> Bundling completed in [..]
 > Bundled 2 files for upload
-> Bundle ID: a4368a48-0880-40d7-9a26-c9ef5a84d156
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
 Created ./a4368a48-0880-40d7-9a26-c9ef5a84d156.zip
 
 ```
diff --git a/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd b/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
index 1703ad5c35..4ddaacc46e 100644
--- a/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
+++ b/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
@@ -4,7 +4,7 @@ $ sentry-cli --log-level=debug debug-files upload --include-sources tests/integr
   INFO    [..] Loaded config from [CWD]/.sentryclirc
 ...
 > Found 1 debug information file (1 with embedded sources)
-  DEBUG   2025-10-15 16:02:36.445165 +02:00 trying to collect sources for SrcGenSampleApp.pdb
+  DEBUG   [..] trying to collect sources for SrcGenSampleApp.pdb
 ...
 > Resolved source code for 0 debug information files
 > Prepared debug information file for upload
diff --git a/tests/integration/_cases/react_native/xcode-upload-source-maps-invalid-plist.trycmd b/tests/integration/_cases/react_native/xcode-upload-source-maps-invalid-plist.trycmd
index c06817c437..1c8e52f607 100644
--- a/tests/integration/_cases/react_native/xcode-upload-source-maps-invalid-plist.trycmd
+++ b/tests/integration/_cases/react_native/xcode-upload-source-maps-invalid-plist.trycmd
@@ -5,9 +5,9 @@ react-native-xcode.sh called with args:
 Using React Native Packager bundle and source map.
 Processing react-native sourcemaps for Sentry upload.
 > Analyzing 2 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Rewriting sources
-> Rewriting completed in 0s
+> Rewriting completed in [..]
 > Adding source map references
 error: Info.plist was not found or an parsing error occurred
 
diff --git a/tests/integration/_cases/react_native/xcode-upload-source-maps-release_and_dist_from_env.trycmd b/tests/integration/_cases/react_native/xcode-upload-source-maps-release_and_dist_from_env.trycmd
index 0a78f630cc..e109e6f624 100644
--- a/tests/integration/_cases/react_native/xcode-upload-source-maps-release_and_dist_from_env.trycmd
+++ b/tests/integration/_cases/react_native/xcode-upload-source-maps-release_and_dist_from_env.trycmd
@@ -8,17 +8,17 @@ react-native-xcode.sh called with args:
 Using React Native Packager bundle and source map.
 Processing react-native sourcemaps for Sentry upload.
 > Analyzing 2 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Rewriting sources
-> Rewriting completed in 0s
+> Rewriting completed in [..]
 > Adding source map references
-> Bundling completed in 0.023s
+> Bundling completed in [..]
 > Bundled 2 files for upload
-> Bundle ID: d1c0c04c-7540-5c1a-9f16-872493ee070d
-> Optimizing completed in 0s
-> Uploading completed in 0.003s
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Optimizing completed in [..]
+> Uploading completed in [..]
 > Uploaded files to Sentry
-> Processing completed in 0s
+> Processing completed in [..]
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/releases/releases-files-upload-sourcemaps.trycmd b/tests/integration/_cases/releases/releases-files-upload-sourcemaps.trycmd
index 893cee8817..74ec0c8372 100644
--- a/tests/integration/_cases/releases/releases-files-upload-sourcemaps.trycmd
+++ b/tests/integration/_cases/releases/releases-files-upload-sourcemaps.trycmd
@@ -3,7 +3,7 @@ $ sentry-cli releases files wat-release upload-sourcemaps --url-prefix '~/assets
 ? success
 ⚠ DEPRECATION NOTICE: This functionality will be removed in a future version of `sentry-cli`. Use the `sourcemaps` command instead.
 > Rewriting sources
-> Rewriting completed in 0s
+> Rewriting completed in [..]
 > Adding source map references
 > Nothing to upload
 
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject-bundlers.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject-bundlers.trycmd
index 47f1bf9f19..6dfc9726ba 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject-bundlers.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject-bundlers.trycmd
@@ -4,7 +4,7 @@ $ sentry-cli sourcemaps inject .
 > Searching .
 > Found 18 files
 > Analyzing 18 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Injecting debug ids
 
 Source Map Debug ID Injection Report
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject-double-association.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject-double-association.trycmd
index d73b41c3ec..68b0c64ef1 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject-double-association.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject-double-association.trycmd
@@ -4,7 +4,7 @@ $ sentry-cli sourcemaps inject ./
 > Searching ./
 > Found 11 files
 > Analyzing 11 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Injecting debug ids
 
 Source Map Debug ID Injection Report
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject-embedded.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject-embedded.trycmd
index dc6869ee9e..f2c3fc7b24 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject-embedded.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject-embedded.trycmd
@@ -4,7 +4,7 @@ $ sentry-cli sourcemaps inject .
 > Searching .
 > Found 1 file
 > Analyzing 1 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Injecting debug ids
 
 Source Map Debug ID Injection Report
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject-nomappings.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject-nomappings.trycmd
index dd409b132e..305c1e2027 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject-nomappings.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject-nomappings.trycmd
@@ -6,7 +6,7 @@ $ sentry-cli sourcemaps inject ./server ./static
 > Searching ./static
 > Found 8 files
 > Analyzing 19 sources
-> Analyzing completed in 0.028s
+> Analyzing completed in [..]
 > Injecting debug ids
 
 Source Map Debug ID Injection Report
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject-split-ambiguous.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject-split-ambiguous.trycmd
index 6098740e27..08d23eb284 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject-split-ambiguous.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject-split-ambiguous.trycmd
@@ -8,11 +8,11 @@ $ sentry-cli sourcemaps inject ./code ./maps ./maps2 --log-level warn
 > Searching ./maps2
 > Found 1 file
 > Analyzing 5 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Injecting debug ids
-  WARN    2025-10-15 16:02:36.907355 +02:00 Ambiguous matches for sourcemap path ./code/foo/index.js.map:
-  WARN    2025-10-15 16:02:36.907899 +02:00 ./maps/foo/index.js.map
-  WARN    2025-10-15 16:02:36.907909 +02:00 ./maps2/foo/index.js.map
+  WARN    [..]-[..]-[..] [..] Ambiguous matches for sourcemap path ./code/foo/index.js.map:
+  WARN    [..]-[..]-[..] [..] ./maps/foo/index.js.map
+  WARN    [..]-[..]-[..] [..] ./maps2/foo/index.js.map
 
 Source Map Debug ID Injection Report
   Modified: The following source files have been modified to have debug ids
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject-split.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject-split.trycmd
index 3dc3341f42..755e120073 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject-split.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject-split.trycmd
@@ -6,7 +6,7 @@ $ sentry-cli sourcemaps inject ./code ./maps
 > Searching ./maps
 > Found 2 files
 > Analyzing 4 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Injecting debug ids
 
 Source Map Debug ID Injection Report
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject.trycmd
index fb47f6a5b1..df80f3a5b8 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject.trycmd
@@ -6,7 +6,7 @@ $ sentry-cli sourcemaps inject ./server ./static
 > Searching ./static
 > Found 8 files
 > Analyzing 24 sources
-> Analyzing completed in 0.026s
+> Analyzing completed in [..]
 > Injecting debug ids
 
 Source Map Debug ID Injection Report
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-debugid-alias.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-debugid-alias.trycmd
index 720892fe7a..d5b735dfd4 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-debugid-alias.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-debugid-alias.trycmd
@@ -3,17 +3,17 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/upload_debugid_alias
 ? success
 > Found 2 files
 > Analyzing 2 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Rewriting sources
-> Rewriting completed in 0s
+> Rewriting completed in [..]
 > Adding source map references
-> Bundling completed in 0.018s
+> Bundling completed in [..]
 > Bundled 2 files for upload
-> Bundle ID: 267ff9c5-2d00-5fb5-9a19-00978fbfd398
-> Optimizing completed in 0s
-> Uploading completed in 0.002s
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Optimizing completed in [..]
+> Uploading completed in [..]
 > Uploaded files to Sentry
-> Processing completed in 0.001s
+> Processing completed in [..]
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-hermes-bundle-reference-debug-id.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-hermes-bundle-reference-debug-id.trycmd
index 468ec545fd..bad6f72287 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-hermes-bundle-reference-debug-id.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-hermes-bundle-reference-debug-id.trycmd
@@ -3,17 +3,17 @@ $ sentry-cli sourcemaps upload --bundle tests/integration/_fixtures/file-hermes-
 ? success
   WARN    [..] Regular bundle found
 > Analyzing 2 sources
-> Analyzing completed in 0.065s
+> Analyzing completed in [..]
 > Rewriting sources
-> Rewriting completed in 0.511s
+> Rewriting completed in [..]
 > Adding source map references
-> Bundling completed in 1.113s
+> Bundling completed in [..]
 > Bundled 2 files for upload
-> Bundle ID: 0b10dfbf-7d11-52a5-9107-d16f625896ad
-> Optimizing completed in 0.045s
-> Uploading completed in 0.011s
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Optimizing completed in [..]
+> Uploading completed in [..]
 > Uploaded files to Sentry
-> Processing completed in 0s
+> Processing completed in [..]
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-ram-bundle.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-ram-bundle.trycmd
index 4ef02dd06b..0a69168dc0 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-ram-bundle.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-ram-bundle.trycmd
@@ -2,17 +2,17 @@
 $ sentry-cli sourcemaps upload --bundle tests/integration/_fixtures/file-ram-bundle/index.android.bundle --bundle-sourcemap tests/integration/_fixtures/file-ram-bundle/index.android.bundle.packager.map --release=wat-release
 ? success
 > Analyzing 1 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Rewriting sources
-> Rewriting completed in 0.008s
+> Rewriting completed in [..]
 > Adding source map references
-> Bundling completed in 0.086s
+> Bundling completed in [..]
 > Bundled 14 files for upload
-> Bundle ID: 388c172d-ba7d-53f3-b533-66ace21dfd78
-> Optimizing completed in 0.001s
-> Uploading completed in 0.002s
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Optimizing completed in [..]
+> Uploading completed in [..]
 > Uploaded files to Sentry
-> Processing completed in 0s
+> Processing completed in [..]
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-indexed-ram-bundle.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-indexed-ram-bundle.trycmd
index 58bf9b16ac..7c349744ef 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-indexed-ram-bundle.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-indexed-ram-bundle.trycmd
@@ -2,17 +2,17 @@
 $ sentry-cli sourcemaps upload --bundle tests/integration/_fixtures/indexed-ram-bundle/main.jsbundle --bundle-sourcemap tests/integration/_fixtures/indexed-ram-bundle/main.jsbundle.packager.map --release=wat-release
 ? success
 > Analyzing 1 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Rewriting sources
-> Rewriting completed in 0.7s
+> Rewriting completed in [..]
 > Adding source map references
-> Bundling completed in 9.755s
+> Bundling completed in [..]
 > Bundled 2107 files for upload
-> Bundle ID: 42cba25d-4463-546b-b515-bbe467fca122
-> Optimizing completed in 0.098s
-> Uploading completed in 0.02s
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Optimizing completed in [..]
+> Uploading completed in [..]
 > Uploaded files to Sentry
-> Processing completed in 0s
+> Processing completed in [..]
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-modern.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-modern.trycmd
index 014af98b9e..fdb8edb3c5 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-modern.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-modern.trycmd
@@ -4,17 +4,17 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/bundle.min.js.map tes
 > Found 1 file
 > Found 1 file
 > Analyzing 2 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Rewriting sources
-> Rewriting completed in 0.001s
+> Rewriting completed in [..]
 > Adding source map references
-> Bundling completed in 0.019s
+> Bundling completed in [..]
 > Bundled 2 files for upload
-> Bundle ID: ef321dda-d768-5296-82da-0e5150e02a27
-> Optimizing completed in 0s
-> Uploading completed in 0.005s
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Optimizing completed in [..]
+> Uploading completed in [..]
 > Uploaded files to Sentry
-> Processing completed in 0s
+> Processing completed in [..]
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
@@ -27,10 +27,3 @@ Source Map Upload Report
     ~/bundle.min.js.map
     ~/vendor.min.js.map
 
-
-Source Map Upload Report
-  Source Maps
-    ~/bundle.min.js.map
-    ~/vendor.min.js.map
-
-```
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-debugids.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-debugids.trycmd
index 6e44ebe038..6d7679bb85 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-debugids.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-debugids.trycmd
@@ -3,9 +3,9 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/upload_no_debugids
 ? 1
 > Found 20 files
 > Analyzing 20 sources
-> Analyzing completed in 0.025s
+> Analyzing completed in [..]
 > Rewriting sources
-> Rewriting completed in 0.244s
+> Rewriting completed in [..]
 > Adding source map references
 error: Cannot upload: You must either specify a release or have debug ids injected into your sources
 
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-dedupe.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-dedupe.trycmd
index 29d061fbf9..35b00a50c3 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-dedupe.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-no-dedupe.trycmd
@@ -4,18 +4,18 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/bundle.min.js.map tes
 > Found 1 file
 > Found 1 file
 > Analyzing 2 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Rewriting sources
-> Rewriting completed in 0s
+> Rewriting completed in [..]
 > Adding source map references
-> Bundling completed in 0.014s
+> Bundling completed in [..]
 > Bundled 2 files for upload
-> Bundle ID: ef321dda-d768-5296-82da-0e5150e02a27
-> Optimizing completed in 0s
-> Uploading completed in 0.004s
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Optimizing completed in [..]
+> Uploading completed in [..]
 > Uploaded files to Sentry
-  WARN    2025-10-15 16:02:36.982072 +02:00 [DEPRECATION NOTICE] Your Sentry server does not support artifact bundle uploads. Falling back to deprecated release bundle upload. Support for this deprecated upload method will be removed in Sentry CLI 3.0.0. Please upgrade your Sentry server, or if you cannot upgrade, pin your Sentry CLI version to 2.x, so you don't get upgraded to 3.x when it is released.
-> Processing completed in 0.002s
+  WARN    [..] [DEPRECATION NOTICE] Your Sentry server does not support artifact bundle uploads. Falling back to deprecated release bundle upload. Support for this deprecated upload method will be removed in Sentry CLI 3.0.0. Please upgrade your Sentry server, or if you cannot upgrade, pin your Sentry CLI version to 2.x, so you don't get upgraded to 3.x when it is released.
+> Processing completed in [..]
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-skip-already-uploaded.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-skip-already-uploaded.trycmd
index d9dc50e99c..9eb2e6072e 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-skip-already-uploaded.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-skip-already-uploaded.trycmd
@@ -4,18 +4,18 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/bundle.min.js.map tes
 > Found 1 file
 > Found 1 file
 > Analyzing 2 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Rewriting sources
-> Rewriting completed in 0s
+> Rewriting completed in [..]
 > Adding source map references
-> Bundling completed in 0.011s
+> Bundling completed in [..]
 > Bundled 1 file for upload
-> Bundle ID: 0648a722-b56c-560f-bb28-ee2d8df113d0
-> Optimizing completed in 0s
-> Uploading completed in 0.003s
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Optimizing completed in [..]
+> Uploading completed in [..]
 > Uploaded files to Sentry
-  WARN    2025-10-15 16:02:37.000664 +02:00 [DEPRECATION NOTICE] Your Sentry server does not support artifact bundle uploads. Falling back to deprecated release bundle upload. Support for this deprecated upload method will be removed in Sentry CLI 3.0.0. Please upgrade your Sentry server, or if you cannot upgrade, pin your Sentry CLI version to 2.x, so you don't get upgraded to 3.x when it is released.
-> Processing completed in 0.001s
+  WARN    [..] [DEPRECATION NOTICE] Your Sentry server does not support artifact bundle uploads. Falling back to deprecated release bundle upload. Support for this deprecated upload method will be removed in Sentry CLI 3.0.0. Please upgrade your Sentry server, or if you cannot upgrade, pin your Sentry CLI version to 2.x, so you don't get upgraded to 3.x when it is released.
+> Processing completed in [..]
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-some-debugids.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-some-debugids.trycmd
index 9985c770b9..4d7b481885 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-some-debugids.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-some-debugids.trycmd
@@ -3,25 +3,25 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/upload_some_debugids
 ? success
 > Found 20 files
 > Analyzing 20 sources
-> Analyzing completed in 0.035s
+> Analyzing completed in [..]
 > Rewriting sources
-> Rewriting completed in 0.239s
+> Rewriting completed in [..]
 > Adding source map references
-  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] Some source files don't have debug ids:
-  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/server/app/page.js
-  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/server/chunks/1.js
-  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/server/dummy_embedded.js
-  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/server/pages/_document.js
-  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/server/pages/api/hello.js
-  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/static/chunks/575-bb7d7e0e6de8d623.js
-  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/static/chunks/pages/asdf-05b39167abbe433b.js
-> Bundling completed in 0.542s
+  WARN    [..]-[..]-[..] [..] Some source files don't have debug ids:
+  WARN    [..]-[..]-[..] [..] - ~/server/app/page.js
+  WARN    [..]-[..]-[..] [..] - ~/server/chunks/1.js
+  WARN    [..]-[..]-[..] [..] - ~/server/dummy_embedded.js
+  WARN    [..]-[..]-[..] [..] - ~/server/pages/_document.js
+  WARN    [..]-[..]-[..] [..] - ~/server/pages/api/hello.js
+  WARN    [..]-[..]-[..] [..] - ~/static/chunks/575-bb7d7e0e6de8d623.js
+  WARN    [..]-[..]-[..] [..] - ~/static/chunks/pages/asdf-05b39167abbe433b.js
+> Bundling completed in [..]
 > Bundled 20 files for upload
-> Bundle ID: b398cc10-5607-5c32-b6b7-eae773f1ac77
-> Optimizing completed in 0.02s
-> Uploading completed in 0.005s
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Optimizing completed in [..]
+> Uploading completed in [..]
 > Uploaded files to Sentry
-> Processing completed in 0s
+> Processing completed in [..]
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project
@@ -57,10 +57,3 @@ Source Map Upload Report
     ~/static/chunks/app/client/page-d5742c254d9533f8.js.map
     ~/static/chunks/pages/asdf-05b39167abbe433b.js.map (debug id 2297b93d-928d-421e-8910-127c786382df)
 
-    ~/server/pages/_document.js.map
-    ~/server/pages/asdf.js.map
-    ~/static/chunks/575-bb7d7e0e6de8d623.js.map
-    ~/static/chunks/app/client/page-d5742c254d9533f8.js.map
-    ~/static/chunks/pages/asdf-05b39167abbe433b.js.map (debug id 2297b93d-928d-421e-8910-127c786382df)
-
-```
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-successfully-upload-file.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-successfully-upload-file.trycmd
index cfccbbd919..e364e968ee 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-successfully-upload-file.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-successfully-upload-file.trycmd
@@ -3,18 +3,18 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/bundle.min.js.map --r
 ? success
 > Found 1 file
 > Analyzing 1 sources
-> Analyzing completed in 0s
+> Analyzing completed in [..]
 > Rewriting sources
-> Rewriting completed in 0s
+> Rewriting completed in [..]
 > Adding source map references
-> Bundling completed in 0.011s
+> Bundling completed in [..]
 > Bundled 1 file for upload
-> Bundle ID: 0648a722-b56c-560f-bb28-ee2d8df113d0
-> Optimizing completed in 0s
-> Uploading completed in 0.002s
+> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Optimizing completed in [..]
+> Uploading completed in [..]
 > Uploaded files to Sentry
-  WARN    2025-10-15 16:02:37.034578 +02:00 [DEPRECATION NOTICE] Your Sentry server does not support artifact bundle uploads. Falling back to deprecated release bundle upload. Support for this deprecated upload method will be removed in Sentry CLI 3.0.0. Please upgrade your Sentry server, or if you cannot upgrade, pin your Sentry CLI version to 2.x, so you don't get upgraded to 3.x when it is released.
-> Processing completed in 0.001s
+  WARN    [..] [DEPRECATION NOTICE] Your Sentry server does not support artifact bundle uploads. Falling back to deprecated release bundle upload. Support for this deprecated upload method will be removed in Sentry CLI 3.0.0. Please upgrade your Sentry server, or if you cannot upgrade, pin your Sentry CLI version to 2.x, so you don't get upgraded to 3.x when it is released.
+> Processing completed in [..]
 > File upload complete (processing pending on server)
 > Organization: wat-org
 > Projects: wat-project

From 92b180741c488b9b3b87df2e4c68aaf44a7aa15a Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:45:43 +0200
Subject: [PATCH 20/23] undo unrelated changes to snapshots

---
 .../build/build-upload-apk-all-uploaded.trycmd  |  2 +-
 .../_cases/build/build-upload-apk.trycmd        |  2 +-
 .../_cases/build/build-upload-ipa.trycmd        |  2 +-
 .../sourcemaps-inject-split-ambiguous.trycmd    |  6 +++---
 ...file-hermes-bundle-reference-debug-id.trycmd |  2 +-
 .../sourcemaps/sourcemaps-upload-modern.trycmd  |  1 +
 .../sourcemaps-upload-some-debugids.trycmd      | 17 +++++++++--------
 7 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/tests/integration/_cases/build/build-upload-apk-all-uploaded.trycmd b/tests/integration/_cases/build/build-upload-apk-all-uploaded.trycmd
index 99cd44e520..9ed3adbd1a 100644
--- a/tests/integration/_cases/build/build-upload-apk-all-uploaded.trycmd
+++ b/tests/integration/_cases/build/build-upload-apk-all-uploaded.trycmd
@@ -4,6 +4,6 @@ $ sentry-cli build upload tests/integration/_fixtures/build/apk.apk
   WARN    [..] EXPERIMENTAL: The build subcommand is experimental. The command is subject to breaking changes and may be removed without notice in any release.
 > Preparing for upload completed in [..]
 Successfully uploaded 1 file to Sentry
-  - tests/integration/_fixtures/build/apk.apk (https://sentry.io/wat-org/preprod/wat-project/42)
+  - tests/integration/_fixtures/build/apk.apk (http[..]/wat-org/preprod/wat-project/42)
 
 ```
diff --git a/tests/integration/_cases/build/build-upload-apk.trycmd b/tests/integration/_cases/build/build-upload-apk.trycmd
index 8780aa060d..aec1d188f9 100644
--- a/tests/integration/_cases/build/build-upload-apk.trycmd
+++ b/tests/integration/_cases/build/build-upload-apk.trycmd
@@ -5,6 +5,6 @@ $ sentry-cli build upload tests/integration/_fixtures/build/apk.apk --head-sha t
 > Preparing for upload completed in [..]
 > Uploading completed in [..]
 Successfully uploaded 1 file to Sentry
-  - tests/integration/_fixtures/build/apk.apk (http://sentry.io/wat-org/preprod/wat-project/42)
+  - tests/integration/_fixtures/build/apk.apk (http[..]/wat-org/preprod/wat-project/42)
 
 ```
diff --git a/tests/integration/_cases/build/build-upload-ipa.trycmd b/tests/integration/_cases/build/build-upload-ipa.trycmd
index 61679e815f..747423f16d 100644
--- a/tests/integration/_cases/build/build-upload-ipa.trycmd
+++ b/tests/integration/_cases/build/build-upload-ipa.trycmd
@@ -4,6 +4,6 @@ $ sentry-cli build upload tests/integration/_fixtures/build/ipa.ipa --head-sha t
   WARN    [..] EXPERIMENTAL: The build subcommand is experimental. The command is subject to breaking changes and may be removed without notice in any release.
 > Preparing for upload completed in [..]
 Successfully uploaded 1 file to Sentry
-  - tests/integration/_fixtures/build/ipa.ipa (http://sentry.io/wat-org/preprod/wat-project/some-text-id)
+  - tests/integration/_fixtures/build/ipa.ipa (http[..]/wat-org/preprod/wat-project/some-text-id)
 
 ```
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-inject-split-ambiguous.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-inject-split-ambiguous.trycmd
index 08d23eb284..0a65113818 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-inject-split-ambiguous.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-inject-split-ambiguous.trycmd
@@ -10,9 +10,9 @@ $ sentry-cli sourcemaps inject ./code ./maps ./maps2 --log-level warn
 > Analyzing 5 sources
 > Analyzing completed in [..]
 > Injecting debug ids
-  WARN    [..]-[..]-[..] [..] Ambiguous matches for sourcemap path ./code/foo/index.js.map:
-  WARN    [..]-[..]-[..] [..] ./maps/foo/index.js.map
-  WARN    [..]-[..]-[..] [..] ./maps2/foo/index.js.map
+  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] Ambiguous matches for sourcemap path ./code/foo/index.js.map:
+  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] ./maps/foo/index.js.map
+  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] ./maps2/foo/index.js.map
 
 Source Map Debug ID Injection Report
   Modified: The following source files have been modified to have debug ids
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-hermes-bundle-reference-debug-id.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-hermes-bundle-reference-debug-id.trycmd
index bad6f72287..576c27cd86 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-hermes-bundle-reference-debug-id.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-file-hermes-bundle-reference-debug-id.trycmd
@@ -9,7 +9,7 @@ $ sentry-cli sourcemaps upload --bundle tests/integration/_fixtures/file-hermes-
 > Adding source map references
 > Bundling completed in [..]
 > Bundled 2 files for upload
-> Bundle ID: [..]-[..]-[..]-[..]-[..]
+> Bundle ID: 0b10dfbf-7d11-52a5-9107-d16f625896ad
 > Optimizing completed in [..]
 > Uploading completed in [..]
 > Uploaded files to Sentry
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-modern.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-modern.trycmd
index fdb8edb3c5..628f77fc75 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-modern.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-modern.trycmd
@@ -27,3 +27,4 @@ Source Map Upload Report
     ~/bundle.min.js.map
     ~/vendor.min.js.map
 
+```
diff --git a/tests/integration/_cases/sourcemaps/sourcemaps-upload-some-debugids.trycmd b/tests/integration/_cases/sourcemaps/sourcemaps-upload-some-debugids.trycmd
index 4d7b481885..ad6b3c0408 100644
--- a/tests/integration/_cases/sourcemaps/sourcemaps-upload-some-debugids.trycmd
+++ b/tests/integration/_cases/sourcemaps/sourcemaps-upload-some-debugids.trycmd
@@ -7,14 +7,14 @@ $ sentry-cli sourcemaps upload tests/integration/_fixtures/upload_some_debugids
 > Rewriting sources
 > Rewriting completed in [..]
 > Adding source map references
-  WARN    [..]-[..]-[..] [..] Some source files don't have debug ids:
-  WARN    [..]-[..]-[..] [..] - ~/server/app/page.js
-  WARN    [..]-[..]-[..] [..] - ~/server/chunks/1.js
-  WARN    [..]-[..]-[..] [..] - ~/server/dummy_embedded.js
-  WARN    [..]-[..]-[..] [..] - ~/server/pages/_document.js
-  WARN    [..]-[..]-[..] [..] - ~/server/pages/api/hello.js
-  WARN    [..]-[..]-[..] [..] - ~/static/chunks/575-bb7d7e0e6de8d623.js
-  WARN    [..]-[..]-[..] [..] - ~/static/chunks/pages/asdf-05b39167abbe433b.js
+  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] Some source files don't have debug ids:
+  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/server/app/page.js
+  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/server/chunks/1.js
+  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/server/dummy_embedded.js
+  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/server/pages/_document.js
+  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/server/pages/api/hello.js
+  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/static/chunks/575-bb7d7e0e6de8d623.js
+  WARN    [..]-[..]-[..] [..]:[..]:[..].[..] [..]:[..] - ~/static/chunks/pages/asdf-05b39167abbe433b.js
 > Bundling completed in [..]
 > Bundled 20 files for upload
 > Bundle ID: [..]-[..]-[..]-[..]-[..]
@@ -57,3 +57,4 @@ Source Map Upload Report
     ~/static/chunks/app/client/page-d5742c254d9533f8.js.map
     ~/static/chunks/pages/asdf-05b39167abbe433b.js.map (debug id 2297b93d-928d-421e-8910-127c786382df)
 
+```

From 0ce6255a8cd23bd19bc9974cbd00022c29669757 Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:54:13 +0200
Subject: [PATCH 21/23] more small adjustments

---
 .../upload/debug_files-upload-mixed-embedded-sources.trycmd   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd b/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
index 4ddaacc46e..50739f0f73 100644
--- a/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
+++ b/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
@@ -5,9 +5,7 @@ $ sentry-cli --log-level=debug debug-files upload --include-sources tests/integr
 ...
 > Found 1 debug information file (1 with embedded sources)
   DEBUG   [..] trying to collect sources for SrcGenSampleApp.pdb
-...
-> Resolved source code for 0 debug information files
-> Prepared debug information file for upload
+  DEBUG   [..] Trying to add source file: /Users/matt/Code/temp/SrcGenSampleApp/SrcGenSampleApp/Program.cs
 ...
 
 ```

From 014d0a0ed4d983ed356e5bb9a1e8768dbc011c2c Mon Sep 17 00:00:00 2001
From: lcian <17258265+lcian@users.noreply.github.com>
Date: Wed, 15 Oct 2025 17:02:34 +0200
Subject: [PATCH 22/23] more small adjustments

---
 .../debug_files-upload-mixed-embedded-sources.trycmd     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd b/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
index 50739f0f73..addc1d4a6b 100644
--- a/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
+++ b/tests/integration/_cases/debug_files/upload/debug_files-upload-mixed-embedded-sources.trycmd
@@ -6,6 +6,15 @@ $ sentry-cli --log-level=debug debug-files upload --include-sources tests/integr
 > Found 1 debug information file (1 with embedded sources)
   DEBUG   [..] trying to collect sources for SrcGenSampleApp.pdb
   DEBUG   [..] Trying to add source file: /Users/matt/Code/temp/SrcGenSampleApp/SrcGenSampleApp/Program.cs
+  DEBUG   [..] Trying to add source file: /Users/matt/Code/temp/SrcGenSampleApp/SrcGenSampleApp/obj/Release/net6.0/SrcGenSampleApp.GlobalUsings.g.cs
+  DEBUG   [..] Trying to add source file: /Users/matt/Code/temp/SrcGenSampleApp/SrcGenSampleApp/obj/Release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs
+  DEBUG   [..] Trying to add source file: /Users/matt/Code/temp/SrcGenSampleApp/SrcGenSampleApp/obj/Release/net6.0/SrcGenSampleApp.AssemblyInfo.cs
+  DEBUG   [..] Skipping embedded source file: /Users/matt/Code/temp/SrcGenSampleApp/SrcGenSampleApp/MySourceGenerator/MySourceGenerator.HelloSourceGenerator/Program.g.cs
+  DEBUG   [..] No sources found for SrcGenSampleApp.pdb
+> Resolved source code for 0 debug information files
+> Prepared debug information file for upload
+...
+> Nothing to upload, all files are on the server
 ...
 
 ```

From 21ee8b603f79b44714160e3a272d0455d7f2a89d Mon Sep 17 00:00:00 2001
From: Lorenzo Cian <17258265+lcian@users.noreply.github.com>
Date: Wed, 22 Oct 2025 11:30:23 +0200
Subject: [PATCH 23/23] Update CHANGELOG.md

---
 CHANGELOG.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d8ea88c4d..d4e7337da7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,16 +4,16 @@
 
 ## Unreleased
 
-### Fixes
-
-- Don't use hidden progress bar ([#2830](https://github.com/getsentry/sentry-cli/pull/2830)) by @lcian
-  - Fixed an issue where log messages would not show up when redirecting stderr to a file and using any subcommand that uses a progress bar, such as `sentry-cli debug-files bundle-jvm` and `sentry-cli sourcemaps upload`.
-
 ### Deprecations
 
 - Deprecated the `upload-proguard` subcommand's `--app-id`, `--version`, and `--version-code` flags ([#2852](https://github.com/getsentry/sentry-cli/pull/2852)), as we plan to remove these flags in Sentry CLI 3.x. Users should simply stop using the flags; the values specified there have never had an effect on deobfuscation, and are no longer visible in Sentry.
 - Added a deprecation notice for release bundle uploads, a legacy method for uploading sourcemaps ([#2844](https://github.com/getsentry/sentry-cli/pull/2844)). Release bundle uploads will be removed in Sentry CLI 3.x in favor of artifact bundles, the newer sourcemap upload method [introduced in Sentry version 23.6.2](https://github.com/getsentry/sentry/commit/f90f764fda09575f3f94caf32d04589098384616). **Self-hosted users**: You must upgrade to Sentry 23.6.2 or later before upgrading to Sentry CLI 3.x.
 
+### Fixes
+
+- Don't use hidden progress bar ([#2830](https://github.com/getsentry/sentry-cli/pull/2830)) by @lcian
+  - Fixed an issue where log messages would not show up when redirecting stderr to a file and using any subcommand that uses a progress bar, such as `sentry-cli debug-files bundle-jvm` and `sentry-cli sourcemaps upload`.
+
 ## 2.56.1
 
 ### Deprecations