Merge #144218

144218: roachtest/allocbench: Add labels to the std-dev metric r=sambhav-jain-16 a=csgourav

Adds unit and is_higher_better tags to std-dev metrics being emitted from allocbench tests.
Adds code for aggregate value generation in cdc/scan test.
Adds missing unit label for tpcc test.

Epic: none
Fixes: none

Co-authored-by: Gourav Kumar <[email protected]>

Author: craig[bot]

pkg/cmd/roachtest/tests/allocation_bench.go

@@ -351,7 +351,20 @@ func runAllocationBench(
 	// worst/best case outcomes.
 	result, sampleStddev := findMinDistanceClusterStatRun(t, samples)
 	for tag, value := range sampleStddev {
-		result.Total[fmt.Sprintf("std_%s", tag)] = value
+		metricName := fmt.Sprintf("std_%s", tag)
+		result.Total[metricName] = value
+
+		// Populate BenchmarkMetrics with metadata if it's initialized
+		// (it will be initialized only when OpenMetrics is enabled)
+		if result.BenchmarkMetrics != nil {
+			result.BenchmarkMetrics[metricName] = roachtestutil.AggregatedMetric{
+				Name:             metricName,
+				Value:            roachtestutil.MetricPoint(value),
+				Unit:             "stddev",
+				IsHigherBetter:   false, // Lower standard deviation is better
+				AdditionalLabels: nil,
+			}
+		}
 	}
 	if result == nil {
 		t.L().PrintfCtx(ctx, "no samples found for allocation bench run, won't put any artifacts")

pkg/cmd/roachtest/tests/cdc_bench.go

@@ -92,6 +92,26 @@ func registerCDCBench(r registry.Registry) {
 				Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
 					runCDCBenchScan(ctx, t, c, scanType, rows, ranges, format)
 				},
+				PostProcessPerfMetrics: func(testName string, histograms *roachtestutil.HistogramMetric) (roachtestutil.AggregatedPerfMetrics, error) {
+					metrics := roachtestutil.AggregatedPerfMetrics{}
+
+					// Find the scan-rate summary
+					var scanRate float64
+					if len(histograms.Summaries) != 1 {
+						return nil, errors.Errorf("expected exactly 1 histogram summary, got %d", len(histograms.Summaries))
+					}
+					scanRate = float64(histograms.Summaries[0].HighestTrackableValue) / float64(time.Second)
+
+					// Add scan rate metric (higher is better)
+					metrics = append(metrics, &roachtestutil.AggregatedMetric{
+						Name:           "scan_rate",
+						Value:          roachtestutil.MetricPoint(scanRate),
+						Unit:           "rows/s",
+						IsHigherBetter: true,
+					})
+
+					return metrics, nil
+				},
 			})
 		}
 	}

pkg/cmd/roachtest/tests/tpcc.go

@@ -163,7 +163,7 @@ func getMaxWarehousesAboveEfficiency(
 	aggregatedMetrics = append(aggregatedMetrics, &roachtestutil.AggregatedMetric{
 		Name:           fmt.Sprintf("%s_max_warehouse", testName),
 		Value:          roachtestutil.MetricPoint(maxEfficientWarehouse),
-		Unit:           "",
+		Unit:           "warehouses",
 		IsHigherBetter: true,
 		// labels added here override any labels imported from the stats file.
 		// since we don't want to specify a warehouse label for this metric, we pass an empty label.