fix: fix data race in TestLabelsAggregation tests (#12578)

dannykopping · web-flow · commit da54c8a51ffc · 2024-03-13T13:47:22.000+02:00
diff --git a/coderd/prometheusmetrics/aggregator_test.go b/coderd/prometheusmetrics/aggregator_test.go
@@ -204,14 +204,17 @@ func verifyCollectedMetrics(t *testing.T, expected []*agentproto.Stats_Metric, a
 			require.Failf(t, "unsupported type: %s", string(e.Type))
 		}
 
+		expectedLabels := make([]*agentproto.Stats_Metric_Label, len(e.Labels))
+		copy(expectedLabels, e.Labels)
+
 		dtoLabels := asMetricAgentLabels(d.GetLabel())
 		// dto labels are sorted in alphabetical order.
 		sortFn := func(i, j int) bool {
-			return e.Labels[i].Name < e.Labels[j].Name
+			return expectedLabels[i].Name < expectedLabels[j].Name
 		}
-		sort.Slice(e.Labels, sortFn)
+		sort.Slice(expectedLabels, sortFn)
 		sort.Slice(dtoLabels, sortFn)
-		require.Equal(t, e.Labels, dtoLabels, d.String())
+		require.Equal(t, expectedLabels, dtoLabels, d.String())
 	}
 	return true
 }

Original file line number	Diff line number	Diff line change
`@@ -204,14 +204,17 @@ func verifyCollectedMetrics(t testing.T, expected []agentproto.Stats_Metric, a`
`204`	`204`	`require.Failf(t, "unsupported type: %s", string(e.Type))`
`205`	`205`	`}`
`206`	`206`
	`207`	`+ expectedLabels := make([]*agentproto.Stats_Metric_Label, len(e.Labels))`
	`208`	`+ copy(expectedLabels, e.Labels)`
	`209`	`+`
`207`	`210`	`dtoLabels := asMetricAgentLabels(d.GetLabel())`
`208`	`211`	`// dto labels are sorted in alphabetical order.`
`209`	`212`	`sortFn := func(i, j int) bool {`
`210`		`- return e.Labels[i].Name < e.Labels[j].Name`
	`213`	`+ return expectedLabels[i].Name < expectedLabels[j].Name`
`211`	`214`	`}`
`212`		`- sort.Slice(e.Labels, sortFn)`
	`215`	`+ sort.Slice(expectedLabels, sortFn)`
`213`	`216`	`sort.Slice(dtoLabels, sortFn)`
`214`		`- require.Equal(t, e.Labels, dtoLabels, d.String())`
	`217`	`+ require.Equal(t, expectedLabels, dtoLabels, d.String())`
`215`	`218`	`}`
`216`	`219`	`return true`
`217`	`220`	`}`