diff --git a/pkg/stanza/fileconsumer/internal/fileset/fileset.go b/pkg/stanza/fileconsumer/internal/fileset/fileset.go index 3d1cf50fb143..d946d7baf3e6 100644 --- a/pkg/stanza/fileconsumer/internal/fileset/fileset.go +++ b/pkg/stanza/fileconsumer/internal/fileset/fileset.go @@ -5,8 +5,7 @@ package fileset // import "github.com/open-telemetry/opentelemetry-collector-con import ( "errors" - - "golang.org/x/exp/slices" + "slices" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fingerprint" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/reader" diff --git a/pkg/stanza/fileconsumer/matcher/internal/finder/finder.go b/pkg/stanza/fileconsumer/matcher/internal/finder/finder.go index caa447bda7ee..cd0d91487a4e 100644 --- a/pkg/stanza/fileconsumer/matcher/internal/finder/finder.go +++ b/pkg/stanza/fileconsumer/matcher/internal/finder/finder.go @@ -6,10 +6,10 @@ package finder // import "github.com/open-telemetry/opentelemetry-collector-cont import ( "errors" "fmt" + "maps" "slices" "github.com/bmatcuk/doublestar/v4" - "golang.org/x/exp/maps" ) func Validate(globs []string) error { @@ -47,7 +47,7 @@ func FindFiles(includes []string, excludes []string) ([]string, error) { } } - keys := maps.Keys(allSet) + keys := slices.Collect(maps.Keys(allSet)) slices.Sort(keys) return keys, errs } diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index e61f6ae2e54c..b0f3a879faaa 100644 --- a/pkg/stanza/go.mod +++ b/pkg/stanza/go.mod @@ -35,7 +35,6 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 golang.org/x/sys v0.30.0 golang.org/x/text v0.22.0 gonum.org/v1/gonum v0.15.1 @@ -73,6 +72,7 @@ require ( go.opentelemetry.io/collector/semconv v0.119.1-0.20250210123122-44b3eeda354c // indirect go.opentelemetry.io/otel v1.34.0 // indirect go.opentelemetry.io/otel/sdk v1.34.0 // indirect + golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/net v0.33.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect google.golang.org/grpc v1.70.0 // indirect diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 3009318db6ea..19d5c2aef062 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -69,7 +69,6 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/net v0.33.0 // indirect golang.org/x/sys v0.30.0 // indirect golang.org/x/text v0.22.0 // indirect diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index e4cddf29f690..9c7cf5bf8f81 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -66,7 +66,6 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/net v0.33.0 // indirect golang.org/x/sys v0.30.0 // indirect golang.org/x/text v0.22.0 // indirect