From be5fc2308881c85b8f0c036af2acdcc2b16ade33 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Sat, 12 Oct 2024 10:37:07 -0700 Subject: [PATCH] [chore] Remove unnecessary globalgates (#11418) This package is no longer necessary, but if in the future we need to have gates shared between modules we may re-create this module. Signed-off-by: Bogdan Drutu --- Makefile | 2 -- cmd/builder/internal/builder/main_test.go | 1 - cmd/builder/test/core.builder.yaml | 1 - cmd/otelcorecol/builder-config.yaml | 1 - cmd/otelcorecol/go.mod | 3 --- internal/e2e/go.mod | 3 --- internal/globalgates/Makefile | 1 - internal/globalgates/globalgates.go | 14 -------------- internal/globalgates/go.mod | 12 ------------ internal/globalgates/go.sum | 14 -------------- otelcol/go.mod | 3 --- otelcol/otelcoltest/go.mod | 3 --- service/go.mod | 3 --- service/telemetry/tracer.go | 10 ++++++++-- service/telemetry/tracer_test.go | 7 +++---- versions.yaml | 1 - 16 files changed, 11 insertions(+), 68 deletions(-) delete mode 100644 internal/globalgates/Makefile delete mode 100644 internal/globalgates/globalgates.go delete mode 100644 internal/globalgates/go.mod delete mode 100644 internal/globalgates/go.sum diff --git a/Makefile b/Makefile index 210b4a7c455..9703b833756 100644 --- a/Makefile +++ b/Makefile @@ -303,7 +303,6 @@ check-contrib: -replace go.opentelemetry.io/collector/extension/zpagesextension=$(CURDIR)/extension/zpagesextension \ -replace go.opentelemetry.io/collector/featuregate=$(CURDIR)/featuregate \ -replace go.opentelemetry.io/collector/filter=$(CURDIR)/filter \ - -replace go.opentelemetry.io/collector/internal/globalgates=$(CURDIR)/internal/globalgates \ -replace go.opentelemetry.io/collector/internal/globalsignal=$(CURDIR)/internal/globalsignal \ -replace go.opentelemetry.io/collector/otelcol=$(CURDIR)/otelcol \ -replace go.opentelemetry.io/collector/otelcol/otelcoltest=$(CURDIR)/otelcol/otelcoltest \ @@ -372,7 +371,6 @@ restore-contrib: -dropreplace go.opentelemetry.io/collector/extension/zpagesextension \ -dropreplace go.opentelemetry.io/collector/featuregate \ -dropreplace go.opentelemetry.io/collector/filter \ - -dropreplace go.opentelemetry.io/collector/internal/globalgates \ -dropreplace go.opentelemetry.io/collector/internal/globalsignal \ -dropreplace go.opentelemetry.io/collector/otelcol \ -dropreplace go.opentelemetry.io/collector/otelcol/otelcoltest \ diff --git a/cmd/builder/internal/builder/main_test.go b/cmd/builder/internal/builder/main_test.go index 4f0e34ba440..20103c11169 100644 --- a/cmd/builder/internal/builder/main_test.go +++ b/cmd/builder/internal/builder/main_test.go @@ -77,7 +77,6 @@ var ( "/extension/extensioncapabilities", "/extension/zpagesextension", "/featuregate", - "/internal/globalgates", "/internal/globalsignal", "/pipeline", "/processor", diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index f00dff95596..a4b96e939a6 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -47,7 +47,6 @@ replaces: - go.opentelemetry.io/collector/extension/extensioncapabilities => ${WORKSPACE_DIR}/extension/extensioncapabilities - go.opentelemetry.io/collector/extension/zpagesextension => ${WORKSPACE_DIR}/extension/zpagesextension - go.opentelemetry.io/collector/featuregate => ${WORKSPACE_DIR}/featuregate - - go.opentelemetry.io/collector/internal/globalgates => ${WORKSPACE_DIR}/internal/globalgates - go.opentelemetry.io/collector/internal/globalsignal => ${WORKSPACE_DIR}/internal/globalsignal - go.opentelemetry.io/collector/otelcol => ${WORKSPACE_DIR}/otelcol - go.opentelemetry.io/collector/otelcol/otelcoltest => ${WORKSPACE_DIR}/otelcol/otelcoltest diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 62a8afaf186..a2222fdbd3a 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -39,7 +39,6 @@ providers: replaces: - go.opentelemetry.io/collector => ../../ - - go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates - go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal - go.opentelemetry.io/collector/client => ../../client - go.opentelemetry.io/collector/otelcol => ../../otelcol diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index 7ccc15d0d98..a3f013f9577 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -102,7 +102,6 @@ require ( go.opentelemetry.io/collector/extension/experimental/storage v0.111.0 // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.111.0 // indirect go.opentelemetry.io/collector/featuregate v1.17.0 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.111.0 // indirect go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect @@ -150,8 +149,6 @@ require ( replace go.opentelemetry.io/collector => ../../ -replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates - replace go.opentelemetry.io/collector/internal/globalsignal => ../../internal/globalsignal replace go.opentelemetry.io/collector/client => ../../client diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index f6aeb179dd2..a4073607e7f 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -85,7 +85,6 @@ require ( go.opentelemetry.io/collector/extension/experimental/storage v0.111.0 // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.111.0 // indirect go.opentelemetry.io/collector/featuregate v1.17.0 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.111.0 // indirect go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect go.opentelemetry.io/collector/processor v0.111.0 // indirect @@ -198,8 +197,6 @@ replace go.opentelemetry.io/collector/service => ../../service replace go.opentelemetry.io/collector/component/componentprofiles => ../../component/componentprofiles -replace go.opentelemetry.io/collector/internal/globalgates => ../globalgates - replace go.opentelemetry.io/collector/extension/extensioncapabilities => ../../extension/extensioncapabilities replace go.opentelemetry.io/collector/receiver/receiverprofiles => ../../receiver/receiverprofiles diff --git a/internal/globalgates/Makefile b/internal/globalgates/Makefile deleted file mode 100644 index ded7a36092d..00000000000 --- a/internal/globalgates/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.Common diff --git a/internal/globalgates/globalgates.go b/internal/globalgates/globalgates.go deleted file mode 100644 index 440b04f7fb6..00000000000 --- a/internal/globalgates/globalgates.go +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package globalgates // import "go.opentelemetry.io/collector/internal/globalgates" - -import ( - "go.opentelemetry.io/collector/featuregate" -) - -var NoopTracerProvider = featuregate.GlobalRegistry().MustRegister("service.noopTracerProvider", - featuregate.StageAlpha, - featuregate.WithRegisterFromVersion("v0.107.0"), - featuregate.WithRegisterToVersion("v0.109.0"), - featuregate.WithRegisterDescription("Sets a Noop OpenTelemetry TracerProvider to reduce memory allocations. This featuregate is incompatible with the zPages extension.")) diff --git a/internal/globalgates/go.mod b/internal/globalgates/go.mod deleted file mode 100644 index 6ec6c965015..00000000000 --- a/internal/globalgates/go.mod +++ /dev/null @@ -1,12 +0,0 @@ -module go.opentelemetry.io/collector/internal/globalgates - -go 1.22.0 - -require go.opentelemetry.io/collector/featuregate v1.17.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/globalgates/go.sum b/internal/globalgates/go.sum deleted file mode 100644 index e3ebd41c2e8..00000000000 --- a/internal/globalgates/go.sum +++ /dev/null @@ -1,14 +0,0 @@ -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 f5c387ef021..55aead7a8b4 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -72,7 +72,6 @@ require ( go.opentelemetry.io/collector/consumer/consumertest v0.111.0 // indirect go.opentelemetry.io/collector/exporter/exporterprofiles v0.111.0 // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.111.0 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.111.0 // indirect go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect @@ -159,8 +158,6 @@ replace go.opentelemetry.io/collector/config/configtls => ../config/configtls replace go.opentelemetry.io/collector/config/configopaque => ../config/configopaque -replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates - replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../consumer/consumerprofiles replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consumertest diff --git a/otelcol/otelcoltest/go.mod b/otelcol/otelcoltest/go.mod index dadd9bd2095..1aef6f781ee 100644 --- a/otelcol/otelcoltest/go.mod +++ b/otelcol/otelcoltest/go.mod @@ -70,7 +70,6 @@ require ( go.opentelemetry.io/collector/exporter/exporterprofiles v0.111.0 // indirect go.opentelemetry.io/collector/extension/extensioncapabilities v0.111.0 // indirect go.opentelemetry.io/collector/featuregate v1.17.0 // indirect - go.opentelemetry.io/collector/internal/globalgates v0.111.0 // indirect go.opentelemetry.io/collector/internal/globalsignal v0.111.0 // indirect go.opentelemetry.io/collector/pdata v1.17.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.111.0 // indirect @@ -174,8 +173,6 @@ replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth replace go.opentelemetry.io/collector/extension/experimental/storage => ../../extension/experimental/storage -replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates - replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consumer/consumerprofiles replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest diff --git a/service/go.mod b/service/go.mod index b7e897f08bb..aa0e9299071 100644 --- a/service/go.mod +++ b/service/go.mod @@ -27,7 +27,6 @@ require ( go.opentelemetry.io/collector/extension/extensioncapabilities v0.111.0 go.opentelemetry.io/collector/extension/zpagesextension v0.111.0 go.opentelemetry.io/collector/featuregate v1.17.0 - go.opentelemetry.io/collector/internal/globalgates v0.111.0 go.opentelemetry.io/collector/pdata v1.17.0 go.opentelemetry.io/collector/pdata/pprofile v0.111.0 go.opentelemetry.io/collector/pdata/testdata v0.111.0 @@ -182,8 +181,6 @@ replace go.opentelemetry.io/collector/component/componentprofiles => ../componen replace go.opentelemetry.io/collector/client => ../client -replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates - replace go.opentelemetry.io/collector/receiver/receiverprofiles => ../receiver/receiverprofiles replace go.opentelemetry.io/collector/processor/processorprofiles => ../processor/processorprofiles diff --git a/service/telemetry/tracer.go b/service/telemetry/tracer.go index ff17f296865..ca4ee8c54b0 100644 --- a/service/telemetry/tracer.go +++ b/service/telemetry/tracer.go @@ -17,9 +17,15 @@ import ( "go.opentelemetry.io/otel/trace/noop" "go.opentelemetry.io/collector/config/configtelemetry" - "go.opentelemetry.io/collector/internal/globalgates" + "go.opentelemetry.io/collector/featuregate" ) +var noopTracerProvider = featuregate.GlobalRegistry().MustRegister("service.noopTracerProvider", + featuregate.StageAlpha, + featuregate.WithRegisterFromVersion("v0.107.0"), + featuregate.WithRegisterToVersion("v0.109.0"), + featuregate.WithRegisterDescription("Sets a Noop OpenTelemetry TracerProvider to reduce memory allocations. This featuregate is incompatible with the zPages extension.")) + const ( // supported trace propagators traceContextPropagator = "tracecontext" @@ -50,7 +56,7 @@ func (n *noopNoContextTracerProvider) Tracer(_ string, _ ...trace.TracerOption) // New creates a new Telemetry from Config. func newTracerProvider(ctx context.Context, set Settings, cfg Config) (trace.TracerProvider, error) { - if globalgates.NoopTracerProvider.IsEnabled() || cfg.Traces.Level == configtelemetry.LevelNone { + if noopTracerProvider.IsEnabled() || cfg.Traces.Level == configtelemetry.LevelNone { return &noopNoContextTracerProvider{}, nil } diff --git a/service/telemetry/tracer_test.go b/service/telemetry/tracer_test.go index f2ed37c1b50..62b022af597 100644 --- a/service/telemetry/tracer_test.go +++ b/service/telemetry/tracer_test.go @@ -12,7 +12,6 @@ import ( "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/featuregate" - "go.opentelemetry.io/collector/internal/globalgates" ) func TestNewTracerProvider(t *testing.T) { @@ -44,11 +43,11 @@ func TestNewTracerProvider(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - previousValue := globalgates.NoopTracerProvider.IsEnabled() + previousValue := noopTracerProvider.IsEnabled() // expect error due to deprecated flag - require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.NoopTracerProvider.ID(), tt.noopTracerGate)) + require.NoError(t, featuregate.GlobalRegistry().Set(noopTracerProvider.ID(), tt.noopTracerGate)) defer func() { - require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.NoopTracerProvider.ID(), previousValue)) + require.NoError(t, featuregate.GlobalRegistry().Set(noopTracerProvider.ID(), previousValue)) }() provider, err := newTracerProvider(context.TODO(), Settings{}, tt.cfg) require.NoError(t, err) diff --git a/versions.yaml b/versions.yaml index a3d757bbaa0..14e07075e23 100644 --- a/versions.yaml +++ b/versions.yaml @@ -23,7 +23,6 @@ module-sets: version: v0.111.0 modules: - go.opentelemetry.io/collector - - go.opentelemetry.io/collector/internal/globalgates - go.opentelemetry.io/collector/internal/globalsignal - go.opentelemetry.io/collector/cmd/builder - go.opentelemetry.io/collector/cmd/mdatagen