[pkg/translator/signalfx] Remove usage of Map.Sort (#17844)

Replace it with comparetest module
open-telemetry · Jan 19, 2023 · a7ab5d3 · a7ab5d3
1 parent e78bd62
commit a7ab5d3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod
@@ -90,3 +90,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experiment
 replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx => ../../pkg/translator/signalfx
 
 retract v0.65.0
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../internal/comparetest
diff --git a/pkg/translator/signalfx/go.mod b/pkg/translator/signalfx/go.mod
@@ -4,20 +4,22 @@ go 1.18
 
 require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.69.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.69.0
 	github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3
 	github.com/stretchr/testify v1.8.1
 	go.opentelemetry.io/collector/pdata v1.0.0-rc3.0.20230112233839-f2a0133bf677
 	go.uber.org/multierr v1.9.0
 )
 
 require (
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kr/pretty v0.2.1 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.69.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	golang.org/x/net v0.5.0 // indirect
@@ -31,4 +33,8 @@ require (
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../../internal/common
 
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest => ../../../internal/comparetest
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../../internal/coreinternal
+
 retract v0.65.0
diff --git a/pkg/translator/signalfx/go.sum b/pkg/translator/signalfx/go.sum
diff --git a/pkg/translator/signalfx/to_metrics_test.go b/pkg/translator/signalfx/to_metrics_test.go
@@ -23,6 +23,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest"
 )
 
 func TestNumMetricTypes(t *testing.T) {
@@ -280,7 +282,7 @@ func TestToMetrics(t *testing.T) {
 			} else {
 				assert.NoError(t, err)
 			}
-			assert.Equal(t, tt.wantMetrics, md)
+			assert.NoError(t, comparetest.CompareMetrics(tt.wantMetrics, md))
 		})
 	}
 }
@@ -307,7 +309,6 @@ func buildDefaultMetrics(typ pmetric.MetricType, value interface{}, now time.Tim
 	dp.Attributes().PutStr("k0", "v0")
 	dp.Attributes().PutStr("k1", "v1")
 	dp.Attributes().PutStr("k2", "v2")
-	dp.Attributes().Sort()
 
 	dp.SetTimestamp(pcommon.NewTimestampFromTime(now.Truncate(time.Millisecond)))
 

diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.69.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.69.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.0.0-00010101000000-000000000000
+	github.com/open-telemetry/opentelemetry-collector-contrib/internal/comparetest v0.69.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.69.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.69.0
 	github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3