From 507e0985875219f48e3049a32284962ed5057f77 Mon Sep 17 00:00:00 2001
From: Amaury Chamayou <amchamay@microsoft.com>
Date: Tue, 11 Jun 2024 08:08:45 +0000
Subject: [PATCH] Push values from pi_ls benchmark too

---
 .github/workflows/bencher.yml |  1 +
 tests/infra/basicperf.py      | 11 ++++-------
 tests/infra/piccolo_driver.py |  8 ++++++++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/bencher.yml b/.github/workflows/bencher.yml
index b41a90fae96a..b87f1bffc4a0 100644
--- a/.github/workflows/bencher.yml
+++ b/.github/workflows/bencher.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - bencher_improvements
   workflow_dispatch:
 
 jobs:
diff --git a/tests/infra/basicperf.py b/tests/infra/basicperf.py
index db7a57ff3307..8f2dd24f0e3f 100644
--- a/tests/infra/basicperf.py
+++ b/tests/infra/basicperf.py
@@ -378,7 +378,6 @@ def run(args):
                 for remote_client in clients:
                     remote_client.stop()
 
-                metrics = []
                 if not args.stop_primary_after_s:
                     primary, _ = network.find_primary()
                     with primary.client() as nc:
@@ -590,12 +589,10 @@ def table():
                     )
 
                 bf = infra.bencher.Bencher()
-                metrics.append(infra.bencher.Throughput(round(throughput, 1)))
-                for metric in metrics:
-                    bf.set(
-                        args.label,
-                        metric,
-                    )
+                bf.set(
+                    args.label,
+                    infra.bencher.Throughput(round(throughput, 1)),
+                )
 
             except Exception as e:
                 LOG.error(f"Stopping clients due to exception: {e}")
diff --git a/tests/infra/piccolo_driver.py b/tests/infra/piccolo_driver.py
index b69f79c5ff71..cf15e0dba516 100644
--- a/tests/infra/piccolo_driver.py
+++ b/tests/infra/piccolo_driver.py
@@ -210,6 +210,14 @@ def run(get_command, args):
                     perf_result = round(len(df_sends.index) / time_spent, 1)
                     LOG.success(f"{args.label}/{remote_client.name}: {perf_result}")
 
+                    # Throughput from only one client, preserved for legacy reason
+                    # see basicperf.py for a better, cross-client approach.
+                    bf = infra.bencher.Bencher()
+                    bf.set(
+                        args.label,
+                        infra.bencher.Throughput(perf_result),
+                    )
+
                 primary, _ = network.find_primary()
                 with primary.client() as nc:
                     r = nc.get("/node/memory")