Fix duplicate name in Prometheus labels

bojand · Apr 9, 2022 · 588efeb · 588efeb
1 parent 983a3bf
commit 588efeb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/printer/prometheus.go b/printer/prometheus.go
@@ -160,20 +160,12 @@ func (rp *ReportPrinter) printPrometheusMetricGauge(
 }
 
 func (rp *ReportPrinter) getCommonPrometheusLabels() ([]*promtypes.LabelPair, error) {
-	labels := make([]*promtypes.LabelPair, 0, len(rp.Report.Tags)+5)
 
-	labels = append(labels,
-		&promtypes.LabelPair{
-			Name:  ptrString("name"),
-			Value: &rp.Report.Name,
-		},
-		&promtypes.LabelPair{
-			Name:  ptrString("end_reason"),
-			Value: ptrString(string(rp.Report.EndReason)),
-		},
-	)
+	options := map[string]string{
+		"name":       rp.Report.Name,
+		"end_reason": string(rp.Report.EndReason),
+	}
 
-	options := map[string]string{}
 	type Alias runner.Options
 	j, err := json.Marshal(&struct {
 		ImportPaths      string `json:"import-paths"`
@@ -263,6 +255,8 @@ func (rp *ReportPrinter) getCommonPrometheusLabels() ([]*promtypes.LabelPair, er
 		delete(options, "load-max-duration")
 	}
 
+	labels := make([]*promtypes.LabelPair, 0, len(rp.Report.Tags)+5)
+
 	for k, v := range options {
 		k, v := k, v
 

diff --git a/printer/prometheus_test.go b/printer/prometheus_test.go
@@ -41,6 +41,7 @@ func TestPrinter_printPrometheus(t *testing.T) {
 					"Internal":         3,
 					"DeadlineExceeded": 2},
 				Options: runner.Options{
+					Name:         "run name",
 					Call:         "helloworld.Greeter.SayHello",
 					Proto:        "/apis/greeter.proto",
 					Host:         "0.0.0.0:50051",