feat: use the same uri scheme for walltime and intrumented

Author: GuillaumeLagrange

crates/divan_compat/divan_fork/src/divan.rs

@@ -311,6 +311,9 @@ impl Divan {
                 if should_compute_stats {
                     let stats = bench_context.compute_stats();
                     {
+                        // WARNING: Keep in sync with `codspeed-divan-compat::uri::generate`
+                        // Not worth doing the work of actually using the same code since this fork
+                        // is temporary
                         let name = bench_entry.display_name().to_string();
                         let file = bench_entry.meta().location.file;
                         let mut module_path = bench_entry

crates/divan_compat/src/compat/entry.rs

@@ -56,6 +56,13 @@ pub struct EntryMeta {
     pub bench_options: Option<LazyLock<BenchOptions>>,
 }
 
+impl EntryMeta {
+    #[inline]
+    pub(crate) fn module_path_components<'a>(&self) -> impl Iterator<Item = &'a str> {
+        self.module_path.split("::")
+    }
+}
+
 /// Where an entry is located.
 #[derive(Clone, Copy, Default, PartialEq, Eq, PartialOrd, Ord)]
 #[allow(missing_docs)]

crates/divan_compat/src/compat/mod.rs

@@ -11,6 +11,7 @@ pub mod __private {
 
 mod bench;
 mod entry;
+mod uri;
 mod util;
 
 pub use bench::*;
@@ -31,13 +32,7 @@ pub fn main() {
 
     // 4. Scan the tree and execute benchmarks
     for entry in bench_entries.iter() {
-        let entry_uri = format!(
-            "{}:{}::{}::{}",
-            entry.meta.location.file,
-            entry.meta.location.line,
-            entry.meta.module_path,
-            entry.meta.display_name,
-        );
+        let entry_uri = uri::generate(entry.meta.display_name, &entry.meta);
 
         if let Some(options) = &entry.meta.bench_options.as_ref() {
             if let Some(true) = options.ignore {

crates/divan_compat/src/compat/uri.rs

@@ -0,0 +1,19 @@
+use crate::__private::EntryMeta;
+
+pub(crate) fn generate(
+    bench_display_name: impl std::fmt::Display,
+    bench_meta: &EntryMeta,
+) -> String {
+    let file = bench_meta.location.file;
+    let mut module_path = bench_meta
+        .module_path_components()
+        .skip(1)
+        .collect::<Vec<_>>()
+        .join("::");
+    if !module_path.is_empty() {
+        module_path.push_str("::");
+    }
+    let uri = format!("{file}::{module_path}{bench_display_name}");
+
+    uri
+}