Skip to content

fix: fix data race in TestLabelsAggregation tests #12578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2024
Merged

fix: fix data race in TestLabelsAggregation tests #12578

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be940a0
fix: data race in TestLabelsAggregation tests
dannykopping Mar 13, 2024
9113c01
Using copy instead
dannykopping Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Using copy instead 
Signed-off-by: Danny Kopping <danny@coder.com>
  • Loading branch information
@dannykopping
dannykopping committed Mar 13, 2024
commit 9113c015ee1d937707451836172eca47d987e1ab
10 changes: 2 additions & 8 deletions coderd/prometheusmetrics/aggregator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,8 @@ func verifyCollectedMetrics(t *testing.T, expected []*agentproto.Stats_Metric, a
require.Failf(t, "unsupported type: %s", string(e.Type))
}

// make a copy of the expected labels because tests run in parallel and can cause data races
var expectedLabels []*agentproto.Stats_Metric_Label
for _, l := range e.Labels {
expectedLabels = append(expectedLabels, &agentproto.Stats_Metric_Label{
Name: l.Name,
Value: l.Value,
})
}
expectedLabels := make([]*agentproto.Stats_Metric_Label, len(e.Labels))
copy(expectedLabels, e.Labels)

dtoLabels := asMetricAgentLabels(d.GetLabel())
// dto labels are sorted in alphabetical order.
Expand Down