Add speed to metadata logging

Cargo.toml

@@ -36,7 +36,6 @@ probe-rs-rtt = { version = "0.4.0" }
 chrono = "0.4"
 # Version 0.17.8 doesn't compile on Windows
 crossterm = "<= 0.17.7"
-derivative = "2.1.0"
 goblin = "0.2.0"
 tui = { version = "0.12.0", default-features = false, features = ["crossterm"] }
 anyhow = "1.0.31"

src/main.rs

@@ -24,11 +24,10 @@ use probe_rs::{
     DebugProbeSelector, Probe,
 };
 #[cfg(feature = "sentry")]
-use probe_rs_cli_util::logging::{ask_to_log_crash, capture_anyhow, capture_panic, Metadata};
-use probe_rs_cli_util::{argument_handling, build_artifact, logging};
+use probe_rs_cli_util::logging::{ask_to_log_crash, capture_anyhow, capture_panic};
+use probe_rs_cli_util::{argument_handling, build_artifact, logging, logging::Metadata};
 use probe_rs_rtt::{Rtt, ScanRegion};
 
-#[cfg(feature = "sentry")]
 lazy_static::lazy_static! {
     static ref METADATA: Arc<Mutex<Metadata>> = Arc::new(Mutex::new(Metadata {
         release: CARGO_VERSION.to_string(),
@@ -85,13 +84,15 @@ struct Opt {
 const ARGUMENTS_TO_REMOVE: &[&str] = &["list-chips", "disable-progressbars", "chip=", "probe="];
 
 fn main() {
-    #[cfg(feature = "sentry")]
-    let _next = panic::take_hook();
-    #[cfg(feature = "sentry")]
+    let next = panic::take_hook();
     panic::set_hook(Box::new(move |info| {
+        #[cfg(feature = "sentry")]
         if ask_to_log_crash() {
             capture_panic(&METADATA.lock().unwrap(), &info)
         }
+        #[cfg(not(feature = "sentry"))]
+        log::info!("{:#?}", &METADATA.lock().unwrap());
+        next(info);
     }));
 
     match main_try() {
@@ -130,6 +131,8 @@ fn main() {
             if ask_to_log_crash() {
                 capture_anyhow(&METADATA.lock().unwrap(), &e)
             }
+            #[cfg(not(feature = "sentry"))]
+            log::info!("{:#?}", &METADATA.lock().unwrap());
 
             process::exit(1);
         }
@@ -183,6 +186,8 @@ fn main_try() -> Result<()> {
             .unwrap_or(TargetSelector::Auto)
     };
 
+    METADATA.lock().unwrap().chip = Some(format!("{:?}", chip));
+
     // Remove executable name from the arguments list.
     args.remove(0);
 
@@ -249,6 +254,10 @@ fn main_try() -> Result<()> {
                 }
                 Probe::open(
                     list.first()
+                        .map(|info| {
+                            METADATA.lock().unwrap().probe = Some(format!("{:?}", info.probe_type));
+                            info
+                        })
                         .ok_or_else(|| anyhow!("No supported probe was found"))?,
                 )?
             }
@@ -275,6 +284,8 @@ fn main_try() -> Result<()> {
         probe.speed_khz()
     };
 
+    METADATA.lock().unwrap().speed = Some(format!("{:?}", protocol_speed));
+
     log::info!("Protocol speed {} kHz", protocol_speed);
 
     let mut session = probe.attach(chip).context("failed attaching to target")?;