diff --git a/Makefile b/Makefile index e05b32e5309..7806c1dd54e 100644 --- a/Makefile +++ b/Makefile @@ -290,6 +290,7 @@ check-contrib: -replace go.opentelemetry.io/collector/extension/memorylimiterextension=$(CURDIR)/extension/memorylimiterextension \ -replace go.opentelemetry.io/collector/extension/zpagesextension=$(CURDIR)/extension/zpagesextension \ -replace go.opentelemetry.io/collector/featuregate=$(CURDIR)/featuregate \ + -replace go.opentelemetry.io/collector/internal/featuregates=$(CURDIR)/internal/featuregates \ -replace go.opentelemetry.io/collector/otelcol=$(CURDIR)/otelcol \ -replace go.opentelemetry.io/collector/otelcol/otelcoltest=$(CURDIR)/otelcol/otelcoltest \ -replace go.opentelemetry.io/collector/pdata=$(CURDIR)/pdata \ diff --git a/cmd/builder/internal/builder/main_test.go b/cmd/builder/internal/builder/main_test.go index 91c70f9845f..3d8d36729c6 100644 --- a/cmd/builder/internal/builder/main_test.go +++ b/cmd/builder/internal/builder/main_test.go @@ -69,6 +69,7 @@ var ( "/extension/auth", "/extension/zpagesextension", "/featuregate", + "/internal/featuregates", "/processor", "/processor/batchprocessor", "/processor/memorylimiterprocessor", diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index 260429422c1..39c7645efec 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -46,6 +46,7 @@ replaces: - go.opentelemetry.io/collector/extension/auth => ${WORKSPACE_DIR}/extension/auth - go.opentelemetry.io/collector/extension/zpagesextension => ${WORKSPACE_DIR}/extension/zpagesextension - go.opentelemetry.io/collector/featuregate => ${WORKSPACE_DIR}/featuregate + - go.opentelemetry.io/collector/internal/featuregates => ${WORKSPACE_DIR}/internal/featuregates - go.opentelemetry.io/collector/otelcol => ${WORKSPACE_DIR}/otelcol - go.opentelemetry.io/collector/otelcol/otelcoltest => ${WORKSPACE_DIR}/otelcol/otelcoltest - go.opentelemetry.io/collector/pdata => ${WORKSPACE_DIR}/pdata diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 391e95aa41e..2aef11aaa2c 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -48,6 +48,7 @@ require ( github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -90,3 +91,5 @@ retract ( ) replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index be9be01815d..01253a71db4 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -41,6 +41,7 @@ providers: replaces: - go.opentelemetry.io/collector => ../../ + - go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates - go.opentelemetry.io/collector/otelcol => ../../otelcol - go.opentelemetry.io/collector/component => ../../component - go.opentelemetry.io/collector/config/configauth => ../../config/configauth diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 018d55d98e5..7bfd15d7031 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -94,6 +94,7 @@ require ( go.opentelemetry.io/collector/consumer v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/collector/semconv v0.104.0 // indirect go.opentelemetry.io/collector/service v0.104.0 // indirect @@ -135,6 +136,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/otelcol => ../../otelcol replace go.opentelemetry.io/collector/component => ../../component diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 83af8506079..ba1c767c25c 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -24,6 +24,7 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect @@ -52,3 +53,5 @@ replace go.opentelemetry.io/collector/extension => ../../extension replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth replace go.opentelemetry.io/collector/featuregate => ../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 3fc8ec0466a..1f5ae0c4b6a 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -54,6 +54,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect @@ -71,6 +72,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/config/configauth => ../configauth replace go.opentelemetry.io/collector/config/configcompression => ../configcompression diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index ae7a408c9d9..42d67a43947 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -49,6 +49,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect @@ -66,6 +67,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/config/configauth => ../configauth replace go.opentelemetry.io/collector/config/configcompression => ../configcompression diff --git a/config/internal/go.mod b/config/internal/go.mod index dcc3ba5ac7c..7c7af60e026 100644 --- a/config/internal/go.mod +++ b/config/internal/go.mod @@ -35,3 +35,5 @@ replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/confmap/confmap.go b/confmap/confmap.go index 62c8fdd6068..c7c89df28bb 100644 --- a/confmap/confmap.go +++ b/confmap/confmap.go @@ -16,8 +16,8 @@ import ( "github.com/knadh/koanf/providers/confmap" "github.com/knadh/koanf/v2" - "go.opentelemetry.io/collector/confmap/internal" encoder "go.opentelemetry.io/collector/confmap/internal/mapstructure" + "go.opentelemetry.io/collector/internal/featuregates" ) const ( @@ -157,7 +157,7 @@ func decodeConfig(m *Conf, result any, errorUnused bool, skipTopLevelUnmarshaler ErrorUnused: errorUnused, Result: result, TagName: "mapstructure", - WeaklyTypedInput: !internal.StrictlyTypedInputGate.IsEnabled(), + WeaklyTypedInput: !featuregates.StrictlyTypedInputGate.IsEnabled(), MatchName: caseSensitiveMatchName, DecodeHook: mapstructure.ComposeDecodeHookFunc( expandNilStructPointersHookFunc(), diff --git a/confmap/converter/expandconverter/go.mod b/confmap/converter/expandconverter/go.mod index f0d150834bb..5fb77056d7b 100644 --- a/confmap/converter/expandconverter/go.mod +++ b/confmap/converter/expandconverter/go.mod @@ -4,9 +4,9 @@ go 1.21.0 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.104.0 go.opentelemetry.io/collector/confmap v0.104.0 go.opentelemetry.io/collector/featuregate v1.11.0 + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -25,20 +25,8 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace go.opentelemetry.io/collector/component => ../../../component - replace go.opentelemetry.io/collector/confmap => ../.. -replace go.opentelemetry.io/collector => ../../.. - -replace go.opentelemetry.io/collector/config/configtelemetry => ../../../config/configtelemetry - -replace go.opentelemetry.io/collector/pdata/testdata => ../../../pdata/testdata - -replace go.opentelemetry.io/collector/pdata => ../../../pdata - replace go.opentelemetry.io/collector/featuregate => ../../../featuregate -replace go.opentelemetry.io/collector/consumer => ../../../consumer - -replace go.opentelemetry.io/collector/pdata/pprofile => ../../../pdata/pprofile +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/confmap/expand.go b/confmap/expand.go index efc4bb95911..8372ef120d2 100644 --- a/confmap/expand.go +++ b/confmap/expand.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - "go.opentelemetry.io/collector/confmap/internal" + "go.opentelemetry.io/collector/internal/featuregates" ) // schemePattern defines the regexp pattern for scheme names. @@ -130,7 +130,7 @@ func (mr *Resolver) findAndExpandURI(ctx context.Context, input string) (any, bo } var repl string - if internal.StrictlyTypedInputGate.IsEnabled() { + if featuregates.StrictlyTypedInputGate.IsEnabled() { repl, err = expanded.AsString() } else { repl, err = toString(expanded) diff --git a/confmap/go.mod b/confmap/go.mod index 128fbdb14f1..114b54b6b74 100644 --- a/confmap/go.mod +++ b/confmap/go.mod @@ -8,7 +8,7 @@ require ( github.com/knadh/koanf/providers/confmap v0.1.0 github.com/knadh/koanf/v2 v2.1.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/featuregate v1.11.0 + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -21,6 +21,7 @@ require ( github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + go.opentelemetry.io/collector/featuregate v1.11.0 // indirect ) retract ( @@ -29,3 +30,5 @@ retract ( ) replace go.opentelemetry.io/collector/featuregate => ../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/confmap/internal/e2e/go.mod b/confmap/internal/e2e/go.mod index 8ebcdd4800a..088c78d31d0 100644 --- a/confmap/internal/e2e/go.mod +++ b/confmap/internal/e2e/go.mod @@ -8,6 +8,7 @@ require ( go.opentelemetry.io/collector/confmap/provider/envprovider v0.104.0 go.opentelemetry.io/collector/confmap/provider/fileprovider v0.104.0 go.opentelemetry.io/collector/featuregate v1.11.0 + go.opentelemetry.io/collector/internal/featuregates v0.104.0 ) require ( @@ -32,3 +33,5 @@ replace go.opentelemetry.io/collector/confmap/provider/fileprovider => ../../pro replace go.opentelemetry.io/collector/confmap/provider/envprovider => ../../provider/envprovider replace go.opentelemetry.io/collector/featuregate => ../../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/confmap/internal/e2e/types_test.go b/confmap/internal/e2e/types_test.go index a7d0a6e31ee..edd767f3ce4 100644 --- a/confmap/internal/e2e/types_test.go +++ b/confmap/internal/e2e/types_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/confmap/internal" "go.opentelemetry.io/collector/confmap/provider/envprovider" "go.opentelemetry.io/collector/confmap/provider/fileprovider" "go.opentelemetry.io/collector/featuregate" + "go.opentelemetry.io/collector/internal/featuregates" ) type TargetField string @@ -259,11 +259,11 @@ func TestStrictTypeCasting(t *testing.T) { }, } - previousValue := internal.StrictlyTypedInputGate.IsEnabled() - err := featuregate.GlobalRegistry().Set(internal.StrictlyTypedInputID, true) + previousValue := featuregates.StrictlyTypedInputGate.IsEnabled() + err := featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, true) require.NoError(t, err) defer func() { - err := featuregate.GlobalRegistry().Set(internal.StrictlyTypedInputID, previousValue) + err := featuregate.GlobalRegistry().Set(featuregates.StrictlyTypedInputID, previousValue) require.NoError(t, err) }() diff --git a/confmap/internal/featuregate.go b/confmap/internal/featuregate.go deleted file mode 100644 index 6e9b9ea8745..00000000000 --- a/confmap/internal/featuregate.go +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package internal // import "go.opentelemetry.io/collector/confmap/internal" - -import "go.opentelemetry.io/collector/featuregate" - -const StrictlyTypedInputID = "confmap.strictlyTypedInput" - -var StrictlyTypedInputGate = featuregate.GlobalRegistry().MustRegister(StrictlyTypedInputID, - featuregate.StageAlpha, - featuregate.WithRegisterFromVersion("v0.103.0"), - featuregate.WithRegisterDescription("Makes type casting rules during configuration unmarshaling stricter. See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details."), -) diff --git a/confmap/provider/envprovider/go.mod b/confmap/provider/envprovider/go.mod index cd17275e2b1..791fe154a78 100644 --- a/confmap/provider/envprovider/go.mod +++ b/confmap/provider/envprovider/go.mod @@ -20,6 +20,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.uber.org/multierr v1.11.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) @@ -27,3 +28,5 @@ require ( replace go.opentelemetry.io/collector/confmap => ../../ replace go.opentelemetry.io/collector/featuregate => ../../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/confmap/provider/fileprovider/go.mod b/confmap/provider/fileprovider/go.mod index 3c24a90ceb5..2692eb0cb2b 100644 --- a/confmap/provider/fileprovider/go.mod +++ b/confmap/provider/fileprovider/go.mod @@ -19,6 +19,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -27,3 +28,5 @@ require ( replace go.opentelemetry.io/collector/confmap => ../../ replace go.opentelemetry.io/collector/featuregate => ../../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/confmap/provider/httpprovider/go.mod b/confmap/provider/httpprovider/go.mod index ab8c89e2735..c113c149f80 100644 --- a/confmap/provider/httpprovider/go.mod +++ b/confmap/provider/httpprovider/go.mod @@ -19,6 +19,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -27,3 +28,5 @@ require ( replace go.opentelemetry.io/collector/confmap => ../../ replace go.opentelemetry.io/collector/featuregate => ../../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/confmap/provider/httpsprovider/go.mod b/confmap/provider/httpsprovider/go.mod index b66db34aaf0..5758eb43ee1 100644 --- a/confmap/provider/httpsprovider/go.mod +++ b/confmap/provider/httpsprovider/go.mod @@ -19,6 +19,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -27,3 +28,5 @@ require ( replace go.opentelemetry.io/collector/confmap => ../../ replace go.opentelemetry.io/collector/featuregate => ../../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/confmap/provider/yamlprovider/go.mod b/confmap/provider/yamlprovider/go.mod index f3c856c1061..dac45209c9a 100644 --- a/confmap/provider/yamlprovider/go.mod +++ b/confmap/provider/yamlprovider/go.mod @@ -19,6 +19,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -27,3 +28,5 @@ require ( replace go.opentelemetry.io/collector/confmap => ../../ replace go.opentelemetry.io/collector/featuregate => ../../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../../internal/featuregates diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index 3efa2191275..1423c7eb006 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -39,6 +39,7 @@ require ( go.opentelemetry.io/collector v0.104.0 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect @@ -58,6 +59,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/connector => ../ diff --git a/connector/go.mod b/connector/go.mod index efec0be694c..a3ea7d52721 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -65,3 +65,5 @@ replace go.opentelemetry.io/collector/pdata => ../pdata replace go.opentelemetry.io/collector/pdata/testdata => ../pdata/testdata replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 14091280956..b811e43120b 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -44,6 +44,7 @@ require ( go.opentelemetry.io/collector/config/configretry v1.11.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect @@ -64,6 +65,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/exporter/go.mod b/exporter/go.mod index 5c565aeae6e..897c40a9b9e 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -52,6 +52,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect golang.org/x/net v0.26.0 // indirect @@ -63,6 +64,8 @@ require ( replace go.opentelemetry.io/collector => ../ +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates + replace go.opentelemetry.io/collector/component => ../component replace go.opentelemetry.io/collector/confmap => ../confmap diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index b119eccc5f0..77ba2dc5e67 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -44,6 +44,7 @@ require ( go.opentelemetry.io/collector/consumer v0.104.0 // indirect go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -63,6 +64,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index fad8fe237d0..bf83c0aa815 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -38,6 +38,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -72,6 +73,8 @@ replace go.opentelemetry.io/collector/receiver => ../../receiver replace go.opentelemetry.io/collector => ../.. +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index 31916bc491c..5a0839b891d 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -60,6 +60,7 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect @@ -135,3 +136,5 @@ retract ( replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index a63a5739ce6..e0247c06c26 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -59,6 +59,7 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/receiver v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect @@ -131,3 +132,5 @@ retract ( ) replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 2af234e1c6c..4b810c91ded 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -34,6 +34,7 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/confmap v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -62,3 +63,5 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry replace go.opentelemetry.io/collector/featuregate => ../../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index 4b173a57d26..93ef8228d88 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -43,6 +43,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -62,6 +63,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/extension/go.mod b/extension/go.mod index efd236fcd58..0df2f37ad79 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -32,6 +32,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -59,3 +60,5 @@ replace go.opentelemetry.io/collector/pdata => ../pdata replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry replace go.opentelemetry.io/collector/featuregate => ../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index c4e978ed9d6..2194c7fad89 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -42,6 +42,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -61,6 +62,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/component => ../../component replace go.opentelemetry.io/collector/confmap => ../../confmap diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index 72b3bacf385..5697df6b93e 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -52,6 +52,7 @@ require ( go.opentelemetry.io/collector/config/internal v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect @@ -119,3 +120,5 @@ replace go.opentelemetry.io/collector/extension/auth => ../auth replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/filter/go.mod b/filter/go.mod index f7ae2122b35..24da688f69e 100644 --- a/filter/go.mod +++ b/filter/go.mod @@ -18,6 +18,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -26,3 +27,5 @@ require ( replace go.opentelemetry.io/collector/confmap => ../confmap replace go.opentelemetry.io/collector/featuregate => ../featuregate + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/go.mod b/go.mod index db1d6895d6f..10aa90ed23d 100644 --- a/go.mod +++ b/go.mod @@ -59,6 +59,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect @@ -109,3 +110,5 @@ retract ( ) replace go.opentelemetry.io/collector/pdata/pprofile => ./pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ./internal/featuregates diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index 14a87a26d9c..5df26309380 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -63,6 +63,7 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect @@ -145,3 +146,5 @@ replace go.opentelemetry.io/collector/exporter => ../../exporter replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry + +replace go.opentelemetry.io/collector/internal/featuregates => ../featuregates diff --git a/internal/featuregates/Makefile b/internal/featuregates/Makefile new file mode 100644 index 00000000000..ded7a36092d --- /dev/null +++ b/internal/featuregates/Makefile @@ -0,0 +1 @@ +include ../../Makefile.Common diff --git a/internal/featuregates/featuregates.go b/internal/featuregates/featuregates.go index e74c75fe481..2cf0e081317 100644 --- a/internal/featuregates/featuregates.go +++ b/internal/featuregates/featuregates.go @@ -9,3 +9,11 @@ var UseUnifiedEnvVarExpansionRules = featuregate.GlobalRegistry().MustRegister(" featuregate.StageBeta, featuregate.WithRegisterFromVersion("v0.103.0"), featuregate.WithRegisterDescription("`${FOO}` will now be expanded as if it was `${env:FOO}` and no longer expands $ENV syntax. See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details. When this feature gate is stable, expandconverter will be removed.")) + +const StrictlyTypedInputID = "confmap.strictlyTypedInput" + +var StrictlyTypedInputGate = featuregate.GlobalRegistry().MustRegister(StrictlyTypedInputID, + featuregate.StageAlpha, + featuregate.WithRegisterFromVersion("v0.103.0"), + featuregate.WithRegisterDescription("Makes type casting rules during configuration unmarshaling stricter. See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details."), +) diff --git a/internal/featuregates/go.mod b/internal/featuregates/go.mod new file mode 100644 index 00000000000..ec1b35fdd05 --- /dev/null +++ b/internal/featuregates/go.mod @@ -0,0 +1,12 @@ +module go.opentelemetry.io/collector/internal/featuregates + +go 1.21.0 + +require go.opentelemetry.io/collector/featuregate v1.11.0 + +require ( + github.com/hashicorp/go-version v1.7.0 // indirect + go.uber.org/multierr v1.11.0 // indirect +) + +replace go.opentelemetry.io/collector/featuregate => ../../featuregate diff --git a/internal/featuregates/go.sum b/internal/featuregates/go.sum new file mode 100644 index 00000000000..e3ebd41c2e8 --- /dev/null +++ b/internal/featuregates/go.sum @@ -0,0 +1,14 @@ +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/otelcol/go.mod b/otelcol/go.mod index e67e1767f0b..76a97a4f195 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -5,7 +5,6 @@ go 1.21.0 require ( github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.104.0 go.opentelemetry.io/collector/component v0.104.0 go.opentelemetry.io/collector/config/configtelemetry v0.104.0 go.opentelemetry.io/collector/confmap v0.104.0 @@ -13,6 +12,7 @@ require ( go.opentelemetry.io/collector/exporter v0.104.0 go.opentelemetry.io/collector/extension v0.104.0 go.opentelemetry.io/collector/featuregate v1.11.0 + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 go.opentelemetry.io/collector/processor v0.104.0 go.opentelemetry.io/collector/receiver v0.104.0 go.opentelemetry.io/collector/service v0.104.0 @@ -63,6 +63,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/collector v0.104.0 // indirect go.opentelemetry.io/collector/consumer v0.104.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect @@ -145,3 +146,5 @@ replace go.opentelemetry.io/collector/config/configcompression => ../config/conf replace go.opentelemetry.io/collector/config/configtls => ../config/configtls replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index d63ae65f645..aa7d16ace30 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -64,6 +64,7 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/consumer v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.104.0 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect @@ -163,3 +164,5 @@ replace go.opentelemetry.io/collector/exporter => ../../exporter replace go.opentelemetry.io/collector/semconv => ../../semconv replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index eacb3f12edd..6271ff8032b 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -45,6 +45,7 @@ require ( github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect @@ -60,6 +61,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/processor => ../ replace go.opentelemetry.io/collector/component => ../../component diff --git a/processor/go.mod b/processor/go.mod index a5b1da649d7..7004061e549 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -65,3 +65,5 @@ replace go.opentelemetry.io/collector/pdata/testdata => ../pdata/testdata replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index c27bff150b3..4c507704423 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -46,6 +46,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/collector/pdata/testdata v0.104.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect @@ -67,6 +68,8 @@ require ( replace go.opentelemetry.io/collector => ../../ +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/processor => ../ replace go.opentelemetry.io/collector/component => ../../component diff --git a/receiver/go.mod b/receiver/go.mod index 881a9d968f0..4e272137d21 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -65,3 +65,5 @@ retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index 486d8d37834..773526ba6b4 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -37,6 +37,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.opentelemetry.io/collector/config/configtelemetry v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata v1.11.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect @@ -71,6 +72,8 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con replace go.opentelemetry.io/collector => ../.. +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates + replace go.opentelemetry.io/collector/featuregate => ../../featuregate replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 23659973de9..a3045af3e76 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -62,6 +62,7 @@ require ( go.opentelemetry.io/collector/extension v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect go.opentelemetry.io/collector/featuregate v1.11.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect @@ -135,3 +136,5 @@ retract ( ) replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../../internal/featuregates diff --git a/service/go.mod b/service/go.mod index b3a1ef95dab..ab10298b758 100644 --- a/service/go.mod +++ b/service/go.mod @@ -85,6 +85,7 @@ require ( go.opentelemetry.io/collector/config/configtls v0.104.0 // indirect go.opentelemetry.io/collector/config/internal v0.104.0 // indirect go.opentelemetry.io/collector/extension/auth v0.104.0 // indirect + go.opentelemetry.io/collector/internal/featuregates v0.0.0-00010101000000-000000000000 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.104.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect go.opentelemetry.io/contrib/zpages v0.52.0 // indirect @@ -153,3 +154,5 @@ replace go.opentelemetry.io/collector/config/configtls => ../config/configtls replace go.opentelemetry.io/collector/config/configcompression => ../config/configcompression replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile + +replace go.opentelemetry.io/collector/internal/featuregates => ../internal/featuregates diff --git a/versions.yaml b/versions.yaml index 782277f7abe..e22abc194fd 100644 --- a/versions.yaml +++ b/versions.yaml @@ -15,6 +15,7 @@ module-sets: version: v0.104.0 modules: - go.opentelemetry.io/collector + - go.opentelemetry.io/collector/internal/featuregates - go.opentelemetry.io/collector/cmd/builder - go.opentelemetry.io/collector/cmd/mdatagen - go.opentelemetry.io/collector/component