[bench] Replace AWK tx/s script with b.ReportMetric

Makefile

@@ -208,33 +208,33 @@ kill-test-docker: FORCE
 # Benchmarks
 #########################
 
-# Run a load generation benchmarks with added TX/sec column.
+# Run load generation benchmarks.
 bench-loadgen: FORCE
-	$(go_cmd) test ./loadgen/... -bench "Benchmark.*" -run="^$$" | awk -f scripts/bench-tx-per-sec.awk
+	$(go_cmd) test ./loadgen/... -bench "Benchmark.*" -run="^$$"
 
-# Run dependency detector benchmarks with added op/sec column.
+# Run dependency detector benchmarks.
 bench-dep: FORCE
-	$(go_cmd) test ./service/coordinator/dependencygraph/... -timeout 60m -bench "BenchmarkDependencyGraph.*" -run="^$$" | awk -f scripts/bench-tx-per-sec.awk
+	$(go_cmd) test ./service/coordinator/dependencygraph/... -timeout 60m -bench "BenchmarkDependencyGraph.*" -run="^$$"
 
-# Run dependency detector benchmarks with added op/sec column.
+# Run preparer benchmarks.
 bench-preparer: FORCE
-	$(go_cmd) test ./service/vc/... -bench "BenchmarkPrepare.*" -run "^$$" | awk -f scripts/bench-tx-per-sec.awk
+	$(go_cmd) test ./service/vc/... -bench "BenchmarkPrepare.*" -run "^$$"
 
-# Run signature benchmarks with added op/sec column.
+# Run signature benchmarks.
 bench-sign: FORCE
-	$(go_cmd) test ./utils/signature/... -bench ".*" -run "^$$" | awk -f scripts/bench-tx-per-sec.awk
+	$(go_cmd) test ./utils/signature/... -bench ".*" -run "^$$"
 
-# Run sidecar benchmarks with added op/sec column.
+# Run sidecar benchmarks.
 bench-sidecar: FORCE
-	$(go_cmd) test ./service/sidecar/... -bench "Benchmark.*" -run "^$$" | awk -f scripts/bench-tx-per-sec.awk
+	$(go_cmd) test ./service/sidecar/... -bench "Benchmark.*" -run "^$$"
 
 # Run serialization benchmarks.
 bench-serialization: FORCE
 	$(go_cmd) test ./utils/serialization/... -bench "Benchmark.*" -run "^$$"
 
-# Run deliver benchmarks with added op/sec column.
+# Run deliver benchmarks.
 bench-deliver: FORCE
-	$(go_cmd) test ./utils/deliverorderer/... -bench "Benchmark.*" -run "^$$" | awk -f scripts/bench-tx-per-sec.awk
+	$(go_cmd) test ./utils/deliverorderer/... -bench "Benchmark.*" -run "^$$"
 
 #########################
 # Code Generation

loadgen/metrics/tracker_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/hyperledger/fabric-x-committer/utils"
+	"github.com/hyperledger/fabric-x-committer/utils/test"
 )
 
 //nolint:gocognit // cognitive complexity 24 > 15
@@ -89,6 +90,7 @@ func BenchmarkLatencyTrackerPortion(b *testing.B) {
 			for _, txID := range txIDs {
 				sampler(txID)
 			}
+			test.ReportTxPerSecond(b)
 		})
 	}
 }

loadgen/workload/stream_test.go

@@ -106,6 +106,7 @@ func BenchmarkGenTx(b *testing.B) {
 			txs := g.Consume(ctx, param)
 			sum += len(txs)
 		}
+		test.ReportTxPerSecond(b)
 	})
 }
 
@@ -125,6 +126,7 @@ func BenchmarkGenQuery(b *testing.B) {
 			q := g.Consume(ctx, ConsumeParameters{RequestedItems: request})
 			sum += len(q)
 		}
+		test.ReportTxPerSecond(b)
 	})
 }
 

service/coordinator/dependencygraph/manager_test.go

@@ -90,7 +90,7 @@ func BenchmarkDependencyGraph(b *testing.B) {
 								PrometheusMetricsProvider: monitoring.NewProvider(),
 							})
 
-							txPoll := workload.GenerateTransactions(b, p, max(b.N*3, batchSize*3))
+							txPoll := workload.GenerateTransactions(b, p, max(b.N, batchSize))
 
 							ctx := b.Context()
 							outCtx := channel.NewReader(ctx, out)
@@ -120,10 +120,12 @@ func BenchmarkDependencyGraph(b *testing.B) {
 							// Generates the load to the manager's queue.
 							go func() {
 								var i uint64
-								for ctx.Err() == nil && len(txPoll) > 0 {
-									take := min(batchSize, len(txPoll))
+								remaining := b.N
+								for ctx.Err() == nil && remaining > 0 {
+									take := min(batchSize, len(txPoll), remaining)
 									batch := workload.MapToCoordinatorBatch(i, txPoll[:take])
 									txPoll = txPoll[take:]
+									remaining -= take
 									inCtx.Write(&TransactionBatch{
 										ID:  i,
 										Txs: batch.Txs,
@@ -145,6 +147,7 @@ func BenchmarkDependencyGraph(b *testing.B) {
 								total += len(batch)
 							}
 							b.StopTimer()
+							test.ReportTxPerSecond(b)
 						})
 					}
 				})

service/sidecar/mapping_test.go

@@ -18,6 +18,7 @@ import (
 	"github.com/hyperledger/fabric-x-committer/api/servicepb"
 	"github.com/hyperledger/fabric-x-committer/loadgen/workload"
 	"github.com/hyperledger/fabric-x-committer/utils"
+	"github.com/hyperledger/fabric-x-committer/utils/test"
 )
 
 func BenchmarkMapOneBlock(b *testing.B) {
@@ -29,6 +30,7 @@ func BenchmarkMapOneBlock(b *testing.B) {
 	b.ResetTimer()
 	mappedBlock, err := mapBlock(block, &txIDToHeight)
 	b.StopTimer()
+	test.ReportTxPerSecond(b)
 	require.NoError(b, err, "This can never occur unless there is a bug in the relay.")
 	require.NotNil(b, mappedBlock)
 }
@@ -65,7 +67,7 @@ func BenchmarkMapBlockSize(b *testing.B) {
 				}
 				blockIdx++
 			}
-			b.ReportMetric(float64(b.N)/b.Elapsed().Seconds(), "tx/s")
+			test.ReportTxPerSecond(b)
 		})
 	}
 }

service/sidecar/notify_test.go

@@ -90,6 +90,7 @@ func BenchmarkNotifier(b *testing.B) {
 		notifiedCount += len(res.TxStatusEvents)
 	}
 	b.StopTimer()
+	test.ReportTxPerSecond(b)
 }
 
 type notifierTestEnv struct {

service/vc/preparer_test.go

@@ -681,7 +681,6 @@ func requireEqualMapOfLists[K comparable, V any](t *testing.T, expected, actual
 	}
 }
 
-//nolint:gocognit // single method for simplicity.
 func BenchmarkPrepare(b *testing.B) {
 	flogging.ActivateSpec("fatal")
 
@@ -698,18 +697,20 @@ func BenchmarkPrepare(b *testing.B) {
 				return p.run(ctx, w)
 			}, nil)
 
-			txPoll := workload.GenerateTransactions(b, nil, max(b.N*3, batchSize*3))
+			txPoll := workload.GenerateTransactions(b, nil, max(b.N, batchSize))
 
 			inCtx := channel.NewWriter(b.Context(), txBatch)
 			outCtx := channel.NewReader(b.Context(), preparedTxs)
 			b.ResetTimer()
 			// Generates the load to the preparer's queue.
 			go func() {
 				var i uint64
-				for b.Context().Err() == nil && len(txPoll) > 0 {
-					take := min(batchSize, len(txPoll))
+				remaining := b.N
+				for b.Context().Err() == nil && remaining > 0 {
+					take := min(batchSize, len(txPoll), remaining)
 					inCtx.Write(workload.MapToVcBatch(i, txPoll[:take]))
 					txPoll = txPoll[take:]
+					remaining -= take
 					i++
 				}
 			}()
@@ -723,6 +724,7 @@ func BenchmarkPrepare(b *testing.B) {
 				total += len(batch.txIDToHeight)
 			}
 			b.StopTimer()
+			test.ReportTxPerSecond(b)
 		})
 	}
 }

utils/deliverorderer/verify_test.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/hyperledger/fabric-x-committer/loadgen/workload"
 	"github.com/hyperledger/fabric-x-committer/utils/deliver"
+	"github.com/hyperledger/fabric-x-committer/utils/test"
 	"github.com/hyperledger/fabric-x-committer/utils/testcrypto"
 )
 
@@ -48,6 +49,7 @@ func BenchmarkVerifyBlock(b *testing.B) {
 				require.NoError(b, verErr)
 			}
 			b.StopTimer()
+			test.ReportTxPerSecond(b)
 		})
 	}
 }

utils/serialization/envelope_wrapper_test.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/hyperledger/fabric-x-committer/loadgen/workload"
 	"github.com/hyperledger/fabric-x-committer/utils/serialization"
+	"github.com/hyperledger/fabric-x-committer/utils/test"
 )
 
 // TestUnwrapEnvelopeLite tests UnwrapEnvelopeLite with well-formed input.
@@ -198,7 +199,7 @@ func BenchmarkUnwrapEnvelope(b *testing.B) {
 			b.Fatal(err)
 		}
 	}
-	b.ReportMetric(float64(b.N)/b.Elapsed().Seconds(), "tx/s")
+	test.ReportTxPerSecond(b)
 }
 
 func BenchmarkUnwrapEnvelopeLite(b *testing.B) {
@@ -210,7 +211,7 @@ func BenchmarkUnwrapEnvelopeLite(b *testing.B) {
 			b.Fatal(err)
 		}
 	}
-	b.ReportMetric(float64(b.N)/b.Elapsed().Seconds(), "tx/s")
+	test.ReportTxPerSecond(b)
 }
 
 // loadgenEnvelopes generates realistic serialized envelopes using the load

utils/test/benchmark.go

@@ -0,0 +1,15 @@
+/*
+Copyright IBM Corp. All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package test
+
+import "testing"
+
+// ReportTxPerSecond reports a tx/s custom metric on the benchmark.
+func ReportTxPerSecond(b *testing.B) {
+	b.Helper()
+	b.ReportMetric(float64(b.N)/b.Elapsed().Seconds(), "tx/s")
+}