Fix parser to include iterations.

PiperOrigin-RevId: 347038652

2 files changed, 23 insertions, 6 deletions

diff --git a/tools/bigquery/bigquery.go b/tools/bigquery/bigquery.go
index 544af3876..a4ca93ec2 100644
--- a/tools/bigquery/bigquery.go
+++ b/tools/bigquery/bigquery.go
@@ -21,6 +21,7 @@ package bigquery
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"strings"
 	"time"
 
@@ -109,6 +110,12 @@ func NewBenchmark(name string, iters int) *Benchmark {
 	return &Benchmark{
 		Name:   name,
 		Metric: make([]*Metric, 0),
+		Condition: []*Condition{
+			{
+				Name:  "iterations",
+				Value: strconv.Itoa(iters),
+			},
+		},
 	}
 }
 
diff --git a/tools/parsers/go_parser_test.go b/tools/parsers/go_parser_test.go
index f0737d46b..39a13b4af 100644
--- a/tools/parsers/go_parser_test.go
+++ b/tools/parsers/go_parser_test.go
@@ -34,6 +34,10 @@ func TestParseLine(t *testing.T) {
 				Name: "BenchmarkIperf",
 				Condition: []*bigquery.Condition{
 					{
+						Name:  "iterations",
+						Value: "1",
+					},
+					{
 						Name:  "GOMAXPROCS",
 						Value: "6",
 					},
@@ -63,6 +67,10 @@ func TestParseLine(t *testing.T) {
 				Name: "BenchmarkRuby",
 				Condition: []*bigquery.Condition{
 					{
+						Name:  "iterations",
+						Value: "1",
+					},
+					{
 						Name:  "GOMAXPROCS",
 						Value: "6",
 					},
@@ -100,12 +108,14 @@ func TestParseLine(t *testing.T) {
 			}
 
 			if !cmp.Equal(tc.want, got, nil) {
-				for _, c := range got.Condition {
-					t.Logf("Cond: %+v", c)
+				for i := range got.Condition {
+					t.Logf("Metric: want: %+v got:%+v", got.Condition[i], tc.want.Condition[i])
 				}
-				for _, m := range got.Metric {
-					t.Logf("Metric: %+v", m)
+
+				for i := range got.Metric {
+					t.Logf("Metric: want: %+v got:%+v", got.Metric[i], tc.want.Metric[i])
 				}
+
 				t.Fatalf("Compare failed want: %+v got: %+v", tc.want, got)
 			}
 		})
@@ -131,7 +141,7 @@ func TestParseOutput(t *testing.T) {
 			`,
 			numBenchmarks: 2,
 			numMetrics:    1,
-			numConditions: 1,
+			numConditions: 2,
 		},
 		{
 			name: "Ruby",
@@ -142,7 +152,7 @@ BenchmarkRuby/server_threads.5
 BenchmarkRuby/server_threads.5-6 1	1416003331 ns/op	0.00950 average_latency.s 465 requests_per_second.QPS`,
 			numBenchmarks: 2,
 			numMetrics:    3,
-			numConditions: 2,
+			numConditions: 3,
 		},
 	}