Rename benchmarks

Author: spoutn1k

lustre-collector/benches/combine_memory.rs

@@ -1,7 +1,7 @@
 use combine::parser::EasyParser;
 use lustre_collector::quota::parse as combine_parse;
-use memory_benchmarking::{BencherOutput, trace_memory};
-use std::time::Duration;
+use memory_benchmarking::{MemoryMetrics, trace_memory};
+use std::{collections::HashMap, time::Duration};
 
 pub fn main() {
     let buffer = std::fs::read_to_string("benches/quotas.yml").expect("Failed to read file");
@@ -24,10 +24,11 @@ pub fn main() {
         })
         .collect();
 
-    let bencher_output: BencherOutput = samples.as_slice().into();
+    let memory_usage: MemoryMetrics = samples.as_slice().into();
 
-    let serialized_metrics = serde_json::to_string_pretty(&bencher_output)
-        .expect("Failed to serialize benchmark output.");
+    let serialized_metrics =
+        serde_json::to_string_pretty(&HashMap::from([("quota_parsing", memory_usage)]))
+            .expect("Failed to serialize benchmark output.");
 
     println!("{serialized_metrics}");
 }

lustrefs-exporter/benches/scrape_memory_metrics.rs

@@ -5,8 +5,8 @@
 mod common;
 
 use common::load_test_concurrent;
-use memory_benchmarking::{BencherOutput, trace_memory_async};
-use std::time::Duration;
+use memory_benchmarking::{MemoryMetrics, trace_memory_async};
+use std::{collections::HashMap, time::Duration};
 
 pub fn main() {
     let samples: Vec<_> = (0..10)
@@ -32,8 +32,11 @@ pub fn main() {
         })
         .collect();
 
-    let serialized_metrics = serde_json::to_string_pretty(&BencherOutput::from(samples.as_slice()))
-        .expect("Failed to serialize benchmark output.");
+    let serialized_metrics = serde_json::to_string_pretty(&HashMap::from([(
+        "scrape_memory_usage",
+        MemoryMetrics::from(samples.as_slice()),
+    )]))
+    .expect("Failed to serialize benchmark output.");
 
     println!("{serialized_metrics}");
 }

lustrefs-exporter/testcmds/cmds_load_test_concurrent.json

@@ -3,12 +3,7 @@ use std::time::Duration;
 use sysinfo::{Pid, ProcessExt, System, SystemExt};
 
 #[derive(serde::Serialize)]
-pub struct BencherOutput {
-    memory_usage: BencherMetrics,
-}
-
-#[derive(serde::Serialize)]
-struct BencherMetrics {
+pub struct MemoryMetrics {
     start_rss_mib: MetricEntry,
     peak_rss_mib: MetricEntry,
     end_rss_mib: MetricEntry,
@@ -90,27 +85,25 @@ impl GetStatsExt for &[MemoryUsage] {
     }
 }
 
-impl From<&[MemoryUsage]> for BencherOutput {
+impl From<&[MemoryUsage]> for MemoryMetrics {
     fn from(samples: &[MemoryUsage]) -> Self {
-        BencherOutput {
-            memory_usage: BencherMetrics {
-                start_rss_mib: samples.get_stats(|x| x.start_rss).bytes_as_mib(),
-                peak_rss_mib: samples.get_stats(|x| x.max_rss).bytes_as_mib(),
-                end_rss_mib: samples.get_stats(|x| x.end_rss).bytes_as_mib(),
-                memory_growth_mib: samples.get_stats(|x| x.memory_growth()).bytes_as_mib(),
-                peak_over_start_rss_ratio: samples
-                    .get_stats(|x| x.peak_over_start_rss())
-                    .bytes_as_mib(),
-                avg_runtime_rss_mib: samples.get_stats(|x| x.avg_rss).bytes_as_mib(),
-                start_virtual_mib: samples.get_stats(|x| x.start_virtual).bytes_as_mib(),
-                peak_virtual_mib: samples.get_stats(|x| x.max_virtual).bytes_as_mib(),
-                end_virtual_mib: samples.get_stats(|x| x.end_virtual).bytes_as_mib(),
-                virtual_growth_mib: samples.get_stats(|x| x.virtual_growth()).bytes_as_mib(),
-                peak_over_start_virtual_ratio: samples
-                    .get_stats(|x| x.peak_over_start_virtual())
-                    .bytes_as_mib(),
-                avg_runtime_virtual_mib: samples.get_stats(|x| x.avg_virtual).bytes_as_mib(),
-            },
+        MemoryMetrics {
+            start_rss_mib: samples.get_stats(|x| x.start_rss).bytes_as_mib(),
+            peak_rss_mib: samples.get_stats(|x| x.max_rss).bytes_as_mib(),
+            end_rss_mib: samples.get_stats(|x| x.end_rss).bytes_as_mib(),
+            memory_growth_mib: samples.get_stats(|x| x.memory_growth()).bytes_as_mib(),
+            peak_over_start_rss_ratio: samples
+                .get_stats(|x| x.peak_over_start_rss())
+                .bytes_as_mib(),
+            avg_runtime_rss_mib: samples.get_stats(|x| x.avg_rss).bytes_as_mib(),
+            start_virtual_mib: samples.get_stats(|x| x.start_virtual).bytes_as_mib(),
+            peak_virtual_mib: samples.get_stats(|x| x.max_virtual).bytes_as_mib(),
+            end_virtual_mib: samples.get_stats(|x| x.end_virtual).bytes_as_mib(),
+            virtual_growth_mib: samples.get_stats(|x| x.virtual_growth()).bytes_as_mib(),
+            peak_over_start_virtual_ratio: samples
+                .get_stats(|x| x.peak_over_start_virtual())
+                .bytes_as_mib(),
+            avg_runtime_virtual_mib: samples.get_stats(|x| x.avg_virtual).bytes_as_mib(),
         }
     }
 }