Improve reported statistics

backend/telemetry_core/src/feed_message.rs

@@ -240,4 +240,5 @@ pub struct ChainStats {
     pub memory_memcpy_score: Ranking<(u32, Option<u32>)>,
     pub disk_sequential_write_score: Ranking<(u32, Option<u32>)>,
     pub disk_random_write_score: Ranking<(u32, Option<u32>)>,
+    pub cpu_vendor: Ranking<String>,
 }

backend/telemetry_core/src/state/chain_stats.rs

@@ -96,6 +96,27 @@ fn bucket_memory(memory: u64) -> (u32, Option<u32>) {
         48,
         56,
         64,
+        128,
+    }
+}
+
+fn kernel_version_number(version: &Box<str>) -> &str {
+    &version[0..version.find('-').unwrap_or(version.len())]
+}
+
+#[test]
+fn test_kernel_version_number() {
+    assert_eq!(kernel_version_number(&"5.10.0-8-amd64".into()), "5.10.0");
+    assert_eq!(kernel_version_number(&"5.10.0".into()), "5.10.0");
+}
+
+fn cpu_vendor(cpu: &Box<str>) -> &str {
+    if cpu.contains("Intel") || cpu.contains("intel") {
+        "Intel"
+    } else if cpu.contains("AMD") || cpu.contains("amd") {
+        "AMD"
+    } else {
+        "Other"
     }
 }
 
@@ -114,6 +135,7 @@ pub struct ChainStatsCollator {
     memory_memcpy_score: Counter<(u32, Option<u32>)>,
     disk_sequential_write_score: Counter<(u32, Option<u32>)>,
     disk_random_write_score: Counter<(u32, Option<u32>)>,
+    cpu_vendor: Counter<String>,
 }
 
 impl ChainStatsCollator {
@@ -155,7 +177,7 @@ impl ChainStatsCollator {
         self.linux_distro.modify(
             sysinfo
                 .and_then(|sysinfo| sysinfo.linux_distro.as_ref())
-                .map(|value| &**value),
+                .map(kernel_version_number),
             op,
         );
 
@@ -164,6 +186,11 @@ impl ChainStatsCollator {
             op,
         );
 
+        self.cpu_vendor.modify(
+            sysinfo.and_then(|sysinfo| sysinfo.cpu.as_ref().map(cpu_vendor)),
+            op,
+        );
+
         self.update_hwbench(hwbench, op);
     }
 
@@ -220,6 +247,7 @@ impl ChainStatsCollator {
                 .disk_sequential_write_score
                 .generate_ranking_ordered(),
             disk_random_write_score: self.disk_random_write_score.generate_ranking_ordered(),
+            cpu_vendor: self.cpu_vendor.generate_ranking_top(10),
         }
     }
 }

backend/telemetry_core/src/state/counter.rs

@@ -17,15 +17,15 @@
 use crate::feed_message::Ranking;
 use std::collections::HashMap;
 
-/// A data structure which counts how many occurences of a given key we've seen.
+/// A data structure which counts how many occurrences of a given key we've seen.
 #[derive(Default)]
 pub struct Counter<K> {
-    /// A map containing the number of occurences of a given key.
+    /// A map containing the number of occurrences of a given key.
     ///
     /// If there are none then the entry is removed.
     map: HashMap<K, u64>,
 
-    /// The number of occurences where the key is `None`.
+    /// The number of occurrences where the key is `None`.
     empty: u64,
 }