[chore] Method that sorts Datapoint Slice by Attribute key

internal/coreinternal/golden/sort_attributes.go → internal/coreinternal/golden/sort_metrics.go

@@ -5,12 +5,13 @@ package golden // import "github.com/open-telemetry/opentelemetry-collector-cont
 
 import (
 	"sort"
+	"strings"
 
 	"go.opentelemetry.io/collector/pdata/pcommon"
 	"go.opentelemetry.io/collector/pdata/pmetric"
 )
 
-// sorts all Resource Metrics attributes and Datapoint Slice metric attributes
+// sorts all Resource Metrics attributes and Datapoint Slice metric attributes and all Datapoint slices
 func sortMetrics(ms pmetric.Metrics) {
 	rms := ms.ResourceMetrics()
 	for i := 0; i < rms.Len(); i++ {
@@ -51,6 +52,7 @@ func sortMetrics(ms pmetric.Metrics) {
 			}
 		}
 	}
+	sortMetricDataPointSlices(ms)
 }
 
 // sortAttributeMap sorts the attributes of a pcommon.Map according to the alphanumeric ordering of the keys
@@ -85,3 +87,77 @@ func sortAttributeMap(mp pcommon.Map) {
 	}
 	tempMap.CopyTo(mp)
 }
+
+// sortMetricDataPointSlices sorts the datapoint slice of a pmetric.Metrics according to the alphanumeric ordering of map key
+func sortMetricDataPointSlices(ms pmetric.Metrics) {
+	for i := 0; i < ms.ResourceMetrics().Len(); i++ {
+		for j := 0; j < ms.ResourceMetrics().At(i).ScopeMetrics().Len(); j++ {
+			for k := 0; k < ms.ResourceMetrics().At(i).ScopeMetrics().At(j).Metrics().Len(); k++ {
+				m := ms.ResourceMetrics().At(i).ScopeMetrics().At(j).Metrics().At(k)
+				switch m.Type() {
+				case pmetric.MetricTypeGauge:
+					sortNumberDataPointSlice(m.Gauge().DataPoints())
+				case pmetric.MetricTypeSum:
+					sortNumberDataPointSlice(m.Sum().DataPoints())
+				case pmetric.MetricTypeHistogram:
+					sortHistogramDataPointSlice(m.Histogram().DataPoints())
+				case pmetric.MetricTypeExponentialHistogram:
+					sortExponentialHistogramDataPointSlice(m.ExponentialHistogram().DataPoints())
+				case pmetric.MetricTypeSummary:
+					sortSummaryDataPointSlice(m.Summary().DataPoints())
+				}
+			}
+		}
+	}
+}
+
+func sortNumberDataPointSlice(ndps pmetric.NumberDataPointSlice) {
+	ndps.Sort(func(a, b pmetric.NumberDataPoint) bool {
+		return compareMaps(a.Attributes(), b.Attributes()) < 0
+	})
+}
+
+func sortSummaryDataPointSlice(sdps pmetric.SummaryDataPointSlice) {
+	sdps.Sort(func(a, b pmetric.SummaryDataPoint) bool {
+		return compareMaps(a.Attributes(), b.Attributes()) < 0
+	})
+}
+
+func sortHistogramDataPointSlice(hdps pmetric.HistogramDataPointSlice) {
+	hdps.Sort(func(a, b pmetric.HistogramDataPoint) bool {
+		return compareMaps(a.Attributes(), b.Attributes()) < 0
+	})
+}
+
+func sortExponentialHistogramDataPointSlice(ehdps pmetric.ExponentialHistogramDataPointSlice) {
+	ehdps.Sort(func(a, b pmetric.ExponentialHistogramDataPoint) bool {
+		return compareMaps(a.Attributes(), b.Attributes()) < 0
+	})
+}
+
+func compareMaps(a, b pcommon.Map) int {
+	sortAttributeMap(a)
+	sortAttributeMap(b)
+
+	if a.Len() != b.Len() {
+		return a.Len() - b.Len()
+	}
+
+	var aKeys, bKeys []string
+	a.Range(func(k string, _ pcommon.Value) bool {
+		aKeys = append(aKeys, k)
+		return true
+	})
+	b.Range(func(k string, _ pcommon.Value) bool {
+		bKeys = append(bKeys, k)
+		return true
+	})
+
+	for i := 0; i < len(aKeys); i++ {
+		if aKeys[i] != bKeys[i] {
+			return strings.Compare(aKeys[i], bKeys[i])
+		}
+	}
+
+	return 0
+}

internal/coreinternal/golden/sort_attributes_test.go → internal/coreinternal/golden/sort_metrics_test.go

@@ -4,8 +4,10 @@
 package golden
 
 import (
+	"path/filepath"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/collector/pdata/pcommon"
 )
 
@@ -42,3 +44,15 @@ func TestSortAttributes(t *testing.T) {
 	}
 
 }
+
+func TestSortMetricDatapointSlice(t *testing.T) {
+	beforePath := filepath.Join("testdata", "sort-datapoint-slice", "before.yaml")
+	afterPath := filepath.Join("testdata", "sort-datapoint-slice", "after.yaml")
+	before, err := ReadMetrics(beforePath)
+	require.NoError(t, err)
+	after, err := ReadMetrics(afterPath)
+	require.NoError(t, err)
+	sortMetricDataPointSlices(before)
+	require.Equal(t, before, after)
+
+}

internal/coreinternal/golden/testdata/sort-datapoint-slice/after.yaml

@@ -0,0 +1,52 @@
+resourceMetrics:
+  - resource:
+    scopeMetrics:
+      - metrics:
+          - description: The number of bytes which have flowed through the network interface.
+            name: nsxt.node.network.io
+            sum:
+              aggregationTemporality: 2
+              dataPoints:
+                - asInt: "0"
+                  attributes:
+                    - key: a
+                      value:
+                        stringValue: AAAA
+                  startTimeUnixNano: "1111111111111111111"
+                  timeUnixNano: "1111111111111111111"
+                - asInt: "0"
+                  attributes:
+                    - key: b
+                      value:
+                        stringValue: BBBBFirst
+                  startTimeUnixNano: "1111111111111111111"
+                  timeUnixNano: "1111111111111111111"
+                - asInt: "0"
+                  attributes:
+                    - key: b
+                      value:
+                        stringValue: BBBBSecond
+                  startTimeUnixNano: "1111111111111111111"
+                  timeUnixNano: "1111111111111111111"
+                - asInt: "0"
+                  attributes:
+                    - key: c
+                      value:
+                        stringValue: CCCC
+                  startTimeUnixNano: "1111111111111111111"
+                  timeUnixNano: "1111111111111111111"
+                - asInt: "0"
+                  attributes:
+                    - key: x
+                      value:
+                        stringValue: InnerAttributeSort
+                    - key: z
+                      value:
+                        stringValue: DDDD
+                  startTimeUnixNano: "1111111111111111111"
+                  timeUnixNano: "1111111111111111111"
+              isMonotonic: true
+            unit: By
+        scope:
+          name: otelcol/nsxtreceiver
+          version: latest

internal/coreinternal/golden/testdata/sort-datapoint-slice/before.yaml

@@ -0,0 +1,52 @@
+resourceMetrics:
+  - resource:
+    scopeMetrics:
+      - metrics:
+          - description: The number of bytes which have flowed through the network interface.
+            name: nsxt.node.network.io
+            sum:
+              aggregationTemporality: 2
+              dataPoints:
+                - asInt: "0"
+                  attributes:
+                    - key: a
+                      value:
+                        stringValue: AAAA
+                  startTimeUnixNano: "1111111111111111111"
+                  timeUnixNano: "1111111111111111111"
+                - asInt: "0"
+                  attributes:
+                    - key: z
+                      value:
+                        stringValue: DDDD
+                    - key: x
+                      value:
+                        stringValue: InnerAttributeSort
+                  startTimeUnixNano: "1111111111111111111"
+                  timeUnixNano: "1111111111111111111"
+                - asInt: "0"
+                  attributes:
+                    - key: c
+                      value:
+                        stringValue: CCCC
+                  startTimeUnixNano: "1111111111111111111"
+                  timeUnixNano: "1111111111111111111"
+                - asInt: "0"
+                  attributes:
+                    - key: b
+                      value:
+                        stringValue: BBBBFirst
+                  startTimeUnixNano: "1111111111111111111"
+                  timeUnixNano: "1111111111111111111"
+                - asInt: "0"
+                  attributes:
+                    - key: b
+                      value:
+                        stringValue: BBBBSecond
+                  startTimeUnixNano: "1111111111111111111"
+                  timeUnixNano: "1111111111111111111"
+              isMonotonic: true
+            unit: By
+        scope:
+          name: otelcol/nsxtreceiver
+          version: latest

receiver/mysqlreceiver/testdata/scraper/expected.yaml

@@ -1666,7 +1666,7 @@ resourceMetrics:
                   startTimeUnixNano: "1644862687825728000"
                   timeUnixNano: "1644862687825772000"
               isMonotonic: true
-            unit: "s"
+            unit: s
         scope:
           name: otelcol/mysqlreceiver
           version: latest