test(parsers): Sort metrics to avoid flaky tests (#14284)

srebhan · powersj · commit c66de22db16b · 2023-11-13T12:46:34.000-07:00
(cherry picked from commit 5d16330)
diff --git a/plugins/parsers/csv/parser_test.go b/plugins/parsers/csv/parser_test.go
@@ -1560,7 +1560,7 @@ func TestBenchmarkData(t *testing.T) {
 
 	actual, err := plugin.Parse([]byte(benchmarkData))
 	require.NoError(t, err)
-	testutil.RequireMetricsEqual(t, expected, actual)
+	testutil.RequireMetricsEqual(t, expected, actual, testutil.SortMetrics())
 }
 
 func BenchmarkParsing(b *testing.B) {
diff --git a/plugins/parsers/dropwizard/parser_test.go b/plugins/parsers/dropwizard/parser_test.go
@@ -638,7 +638,7 @@ func TestBenchmarkData(t *testing.T) {
 
 	actual, err := plugin.Parse([]byte(benchmarkData))
 	require.NoError(t, err)
-	testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime())
+	testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime(), testutil.SortMetrics())
 }
 
 func BenchmarkParsing(b *testing.B) {
diff --git a/plugins/parsers/form_urlencoded/parser_test.go b/plugins/parsers/form_urlencoded/parser_test.go
@@ -200,7 +200,7 @@ func TestBenchmarkData(t *testing.T) {
 
 	actual, err := plugin.Parse([]byte(benchmarkData))
 	require.NoError(t, err)
-	testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime())
+	testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime(), testutil.SortMetrics())
 }
 
 func BenchmarkParsing(b *testing.B) {
diff --git a/plugins/parsers/grok/parser_test.go b/plugins/parsers/grok/parser_test.go
@@ -1225,7 +1225,7 @@ func TestBenchmarkData(t *testing.T) {
 
 	actual, err := plugin.Parse([]byte(benchmarkData))
 	require.NoError(t, err)
-	testutil.RequireMetricsEqual(t, expected, actual)
+	testutil.RequireMetricsEqual(t, expected, actual, testutil.SortMetrics())
 }
 
 func BenchmarkParsing(b *testing.B) {
diff --git a/plugins/parsers/json/parser_test.go b/plugins/parsers/json/parser_test.go
@@ -1440,7 +1440,7 @@ func TestBenchmarkData(t *testing.T) {
 	// Do the parsing
 	actual, err := plugin.Parse([]byte(benchmarkData))
 	require.NoError(t, err)
-	testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime())
+	testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime(), testutil.SortMetrics())
 }
 
 func BenchmarkParsingSequential(b *testing.B) {
diff --git a/plugins/parsers/logfmt/parser_test.go b/plugins/parsers/logfmt/parser_test.go
@@ -323,7 +323,7 @@ func TestBenchmarkData(t *testing.T) {
 
 	actual, err := plugin.Parse([]byte(benchmarkData))
 	require.NoError(t, err)
-	testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime())
+	testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime(), testutil.SortMetrics())
 }
 
 func BenchmarkParsing(b *testing.B) {
diff --git a/plugins/parsers/nagios/parser_test.go b/plugins/parsers/nagios/parser_test.go
@@ -564,7 +564,7 @@ func TestBenchmarkData(t *testing.T) {
 
 	actual, err := plugin.Parse([]byte(benchmarkData))
 	require.NoError(t, err)
-	testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime())
+	testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime(), testutil.SortMetrics())
 }
 
 func BenchmarkParsing(b *testing.B) {
diff --git a/plugins/parsers/opentsdb/parser_test.go b/plugins/parsers/opentsdb/parser_test.go
@@ -344,7 +344,7 @@ func TestBenchmarkData(t *testing.T) {
 
 	actual, err := plugin.Parse([]byte(benchmarkData))
 	require.NoError(t, err)
-	testutil.RequireMetricsEqual(t, expected, actual)
+	testutil.RequireMetricsEqual(t, expected, actual, testutil.SortMetrics())
 }
 
 func BenchmarkParsing(b *testing.B) {
diff --git a/plugins/parsers/prometheus/parser_test.go b/plugins/parsers/prometheus/parser_test.go
@@ -695,7 +695,7 @@ func TestBenchmarkData(t *testing.T) {
 
 	actual, err := plugin.Parse([]byte(benchmarkData))
 	require.NoError(t, err)
-	testutil.RequireMetricsEqual(t, expected, actual)
+	testutil.RequireMetricsEqual(t, expected, actual, testutil.SortMetrics())
 }
 
 func BenchmarkParsing(b *testing.B) {
diff --git a/plugins/parsers/value/parser_test.go b/plugins/parsers/value/parser_test.go
@@ -319,7 +319,7 @@ func TestBenchmarkData(t *testing.T) {
 
 	actual, err := plugin.Parse([]byte(benchmarkData))
 	require.NoError(t, err)
-	testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime())
+	testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime(), testutil.SortMetrics())
 }
 
 func BenchmarkParsing(b *testing.B) {
diff --git a/plugins/parsers/wavefront/parser_test.go b/plugins/parsers/wavefront/parser_test.go
@@ -328,7 +328,7 @@ func TestBenchmarkData(t *testing.T) {
 
 	actual, err := plugin.Parse([]byte(benchmarkData))
 	require.NoError(t, err)
-	testutil.RequireMetricsEqual(t, expected, actual)
+	testutil.RequireMetricsEqual(t, expected, actual, testutil.SortMetrics())
 }
 
 func BenchmarkParsing(b *testing.B) {

Original file line number	Diff line number	Diff line change
`@@ -1560,7 +1560,7 @@ func TestBenchmarkData(t *testing.T) {`
`1560`	`1560`
`1561`	`1561`	`actual, err := plugin.Parse([]byte(benchmarkData))`
`1562`	`1562`	`require.NoError(t, err)`
`1563`		`- testutil.RequireMetricsEqual(t, expected, actual)`
	`1563`	`+ testutil.RequireMetricsEqual(t, expected, actual, testutil.SortMetrics())`
`1564`	`1564`	`}`
`1565`	`1565`
`1566`	`1566`	`func BenchmarkParsing(b *testing.B) {`
Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,7 @@ func TestBenchmarkData(t *testing.T) {`
`638`	`638`
`639`	`639`	`actual, err := plugin.Parse([]byte(benchmarkData))`
`640`	`640`	`require.NoError(t, err)`
`641`		`- testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime())`
	`641`	`+ testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime(), testutil.SortMetrics())`
`642`	`642`	`}`
`643`	`643`
`644`	`644`	`func BenchmarkParsing(b *testing.B) {`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ func TestBenchmarkData(t *testing.T) {`
`200`	`200`
`201`	`201`	`actual, err := plugin.Parse([]byte(benchmarkData))`
`202`	`202`	`require.NoError(t, err)`
`203`		`- testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime())`
	`203`	`+ testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime(), testutil.SortMetrics())`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`func BenchmarkParsing(b *testing.B) {`
Original file line number	Diff line number	Diff line change
`@@ -1225,7 +1225,7 @@ func TestBenchmarkData(t *testing.T) {`
`1225`	`1225`
`1226`	`1226`	`actual, err := plugin.Parse([]byte(benchmarkData))`
`1227`	`1227`	`require.NoError(t, err)`
`1228`		`- testutil.RequireMetricsEqual(t, expected, actual)`
	`1228`	`+ testutil.RequireMetricsEqual(t, expected, actual, testutil.SortMetrics())`
`1229`	`1229`	`}`
`1230`	`1230`
`1231`	`1231`	`func BenchmarkParsing(b *testing.B) {`
Original file line number	Diff line number	Diff line change
`@@ -1440,7 +1440,7 @@ func TestBenchmarkData(t *testing.T) {`
`1440`	`1440`	`// Do the parsing`
`1441`	`1441`	`actual, err := plugin.Parse([]byte(benchmarkData))`
`1442`	`1442`	`require.NoError(t, err)`
`1443`		`- testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime())`
	`1443`	`+ testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime(), testutil.SortMetrics())`
`1444`	`1444`	`}`
`1445`	`1445`
`1446`	`1446`	`func BenchmarkParsingSequential(b *testing.B) {`
Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ func TestBenchmarkData(t *testing.T) {`
`323`	`323`
`324`	`324`	`actual, err := plugin.Parse([]byte(benchmarkData))`
`325`	`325`	`require.NoError(t, err)`
`326`		`- testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime())`
	`326`	`+ testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime(), testutil.SortMetrics())`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`func BenchmarkParsing(b *testing.B) {`
Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ func TestBenchmarkData(t *testing.T) {`
`564`	`564`
`565`	`565`	`actual, err := plugin.Parse([]byte(benchmarkData))`
`566`	`566`	`require.NoError(t, err)`
`567`		`- testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime())`
	`567`	`+ testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime(), testutil.SortMetrics())`
`568`	`568`	`}`
`569`	`569`
`570`	`570`	`func BenchmarkParsing(b *testing.B) {`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ func TestBenchmarkData(t *testing.T) {`
`344`	`344`
`345`	`345`	`actual, err := plugin.Parse([]byte(benchmarkData))`
`346`	`346`	`require.NoError(t, err)`
`347`		`- testutil.RequireMetricsEqual(t, expected, actual)`
	`347`	`+ testutil.RequireMetricsEqual(t, expected, actual, testutil.SortMetrics())`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`func BenchmarkParsing(b *testing.B) {`
Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ func TestBenchmarkData(t *testing.T) {`
`695`	`695`
`696`	`696`	`actual, err := plugin.Parse([]byte(benchmarkData))`
`697`	`697`	`require.NoError(t, err)`
`698`		`- testutil.RequireMetricsEqual(t, expected, actual)`
	`698`	`+ testutil.RequireMetricsEqual(t, expected, actual, testutil.SortMetrics())`
`699`	`699`	`}`
`700`	`700`
`701`	`701`	`func BenchmarkParsing(b *testing.B) {`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ func TestBenchmarkData(t *testing.T) {`
`319`	`319`
`320`	`320`	`actual, err := plugin.Parse([]byte(benchmarkData))`
`321`	`321`	`require.NoError(t, err)`
`322`		`- testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime())`
	`322`	`+ testutil.RequireMetricsEqual(t, expected, actual, testutil.IgnoreTime(), testutil.SortMetrics())`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`func BenchmarkParsing(b *testing.B) {`