From 0510d11b8d54778f9bb921dc40da152f21f60376 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Wed, 28 Feb 2024 23:08:43 -0800 Subject: [PATCH] Use slices.SortFunc in OTLP trace exporter instead of sort.Slice (#4989) Co-authored-by: Sam Xie --- .../otlptracegrpc/internal/otlptracetest/collector.go | 7 ++++--- .../otlptracehttp/internal/otlptracetest/collector.go | 7 ++++--- .../shared/otlp/otlptrace/otlptracetest/collector.go.tmpl | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/exporters/otlp/otlptrace/otlptracegrpc/internal/otlptracetest/collector.go b/exporters/otlp/otlptrace/otlptracegrpc/internal/otlptracetest/collector.go index 87deff792..0b30980a4 100644 --- a/exporters/otlp/otlptrace/otlptracegrpc/internal/otlptracetest/collector.go +++ b/exporters/otlp/otlptrace/otlptracegrpc/internal/otlptracetest/collector.go @@ -7,7 +7,8 @@ package otlptracetest // import "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlptracetest" import ( - "sort" + "cmp" + "slices" collectortracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" commonpb "go.opentelemetry.io/proto/otlp/common/v1" @@ -88,8 +89,8 @@ func resourceString(res *resourcepb.Resource) string { } func sortedAttributes(attrs []*commonpb.KeyValue) []*commonpb.KeyValue { - sort.Slice(attrs[:], func(i, j int) bool { - return attrs[i].Key < attrs[j].Key + slices.SortFunc(attrs, func(a, b *commonpb.KeyValue) int { + return cmp.Compare(a.Key, b.Key) }) return attrs } diff --git a/exporters/otlp/otlptrace/otlptracehttp/internal/otlptracetest/collector.go b/exporters/otlp/otlptrace/otlptracehttp/internal/otlptracetest/collector.go index 3b7fddfad..bcba6f6a3 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/internal/otlptracetest/collector.go +++ b/exporters/otlp/otlptrace/otlptracehttp/internal/otlptracetest/collector.go @@ -7,7 +7,8 @@ package otlptracetest // import "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp/internal/otlptracetest" import ( - "sort" + "cmp" + "slices" collectortracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" commonpb "go.opentelemetry.io/proto/otlp/common/v1" @@ -88,8 +89,8 @@ func resourceString(res *resourcepb.Resource) string { } func sortedAttributes(attrs []*commonpb.KeyValue) []*commonpb.KeyValue { - sort.Slice(attrs[:], func(i, j int) bool { - return attrs[i].Key < attrs[j].Key + slices.SortFunc(attrs, func(a, b *commonpb.KeyValue) int { + return cmp.Compare(a.Key, b.Key) }) return attrs } diff --git a/internal/shared/otlp/otlptrace/otlptracetest/collector.go.tmpl b/internal/shared/otlp/otlptrace/otlptracetest/collector.go.tmpl index fd020d4b5..07cd70de6 100644 --- a/internal/shared/otlp/otlptrace/otlptracetest/collector.go.tmpl +++ b/internal/shared/otlp/otlptrace/otlptracetest/collector.go.tmpl @@ -7,7 +7,8 @@ package otlptracetest import ( - "sort" + "cmp" + "slices" collectortracepb "go.opentelemetry.io/proto/otlp/collector/trace/v1" commonpb "go.opentelemetry.io/proto/otlp/common/v1" @@ -88,8 +89,8 @@ func resourceString(res *resourcepb.Resource) string { } func sortedAttributes(attrs []*commonpb.KeyValue) []*commonpb.KeyValue { - sort.Slice(attrs[:], func(i, j int) bool { - return attrs[i].Key < attrs[j].Key + slices.SortFunc(attrs, func(a, b *commonpb.KeyValue) int { + return cmp.Compare(a.Key, b.Key) }) return attrs }