From da54c8a51ffc18f1691455112d8cde1e4ced4e71 Mon Sep 17 00:00:00 2001 From: Danny Kopping Date: Wed, 13 Mar 2024 13:47:22 +0200 Subject: [PATCH] fix: fix data race in TestLabelsAggregation tests (#12578) --- coderd/prometheusmetrics/aggregator_test.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/coderd/prometheusmetrics/aggregator_test.go b/coderd/prometheusmetrics/aggregator_test.go index 412dfae1e7..59a4b629bf 100644 --- 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 }