fix: fix relative git path issue when using working-directory

Author: art049

Cargo.lock

@@ -12,5 +12,20 @@ pub fn b(bench: &mut Bencher) {
     bench.bytes = N as u64;
 }
 
-benchmark_group!(benches, a, b);
+mod c {
+    use super::*;
+
+    pub fn a(bench: &mut Bencher) {
+        bench.iter(|| (0..100).fold(0, |x, y| black_box(x + y)))
+    }
+
+    pub fn b(bench: &mut Bencher) {
+        const N: usize = 1024;
+        bench.iter(|| vec![0u8; N]);
+
+        bench.bytes = N as u64;
+    }
+}
+
+benchmark_group!(benches, a, b, c::a, c::b);
 benchmark_main!(benches);

crates/bencher_compat/benches/bencher_example.rs

@@ -1,14 +1,22 @@
-use codspeed::codspeed::{black_box, CodSpeed, WARMUP_RUNS};
+use codspeed::{
+    codspeed::{black_box, CodSpeed, WARMUP_RUNS},
+    utils::{get_formated_function_path, get_git_relative_path},
+};
 
 pub struct Bencher {
     pub bytes: u64,
     codspeed: CodSpeed,
-    current_uri: String,
+    current_file: String,
+    current_bench_path: String,
 }
 
 impl Bencher {
-    pub fn set_current_uri(&mut self, uri: String) {
-        self.current_uri = uri;
+    pub fn set_current_file(&mut self, file: impl Into<String>) {
+        self.current_file = file.into();
+    }
+
+    pub fn set_current_bench_path(&mut self, bench: impl Into<String>) {
+        self.current_bench_path = bench.into();
     }
 
     pub fn push_group(&mut self, group: &str) {
@@ -23,11 +31,13 @@ impl Bencher {
     where
         F: FnMut() -> T,
     {
-        let uri = self.current_uri.as_str();
+        let file = get_git_relative_path(self.current_file.as_str());
+        let bench_path = get_formated_function_path(self.current_bench_path.as_str());
+        let uri = format!("{}::{}", file.to_string_lossy(), bench_path);
         for _ in 0..WARMUP_RUNS {
             black_box(inner());
         }
-        self.codspeed.start_benchmark(uri);
+        self.codspeed.start_benchmark(uri.as_str());
         black_box(inner());
         self.codspeed.end_benchmark();
     }
@@ -42,18 +52,20 @@ impl Default for Bencher {
         Bencher {
             bytes: 0,
             codspeed: CodSpeed::new(),
-            current_uri: String::new(),
+            current_file: String::new(),
+            current_bench_path: String::new(),
         }
     }
 }
 
 #[macro_export]
 macro_rules! benchmark_group {
-    ($group_name:ident, $($function:path),+) => {
+    ($group_name:ident, $( $function:path ),+ $(,)*) => {
         pub fn $group_name(bencher: &mut $crate::Bencher) {
             bencher.push_group(stringify!($group_name));
             $(
-                bencher.set_current_uri($crate::codspeed_uri!($function));
+                bencher.set_current_file(codspeed::abs_file!());
+                bencher.set_current_bench_path(stringify!($function));
                 $function(bencher);
             )+
             bencher.pop_group();

crates/bencher_compat/src/compat.rs

@@ -1,5 +1,3 @@
-pub use codspeed::codspeed_uri;
-
 #[cfg(not(codspeed))]
 mod compat_bencher {
     pub use bencher::*;

crates/bencher_compat/src/lib.rs

@@ -67,10 +67,14 @@ pub fn run_benches(
     )?;
     for bench in to_run.iter() {
         let bench_name = bench.file_name().unwrap().to_str().unwrap();
+        // workspace_root is needed since file! returns the path relatively to the workspace root
+        // while CARGO_MANIFEST_DIR returns the path to the sub package
+        let workspace_root = ws.root().to_string_lossy();
         ws.config()
             .shell()
             .status_with_color("Running", bench_name, Color::Yellow)?;
         std::process::Command::new(bench)
+            .env("CODSPEED_CARGO_WORKSPACE_ROOT", workspace_root.as_ref())
             .status()
             .map_err(|_| anyhow!("failed to execute the benchmark process"))?;
         ws.config().shell().status_with_color(

crates/cargo-codspeed/src/run.rs

@@ -19,7 +19,11 @@ keywords = ["codspeed", "benchmark"]
 [dependencies]
 colored = "2.0.0"
 libc = "^0.2"
+serde_json = "1.0.104"
 
 [[bench]]
 name = "native"
 harness = false
+
+[dev-dependencies]
+tempfile = "3.7.0"

crates/codspeed/Cargo.toml

@@ -2,3 +2,4 @@ pub mod codspeed;
 mod macros;
 mod measurement;
 mod request;
+pub mod utils;

crates/codspeed/src/lib.rs

@@ -1,3 +1,12 @@
+#[macro_export]
+macro_rules! abs_file {
+    () => {
+        std::path::PathBuf::from(std::env::var("CODSPEED_CARGO_WORKSPACE_ROOT").unwrap())
+            .join(file!())
+            .to_string_lossy()
+    };
+}
+
 #[macro_export]
 macro_rules! codspeed_uri {
     ( $name:ident ) => {