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
@@ -588,9 +591,7 @@ impl Divan {
     ///
     /// ```
     /// # use divan::Divan;
-    /// let divan = Divan::default()
-    ///     .skip_regex("(add|sub)")
-    ///     .skip_regex("collections.*default");
+    /// let divan = Divan::default().skip_regex("(add|sub)").skip_regex("collections.*default");
     /// ```
     ///
     /// # Panics
@@ -620,9 +621,8 @@ impl Divan {
     ///
     /// ```
     /// # use divan::Divan;
-    /// let divan = Divan::default()
-    ///     .skip_exact("arithmetic::add")
-    ///     .skip_exact("collections::vec::default");
+    /// let divan =
+    ///     Divan::default().skip_exact("arithmetic::add").skip_exact("collections::vec::default");
     /// ```
     #[must_use]
     pub fn skip_exact(mut self, filter: impl Into<String>) -> Self {

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

@@ -15,6 +15,8 @@ mod util;
 
 pub use bench::*;
 
+use crate::uri;
+
 pub fn main() {
     // Outlined steps of original divan::main and their equivalent in codspeed instrumented mode
     // 1. Get registered entries
@@ -31,13 +33,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/lib.rs

@@ -1,5 +1,7 @@
 pub use codspeed::codspeed_uri;
 
+mod uri;
+
 #[cfg(not(codspeed))]
 mod compat_divan {
     pub use divan::*;

crates/divan_compat/src/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
+}