chore: replace golang.org/x/exp/slices+maps usage to stdlib

Signed-off-by: hainenber <[email protected]>
grafana · May 29, 2024 · ee034d1 · ee034d1
1 parent cdcd725
commit ee034d1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/internal/component/common/loki/client/batch.go b/internal/component/common/loki/client/batch.go
@@ -2,14 +2,14 @@ package client
 
 import (
 	"fmt"
+	"slices"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/klauspost/compress/snappy"
 	"github.com/prometheus/common/model"
-	"golang.org/x/exp/slices"
 
 	"github.com/grafana/loki/v3/pkg/logproto"
 

diff --git a/internal/component/loki/source/cloudflare/internal/cloudflaretarget/fields.go b/internal/component/loki/source/cloudflare/internal/cloudflaretarget/fields.go
@@ -7,8 +7,7 @@ package cloudflaretarget
 
 import (
 	"fmt"
-
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 // FieldsType defines the set of fields to fetch alongside logs.

diff --git a/internal/component/registry.go b/internal/component/registry.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"reflect"
+	"slices"
 	"strings"
 
 	"github.com/go-kit/log"
@@ -12,7 +13,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 )
 
 // The parsedName of a component is the parts of its name ("remote.http") split

diff --git a/internal/converter/internal/otelcolconvert/pipeline_group.go b/internal/converter/internal/otelcolconvert/pipeline_group.go
@@ -3,11 +3,11 @@ package otelcolconvert
 import (
 	"cmp"
 	"fmt"
+	"slices"
 
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/service/pipelines"
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 )
 
 // pipelineGroup groups a set of pipelines together by their telemetry type.

diff --git a/internal/converter/internal/prometheusconvert/component/scrape.go b/internal/converter/internal/prometheusconvert/component/scrape.go
@@ -2,11 +2,10 @@ package component
 
 import (
 	"fmt"
+	"maps"
 	"strings"
 	"time"
 
-	"golang.org/x/exp/maps"
-
 	prom_config "github.com/prometheus/prometheus/config"
 	prom_discovery "github.com/prometheus/prometheus/discovery"
 	"github.com/prometheus/prometheus/storage"

diff --git a/internal/util/testappender/collectingappender.go b/internal/util/testappender/collectingappender.go
@@ -2,14 +2,14 @@ package testappender
 
 import (
 	"context"
+	"maps"
 	"sync"
 
 	"github.com/prometheus/prometheus/model/exemplar"
 	"github.com/prometheus/prometheus/model/histogram"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/metadata"
 	"github.com/prometheus/prometheus/storage"
-	"golang.org/x/exp/maps"
 )
 
 type MetricSample struct {