machine-id

Author: epompeii

lib/bencher_fingerprint/Cargo.toml

@@ -11,7 +11,9 @@ uuid.workspace = true
 
 [target.'cfg(target_os = "windows")'.dependencies]
 uuid.workspace = true
-windows = { version = "0.60", features = ["System_Profile"] }
+windows = { version = "0.60", features = [
+    "System_Profile_SystemManufacturers",
+] }
 
 [lints]
 workspace = true

lib/bencher_fingerprint/src/linux.rs

@@ -4,9 +4,14 @@ const HEX_BASE: u32 = 16;
 
 impl crate::Fingerprint {
     pub fn new() -> Option<Self> {
-        fs::read_to_string("/etc/machine-id")
-            .ok()
-            .and_then(|id| u128::from_str_radix(&id, HEX_BASE).ok())
+        parse_machine_id("/var/lib/dbus/machine-id")
+            .or_else(|| parse_machine_id("/etc/machine-id"))
             .map(Self)
     }
 }
+
+fn parse_machine_id(path: &str) -> Option<u128> {
+    fs::read_to_string(path)
+        .ok()
+        .and_then(|id| u128::from_str_radix(id.trim(), HEX_BASE).ok())
+}