disable upstream confmap feature gates

Author: dmitryax

internal/settings/settings.go

@@ -78,7 +78,11 @@ var DefaultAgentConfigWindows = func() string {
 	return filepath.Clean(path)
 }()
 
-var defaultFeatureGates = []string{}
+var defaultFeatureGates = []string{
+	// Remove the feature gates once we deprecate our env var expansion mechanism and adopt the upstream env
+	"-confmap.strictlyTypedInput",
+	"-confmap.unifyEnvVarExpansion",
+}
 
 type Settings struct {
 	discovery                *discovery.Provider

internal/settings/settings_test.go

@@ -132,7 +132,8 @@ func TestNewSettingsNoConvertConfig(t *testing.T) {
 		"splunk.property:splunk.discovery.receiver.receiver-type/name.config.field.two=val.two",
 	}, settings.ResolverURIs())
 	require.Equal(t, 2, len(settings.ConfMapConverterFactories()))
-	require.Equal(t, []string{"--feature-gates", "foo", "--feature-gates", "-bar"}, settings.ColCoreArgs())
+	require.Equal(t, []string{"--feature-gates", "foo", "--feature-gates", "-bar", "--feature-gates",
+		"-confmap.strictlyTypedInput", "--feature-gates", "-confmap.unifyEnvVarExpansion"}, settings.ColCoreArgs())
 }
 
 func TestNewSettingsConvertConfig(t *testing.T) {
@@ -184,7 +185,8 @@ func TestNewSettingsWithValidate(t *testing.T) {
 	settings, err := New([]string{"validate"})
 	require.NoError(t, err)
 	require.NotNil(t, settings)
-	require.Equal(t, []string{"validate"}, settings.ColCoreArgs())
+	require.Equal(t, []string{"--feature-gates", "-confmap.strictlyTypedInput", "--feature-gates",
+		"-confmap.unifyEnvVarExpansion", "validate"}, settings.ColCoreArgs())
 }
 
 func TestCheckRuntimeParams_Default(t *testing.T) {
@@ -338,9 +340,15 @@ func TestSetDefaultEnvVarsSetsInterfaceFromConfigOption(t *testing.T) {
 func TestSetDefaultFeatureGatesRespectsOverrides(t *testing.T) {
 	t.Cleanup(setRequiredEnvVars(t))
 	for _, args := range [][]string{
-		{"--feature-gates", "some-gate", "--feature-gates", "telemetry.useOtelForInternalMetrics", "--feature-gates", "another-gate"},
-		{"--feature-gates", "some-gate", "--feature-gates", "+telemetry.useOtelForInternalMetrics", "--feature-gates", "another-gate"},
-		{"--feature-gates", "some-gate", "--feature-gates", "-telemetry.useOtelForInternalMetrics", "--feature-gates", "another-gate"},
+		{"--feature-gates", "some-gate", "--feature-gates", "telemetry.useOtelForInternalMetrics", "--feature-gates",
+			"another-gate", "--feature-gates", "-confmap.strictlyTypedInput", "--feature-gates",
+			"-confmap.unifyEnvVarExpansion"},
+		{"--feature-gates", "some-gate", "--feature-gates", "+telemetry.useOtelForInternalMetrics",
+			"--feature-gates", "another-gate", "--feature-gates", "-confmap.strictlyTypedInput", "--feature-gates",
+			"-confmap.unifyEnvVarExpansion"},
+		{"--feature-gates", "some-gate", "--feature-gates", "-telemetry.useOtelForInternalMetrics",
+			"--feature-gates", "another-gate", "--feature-gates", "-confmap.strictlyTypedInput", "--feature-gates",
+			"-confmap.unifyEnvVarExpansion"},
 	} {
 		t.Run(strings.Join(args, " "), func(t *testing.T) {
 			settings, err := New(args)