fixup! fix(cargo-codspeed): properly forward stdout compiler messages

Author: art049

crates/cargo-codspeed/src/walltime_results.rs

@@ -24,27 +24,14 @@ struct BenchmarkStats {
     warmup_iters: u64,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
-/// Configuration for the benchmark
-/// TODO: actually parse configuration options
+#[derive(Debug, Serialize, Deserialize, Default)]
 struct BenchmarkConfig {
-    warmup_time_ns: f64,
-    min_round_time_ns: f64,
+    warmup_time_ns: Option<f64>,
+    min_round_time_ns: Option<f64>,
     max_time_ns: Option<f64>,
     max_rounds: Option<u64>,
 }
 
-impl Default for BenchmarkConfig {
-    fn default() -> Self {
-        BenchmarkConfig {
-            warmup_time_ns: 0.,
-            min_round_time_ns: 0., // TODO: use clock_info
-            max_time_ns: None,
-            max_rounds: None,
-        }
-    }
-}
-
 #[derive(Debug, Serialize, Deserialize)]
 pub struct WalltimeBenchmark {
     #[serde(flatten)]
@@ -56,11 +43,7 @@ pub struct WalltimeBenchmark {
 
 impl From<RawWallTimeData> for WalltimeBenchmark {
     fn from(value: RawWallTimeData) -> Self {
-        let times_ns: Vec<f64> = value
-            .times_ps
-            .into_iter()
-            .map(|t| (t as f64) / 1_000.)
-            .collect();
+        let times_ns: Vec<f64> = value.times_ns.iter().map(|&t| t as f64).collect();
         let mut data = Data::new(times_ns.clone());
         let rounds = data.len() as u64;
         let total_time = times_ns.iter().sum::<f64>() / 1_000_000_000.0;
@@ -115,7 +98,10 @@ impl From<RawWallTimeData> for WalltimeBenchmark {
                 name: value.metadata.name,
                 uri: value.metadata.uri,
             },
-            config: BenchmarkConfig::default(),
+            config: BenchmarkConfig {
+                max_time_ns: value.max_time_ns.map(|t| t as f64),
+                ..Default::default()
+            },
             stats,
         }
     }
@@ -127,8 +113,16 @@ struct Instrument {
     type_: String,
 }
 
+#[derive(Debug, Serialize, Deserialize)]
+struct Creator {
+    name: String,
+    version: String,
+    pid: u32,
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct WalltimeResults {
+    creator: Creator,
     instrument: Instrument,
     benchmarks: Vec<WalltimeBenchmark>,
 }
@@ -139,6 +133,11 @@ impl WalltimeResults {
             instrument: Instrument {
                 type_: "walltime".to_string(),
             },
+            creator: Creator {
+                name: "codspeed-rust".to_string(),
+                version: env!("CARGO_PKG_VERSION").to_string(),
+                pid: std::process::id(),
+            },
             benchmarks,
         }
     }