[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 <[email protected]>
open-telemetry · Oct 12, 2024 · be5fc23 · be5fc23
1 parent 28d0d57
commit be5fc23
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 68 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/internal/globalgates/globalgates.go b/internal/globalgates/globalgates.go
diff --git a/internal/globalgates/go.mod b/internal/globalgates/go.mod
diff --git a/internal/globalgates/go.sum b/internal/globalgates/go.sum
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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