refactor: replace x/exp/ with stdlib slices package (#140)

elastic · Feb 13, 2024 · 5caf276 · 5caf276
1 parent d6e4828
commit 5caf276
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/aggregators/codec.go b/aggregators/codec.go
@@ -10,11 +10,11 @@ package aggregators
 import (
 	"encoding/binary"
 	"errors"
+	"slices"
 	"sort"
 	"time"
 
 	"github.com/axiomhq/hyperloglog"
-	"golang.org/x/exp/slices"
 
 	"github.com/elastic/apm-aggregation/aggregationpb"
 	"github.com/elastic/apm-aggregation/aggregators/internal/hdrhistogram"

diff --git a/aggregators/internal/hdrhistogram/hdrhistogram.go b/aggregators/internal/hdrhistogram/hdrhistogram.go
@@ -32,9 +32,8 @@ import (
 	"fmt"
 	"math"
 	"math/bits"
+	"slices"
 	"time"
-
-	"golang.org/x/exp/slices"
 )
 
 const (

diff --git a/aggregators/merger.go b/aggregators/merger.go
@@ -6,10 +6,10 @@ package aggregators
 
 import (
 	"io"
+	"slices"
 	"sort"
 
 	"github.com/cespare/xxhash/v2"
-	"golang.org/x/exp/slices"
 
 	"github.com/elastic/apm-aggregation/aggregationpb"
 	"github.com/elastic/apm-aggregation/aggregators/internal/constraint"

diff --git a/go.mod b/go.mod
@@ -18,7 +18,6 @@ require (
 	go.opentelemetry.io/otel/sdk/metric v1.21.0
 	go.opentelemetry.io/otel/trace v1.21.0
 	go.uber.org/zap v1.26.0
-	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
 	golang.org/x/sync v0.4.0
 	golang.org/x/tools v0.14.0
 	google.golang.org/protobuf v1.31.0
@@ -62,6 +61,7 @@ require (
 	go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 // indirect
 	go.opentelemetry.io/collector/semconv v0.87.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
 	golang.org/x/mod v0.13.0 // indirect
 	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/sys v0.14.0 // indirect