From 5d16330c08804b71253c1ae37453266764c5d392 Mon Sep 17 00:00:00 2001
From: Sven Rebhan <36194019+srebhan@users.noreply.github.com>
Date: Mon, 13 Nov 2023 20:38:47 +0100
Subject: [PATCH] test(parsers): Sort metrics to avoid flaky tests (#14284)

---
 plugins/parsers/csv/parser_test.go             | 2 +-
 plugins/parsers/dropwizard/parser_test.go      | 2 +-
 plugins/parsers/form_urlencoded/parser_test.go | 2 +-
 plugins/parsers/grok/parser_test.go            | 2 +-
 plugins/parsers/json/parser_test.go            | 2 +-
 plugins/parsers/logfmt/parser_test.go          | 2 +-
 plugins/parsers/nagios/parser_test.go          | 2 +-
 plugins/parsers/opentsdb/parser_test.go        | 2 +-
 plugins/parsers/prometheus/parser_test.go      | 2 +-
 plugins/parsers/value/parser_test.go           | 2 +-
 plugins/parsers/wavefront/parser_test.go       | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/parsers/csv/parser_test.go b/plugins/parsers/csv/parser_test.go
index fd47db88a..1022bf232 100644
--- 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
index b0cf817b9..f388b31fd 100644
--- 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
index 01819ba02..8b30204e8 100644
--- 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
index 3df2c4017..0ba1573db 100644
--- 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
index affd4d9e1..5e3a64f57 100644
--- 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
index f3f1bf155..9d7f9d97b 100644
--- 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
index 23c71d070..464f56af7 100644
--- 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
index e10a9b5af..5f186b8fa 100644
--- 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
index 3c232337e..305522453 100644
--- 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
index 65e9edbc2..0213bae52 100644
--- 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
index 4ae7d7f07..1b0c4a279 100644
--- 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) {