Commitda54c8a

authored

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

1 parent7a7105a commitda54c8aCopy full SHA for da54c8a

File tree

-3

lines changed

-3

lines changed

Lines changed: 6 additions & 3 deletions

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,jint)bool {`
`210`		`-returne.Labels[i].Name<e.Labels[j].Name`
	`213`	`+returnexpectedLabels[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`	`returntrue`
`217`	`220`	`}`

Comments

(0)