Unenforce the otlp_receiver feature flag (#1368)

GoogleCloudPlatform · Aug 9, 2023 · dce9ca8 · dce9ca8
1 parent d069871
commit dce9ca8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/confgenerator/confgenerator_test.go b/confgenerator/confgenerator_test.go
@@ -315,6 +315,6 @@ func init() {
 	// Set up the test environment with mocked data.
 	confgenerator.MetadataResource = testResource
 
-	// Enable experimental features.
-	os.Setenv("EXPERIMENTAL_FEATURES", "otlp_receiver")
+	// Enable experimental features here by calling:
+	//	 os.Setenv("EXPERIMENTAL_FEATURES", "...(comma-separated feature list)...")
 }
diff --git a/confgenerator/experimental.go b/confgenerator/experimental.go
@@ -22,9 +22,18 @@ import (
 	"github.com/go-playground/validator/v10"
 )
 
-var requiredFeatureForType = map[string]string{
-	"otlp": "otlp_receiver",
-}
+// requiredFeatureForType maps a component type to a feature that must
+// be enabled (via EXPERIMENTAL_FEATURES) in order to use that component
+// in an Ops Agent configuration.
+// For example, the following would require the user to define the
+// "otlp_receiver" feature flag inside EXPERIMENTAL_FEATURES in order to
+// be able to use the "otlp" combined receiver:
+//
+//	"otlp": "otlp_receiver"
+//
+// N.B. There are no enforced feature flags today, so this map is
+// intentionally left empty.
+var requiredFeatureForType = map[string]string{}
 
 func IsExperimentalFeatureEnabled(feature string) bool {
 	enabledList := strings.Split(os.Getenv("EXPERIMENTAL_FEATURES"), ",")

diff --git a/integration_test/ops_agent_test.go b/integration_test/ops_agent_test.go
@@ -3603,12 +3603,6 @@ func TestOTLPMetricsGCM(t *testing.T) {
 	gce.RunForEachPlatform(t, func(t *testing.T, platform string) {
 		t.Parallel()
 		ctx, logger, vm := agents.CommonSetup(t, platform)
-
-		// Turn on the otlp feature gate.
-		if err := gce.SetEnvironmentVariables(ctx, logger.ToMainLog(), vm, map[string]string{"EXPERIMENTAL_FEATURES": "otlp_receiver"}); err != nil {
-			t.Fatal(err)
-		}
-
 		otlpConfig := `
 combined:
   receivers:
@@ -3714,12 +3708,6 @@ func TestOTLPMetricsGMP(t *testing.T) {
 	gce.RunForEachPlatform(t, func(t *testing.T, platform string) {
 		t.Parallel()
 		ctx, logger, vm := agents.CommonSetup(t, platform)
-
-		// Turn on the otlp feature gate.
-		if err := gce.SetEnvironmentVariables(ctx, logger.ToMainLog(), vm, map[string]string{"EXPERIMENTAL_FEATURES": "otlp_receiver"}); err != nil {
-			t.Fatal(err)
-		}
-
 		otlpConfig := `
 combined:
   receivers:
@@ -3818,12 +3806,6 @@ func TestOTLPTraces(t *testing.T) {
 	gce.RunForEachPlatform(t, func(t *testing.T, platform string) {
 		t.Parallel()
 		ctx, logger, vm := agents.CommonSetup(t, platform)
-
-		// Turn on the otlp feature gate.
-		if err := gce.SetEnvironmentVariables(ctx, logger.ToMainLog(), vm, map[string]string{"EXPERIMENTAL_FEATURES": "otlp_receiver"}); err != nil {
-			t.Fatal(err)
-		}
-
 		otlpConfig := `
 combined:
   receivers:
@@ -4057,7 +4039,6 @@ func TestParsingFailureCheck(t *testing.T) {
 	})
 }
 
-
 func TestBufferLimitSizeOpsAgent(t *testing.T) {
 	t.Parallel()
 	gce.RunForEachPlatform(t, func(t *testing.T, platform string) {