From ee034d1e8a4169fdefb1a94bbc1987badb2b1a1d Mon Sep 17 00:00:00 2001 From: hainenber Date: Wed, 29 May 2024 23:37:24 +0700 Subject: [PATCH] chore: replace `golang.org/x/exp/slices+maps` usage to stdlib Signed-off-by: hainenber --- internal/component/common/loki/client/batch.go | 2 +- .../loki/source/cloudflare/internal/cloudflaretarget/fields.go | 3 +-- internal/component/registry.go | 2 +- internal/converter/internal/otelcolconvert/pipeline_group.go | 2 +- .../converter/internal/prometheusconvert/component/scrape.go | 3 +-- internal/util/testappender/collectingappender.go | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/internal/component/common/loki/client/batch.go b/internal/component/common/loki/client/batch.go index 609a497e9e..733df59cd0 100644 --- a/internal/component/common/loki/client/batch.go +++ b/internal/component/common/loki/client/batch.go @@ -2,6 +2,7 @@ package client import ( "fmt" + "slices" "strconv" "strings" "time" @@ -9,7 +10,6 @@ import ( "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 index 8420278016..d834fd458f 100644 --- 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 index dca9e1cdf5..1aa33b2cf7 100644 --- 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 index d56c5fbb6d..041cbc9ce6 100644 --- 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 index 1291116ae8..2d8122b94d 100644 --- 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 index 5ec7094b3e..60952e9483 100644 --- a/internal/util/testappender/collectingappender.go +++ b/internal/util/testappender/collectingappender.go @@ -2,6 +2,7 @@ package testappender import ( "context" + "maps" "sync" "github.com/prometheus/prometheus/model/exemplar" @@ -9,7 +10,6 @@ import ( "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 {