From 152579a4142111dcde209045eeaa50c0d184d7c3 Mon Sep 17 00:00:00 2001
From: marc <marcinbieszke@gmail.com>
Date: Thu, 17 Jul 2025 06:57:41 +0200
Subject: [PATCH 1/2] move benchmarks to bencher 0.1.5

---
 Cargo.lock                 |  1 +
 metrics/Cargo.toml         |  2 ++
 metrics/benches/metrics.rs | 37 +++++++++++++++++++------------------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 61666e6283e..8b686955c6b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9178,6 +9178,7 @@ dependencies = [
 name = "solana-metrics"
 version = "3.0.0"
 dependencies = [
+ "bencher",
  "crossbeam-channel",
  "env_logger 0.11.8",
  "gethostname",
diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml
index d81b5f61a73..cb6e51970f9 100644
--- a/metrics/Cargo.toml
+++ b/metrics/Cargo.toml
@@ -26,9 +26,11 @@ solana-time-utils = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
+bencher = { workspace = true }
 env_logger = { workspace = true }
 rand = { workspace = true }
 serial_test = { workspace = true }
 
 [[bench]]
 name = "metrics"
+harness = false
diff --git a/metrics/benches/metrics.rs b/metrics/benches/metrics.rs
index f8038ef5120..dec4a0e2bbf 100644
--- a/metrics/benches/metrics.rs
+++ b/metrics/benches/metrics.rs
@@ -1,8 +1,5 @@
-#![feature(test)]
-
-extern crate test;
-
 use {
+    bencher::{benchmark_group, benchmark_main, black_box, Bencher},
     log::*,
     rand::distributions::{Distribution, Uniform},
     solana_metrics::{
@@ -11,11 +8,9 @@ use {
         metrics::{serialize_points, test_mocks::MockMetricsWriter, MetricsAgent},
     },
     std::{sync::Arc, time::Duration},
-    test::Bencher,
 };
 
-#[bench]
-fn bench_write_points(bencher: &mut Bencher) {
+fn bench_write_points(b: &mut Bencher) {
     let points = (0..10)
         .map(|_| {
             DataPoint::new("measurement")
@@ -26,19 +21,18 @@ fn bench_write_points(bencher: &mut Bencher) {
         })
         .collect();
     let host_id = "benchmark-host-id";
-    bencher.iter(|| {
+    b.iter(|| {
         for _ in 0..10 {
-            test::black_box(serialize_points(&points, host_id));
+            black_box(serialize_points(&points, host_id));
         }
     })
 }
 
-#[bench]
-fn bench_datapoint_submission(bencher: &mut Bencher) {
+fn bench_datapoint_submission(b: &mut Bencher) {
     let writer = Arc::new(MockMetricsWriter::new());
     let agent = MetricsAgent::new(writer, Duration::from_secs(10), 1000);
 
-    bencher.iter(|| {
+    b.iter(|| {
         for i in 0..1000 {
             agent.submit(
                 DataPoint::new("measurement")
@@ -51,12 +45,11 @@ fn bench_datapoint_submission(bencher: &mut Bencher) {
     })
 }
 
-#[bench]
-fn bench_counter_submission(bencher: &mut Bencher) {
+fn bench_counter_submission(b: &mut Bencher) {
     let writer = Arc::new(MockMetricsWriter::new());
     let agent = MetricsAgent::new(writer, Duration::from_secs(10), 1000);
 
-    bencher.iter(|| {
+    b.iter(|| {
         for i in 0..1000 {
             agent.submit_counter(CounterPoint::new("counter 1"), Level::Info, i);
         }
@@ -64,14 +57,13 @@ fn bench_counter_submission(bencher: &mut Bencher) {
     })
 }
 
-#[bench]
-fn bench_random_submission(bencher: &mut Bencher) {
+fn bench_random_submission(b: &mut Bencher) {
     let writer = Arc::new(MockMetricsWriter::new());
     let agent = MetricsAgent::new(writer, Duration::from_secs(10), 1000);
     let mut rng = rand::thread_rng();
     let die = Uniform::<i32>::from(1..7);
 
-    bencher.iter(|| {
+    b.iter(|| {
         for i in 0..1000 {
             let dice = die.sample(&mut rng);
 
@@ -89,3 +81,12 @@ fn bench_random_submission(bencher: &mut Bencher) {
         agent.flush();
     })
 }
+
+benchmark_group!(
+    benches,
+    bench_write_points,
+    bench_datapoint_submission,
+    bench_counter_submission,
+    bench_random_submission
+);
+benchmark_main!(benches);

From a4c60e55370a6823d5d37c032e0ac3b35964d6da Mon Sep 17 00:00:00 2001
From: marc <marcinbieszke@gmail.com>
Date: Fri, 18 Jul 2025 18:49:59 +0200
Subject: [PATCH 2/2] use std::hint::black_box /might be a bit more
 future-ready

---
 metrics/benches/metrics.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metrics/benches/metrics.rs b/metrics/benches/metrics.rs
index dec4a0e2bbf..e762066cdd2 100644
--- a/metrics/benches/metrics.rs
+++ b/metrics/benches/metrics.rs
@@ -1,5 +1,5 @@
 use {
-    bencher::{benchmark_group, benchmark_main, black_box, Bencher},
+    bencher::{benchmark_group, benchmark_main, Bencher},
     log::*,
     rand::distributions::{Distribution, Uniform},
     solana_metrics::{
@@ -7,7 +7,7 @@ use {
         datapoint::DataPoint,
         metrics::{serialize_points, test_mocks::MockMetricsWriter, MetricsAgent},
     },
-    std::{sync::Arc, time::Duration},
+    std::{hint::black_box, sync::Arc, time::Duration},
 };
 
 fn bench_write_points(b: &mut Bencher) {