[confmap] Deprecate expandconverter

.chloggen/deprecate-expandconverter-2.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: otelcoltest
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: The `otelcol.LoadConfig` method no longer sets the `expandconverter`.
+
+# One or more tracking issues or pull requests related to the change
+issues: [10510]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [api]

.chloggen/deprecate-expandconverter-3.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: ocb
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Collectors built with OCB will no longer include the `expandconverter`
+
+# One or more tracking issues or pull requests related to the change
+issues: [10510]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [api]

.chloggen/deprecate-expandconverter.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: deprecation
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: expandconverter
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Deprecate `expandconverter`.
+
+# One or more tracking issues or pull requests related to the change
+issues: [10510]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [api]

cmd/builder/README.md

@@ -24,8 +24,6 @@ processors:
 providers:
   - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0
 
-converters:
-  - gomod: go.opentelemetry.io/collector/confmap/converter/expandconverter v0.99.0
 EOF
 $ builder --config=otelcol-builder.yaml
 $ cat > /tmp/otelcol.yaml <<EOF

cmd/builder/internal/builder/main_test.go

@@ -54,7 +54,6 @@ var (
 		"/config/configtls",
 		"/config/internal",
 		"/confmap",
-		"/confmap/converter/expandconverter",
 		"/confmap/provider/envprovider",
 		"/confmap/provider/fileprovider",
 		"/confmap/provider/httpprovider",

cmd/builder/internal/builder/templates/go.mod.tmpl

@@ -6,7 +6,6 @@ go 1.21
 
 require (
 	{{if .Distribution.SupportsConfmapFactories -}}
-	go.opentelemetry.io/collector/confmap/converter/expandconverter v{{.Distribution.OtelColVersion}}
 	{{- range .Providers}}
 	{{if .GoMod}}{{.GoMod}}{{end}}
 	{{- end}}

cmd/builder/internal/builder/templates/main.go.tmpl

@@ -9,7 +9,6 @@ import (
 	"go.opentelemetry.io/collector/component"
 	{{- if .Distribution.SupportsConfmapFactories}}
 	"go.opentelemetry.io/collector/confmap"
-	"go.opentelemetry.io/collector/confmap/converter/expandconverter"
 	{{- range .Providers}}
 	{{.Name}} "{{.Import}}"
 	{{- end}}
@@ -38,9 +37,6 @@ func main() {
 				{{- if .ConfResolver.DefaultURIScheme }}
 				DefaultScheme: "{{ .ConfResolver.DefaultURIScheme }}",
 				{{- end }}
-				ConverterFactories: []confmap.ConverterFactory{
-					expandconverter.NewFactory(),
-				},
 			},
 		},
 		{{- end}}

cmd/builder/test/core.builder.yaml

@@ -33,7 +33,6 @@ replaces:
   - go.opentelemetry.io/collector/config/configtls => ${WORKSPACE_DIR}/config/configtls
   - go.opentelemetry.io/collector/config/internal => ${WORKSPACE_DIR}/config/internal
   - go.opentelemetry.io/collector/confmap => ${WORKSPACE_DIR}/confmap
-  - go.opentelemetry.io/collector/confmap/converter/expandconverter => ${WORKSPACE_DIR}/confmap/converter/expandconverter
   - go.opentelemetry.io/collector/confmap/provider/envprovider => ${WORKSPACE_DIR}/confmap/provider/envprovider
   - go.opentelemetry.io/collector/confmap/provider/fileprovider => ${WORKSPACE_DIR}/confmap/provider/fileprovider
   - go.opentelemetry.io/collector/confmap/provider/httpprovider => ${WORKSPACE_DIR}/confmap/provider/httpprovider

cmd/otelcorecol/builder-config.yaml

@@ -57,7 +57,6 @@ replaces:
   - go.opentelemetry.io/collector/config/configtls => ../../config/configtls
   - go.opentelemetry.io/collector/config/internal => ../../config/internal
   - go.opentelemetry.io/collector/confmap => ../../confmap
-  - go.opentelemetry.io/collector/confmap/converter/expandconverter => ../../confmap/converter/expandconverter
   - go.opentelemetry.io/collector/confmap/provider/envprovider => ../../confmap/provider/envprovider
   - go.opentelemetry.io/collector/confmap/provider/fileprovider => ../../confmap/provider/fileprovider
   - go.opentelemetry.io/collector/confmap/provider/httpprovider => ../../confmap/provider/httpprovider

cmd/otelcorecol/go.mod

@@ -9,7 +9,6 @@ toolchain go1.21.12
 require (
 	go.opentelemetry.io/collector/component v0.106.1
 	go.opentelemetry.io/collector/confmap v0.106.1
-	go.opentelemetry.io/collector/confmap/converter/expandconverter v0.106.1
 	go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.1
 	go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1
 	go.opentelemetry.io/collector/confmap/provider/httpprovider v0.106.1
@@ -170,8 +169,6 @@ replace go.opentelemetry.io/collector/config/internal => ../../config/internal
 
 replace go.opentelemetry.io/collector/confmap => ../../confmap
 
-replace go.opentelemetry.io/collector/confmap/converter/expandconverter => ../../confmap/converter/expandconverter
-
 replace go.opentelemetry.io/collector/confmap/provider/envprovider => ../../confmap/provider/envprovider
 
 replace go.opentelemetry.io/collector/confmap/provider/fileprovider => ../../confmap/provider/fileprovider

confmap/converter/expandconverter/expand.go

@@ -7,13 +7,11 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"regexp"
 
 	"go.uber.org/zap"
 
 	"go.opentelemetry.io/collector/confmap"
 	"go.opentelemetry.io/collector/confmap/internal/envvar"
-	"go.opentelemetry.io/collector/internal/globalgates"
 )
 
 type converter struct {
@@ -25,6 +23,9 @@ type converter struct {
 
 // NewFactory returns a factory for a  confmap.Converter,
 // which expands all environment variables for a given confmap.Conf.
+//
+// Deprecated: [v0.107.0] BASH-style env var expansion is deprecated. Use the `envprovider` instead to expand `${FOO}` and `${env:FOO}`.
+// Using the expandconverter will cause double escaping, so `$$$$` -> `$` instead of `$$`.
 func NewFactory() confmap.ConverterFactory {
 	return confmap.NewConverterFactory(newConverter)
 }
@@ -36,6 +37,8 @@ func newConverter(set confmap.ConverterSettings) confmap.Converter {
 	}
 }
 
+// Deprecated: [v0.107.0] BASH-style env var expansion is deprecated. Use the `envprovider` instead to expand `${FOO}` and `${env:FOO}`.
+// Using the expandconverter will cause double escaping, so `$$$$` -> `$` instead of `$$`.
 func (c converter) Convert(_ context.Context, conf *confmap.Conf) error {
 	var err error
 	out := make(map[string]any)
@@ -90,19 +93,6 @@ func (c converter) expandEnv(s string) (string, error) {
 			return "$"
 		}
 
-		// Matches on $VAR style environment variables
-		// in order to make sure we don't log a warning for ${VAR}
-		var regex = regexp.MustCompile(fmt.Sprintf(`\$%s`, regexp.QuoteMeta(str)))
-		if _, exists := c.loggedDeprecations[str]; !exists && regex.MatchString(s) {
-			if globalgates.UseUnifiedEnvVarExpansionRules.IsEnabled() {
-				err = fmt.Errorf("variable substitution using $VAR has been deprecated in favor of ${VAR} and ${env:VAR} - please update $%s or temporarily disable the confmap.unifyEnvVarExpansion feature gate", str)
-				return ""
-			}
-			msg := fmt.Sprintf("Variable substitution using $VAR will be deprecated in favor of ${VAR} and ${env:VAR}, please update $%s", str)
-			c.logger.Warn(msg, zap.String("variable", str))
-			c.loggedDeprecations[str] = struct{}{}
-		}
-
 		// For $ENV style environment variables os.Expand returns once it hits a character that isn't an underscore or
 		// an alphanumeric character - so we cannot detect those malformed environment variables.
 		// For ${ENV} style variables we can detect those kinds of env var names!

confmap/converter/expandconverter/expand_test.go

@@ -18,8 +18,6 @@ import (
 	"go.opentelemetry.io/collector/confmap"
 	"go.opentelemetry.io/collector/confmap/confmaptest"
 	"go.opentelemetry.io/collector/confmap/internal/envvar"
-	"go.opentelemetry.io/collector/featuregate"
-	"go.opentelemetry.io/collector/internal/globalgates"
 )
 
 func TestNewExpandConverter(t *testing.T) {
@@ -48,11 +46,6 @@ func TestNewExpandConverter(t *testing.T) {
 
 	for _, test := range testCases {
 		t.Run(test.name, func(t *testing.T) {
-			require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.UseUnifiedEnvVarExpansionRules.ID(), false))
-			t.Cleanup(func() {
-				require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.UseUnifiedEnvVarExpansionRules.ID(), true))
-			})
-
 			conf, err := confmaptest.LoadConf(filepath.Join("testdata", test.name))
 			require.NoError(t, err, "Unable to get config")
 
@@ -63,31 +56,6 @@ func TestNewExpandConverter(t *testing.T) {
 	}
 }
 
-func TestNewExpandConverter_UseUnifiedEnvVarExpansionRules(t *testing.T) {
-	require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.UseUnifiedEnvVarExpansionRules.ID(), true))
-	t.Cleanup(func() {
-		require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.UseUnifiedEnvVarExpansionRules.ID(), false))
-	})
-
-	const valueExtra = "some string"
-	const valueExtraMapValue = "some map value"
-	const valueExtraListMapValue = "some list map value"
-	const valueExtraListElement = "some list value"
-	t.Setenv("EXTRA", valueExtra)
-	t.Setenv("EXTRA_MAP_VALUE_1", valueExtraMapValue+"_1")
-	t.Setenv("EXTRA_MAP_VALUE_2", valueExtraMapValue+"_2")
-	t.Setenv("EXTRA_LIST_MAP_VALUE_1", valueExtraListMapValue+"_1")
-	t.Setenv("EXTRA_LIST_MAP_VALUE_2", valueExtraListMapValue+"_2")
-	t.Setenv("EXTRA_LIST_VALUE_1", valueExtraListElement+"_1")
-	t.Setenv("EXTRA_LIST_VALUE_2", valueExtraListElement+"_2")
-
-	conf, err := confmaptest.LoadConf(filepath.Join("testdata", "expand-with-all-env.yaml"))
-	require.NoError(t, err, "Unable to get config")
-
-	// Test that expanded configs are the same with the simple config with no env vars.
-	require.ErrorContains(t, createConverter().Convert(context.Background(), conf), "variable substitution using $VAR has been deprecated in favor of ${VAR} and ${env:VAR}")
-}
-
 func TestNewExpandConverter_EscapedMaps(t *testing.T) {
 	const receiverExtraMapValue = "some map value"
 	t.Setenv("MAP_VALUE", receiverExtraMapValue)
@@ -231,52 +199,6 @@ func TestDeprecatedWarning(t *testing.T) {
 			expectedWarnings: []string{},
 			expectedError:    nil,
 		},
-		{
-			name: "one deprecated var",
-			input: map[string]any{
-				"test": "${HOST}:$PORT",
-			},
-			expectedOutput: map[string]any{
-				"test": "127.0.0.1:4317",
-			},
-			expectedWarnings: []string{"PORT"},
-			expectedError:    nil,
-		},
-		{
-			name: "two deprecated vars",
-			input: map[string]any{
-				"test": "$HOST:$PORT",
-			},
-			expectedOutput: map[string]any{
-				"test": "127.0.0.1:4317",
-			},
-			expectedWarnings: []string{"HOST", "PORT"},
-			expectedError:    nil,
-		},
-		{
-			name: "one depracated serveral times",
-			input: map[string]any{
-				"test":  "$HOST,$HOST",
-				"test2": "$HOST",
-			},
-			expectedOutput: map[string]any{
-				"test":  "127.0.0.1,127.0.0.1",
-				"test2": "127.0.0.1",
-			},
-			expectedWarnings: []string{"HOST"},
-			expectedError:    nil,
-		},
-		{
-			name: "one warning",
-			input: map[string]any{
-				"test": "$HOST_NAME,${HOSTNAME}",
-			},
-			expectedOutput: map[string]any{
-				"test": "127.0.0.2,127.0.0.3",
-			},
-			expectedWarnings: []string{"HOST_NAME"},
-			expectedError:    nil,
-		},
 		{
 			name: "malformed environment variable",
 			input: map[string]any{
@@ -363,5 +285,6 @@ func TestNewExpandConverterWithErrors(t *testing.T) {
 }
 
 func createConverter() confmap.Converter {
+	// nolint
 	return NewFactory().Create(confmap.ConverterSettings{Logger: zap.NewNop()})
 }

confmap/converter/expandconverter/go.mod

@@ -1,12 +1,12 @@
+// Deprecated: [v0.107.0] BASH-style env var expansion is deprecated. Use the `envprovider` instead to expand `${FOO}` and `${env:FOO}`.
+// Using the expandconverter will cause double escaping, so `$$$$` -> `$` instead of `$$`.                                                                                                           //// Using the expandconverter will cause double escaping, so `$$$$` -> `$` instead of `$$`.
 module go.opentelemetry.io/collector/confmap/converter/expandconverter
 
 go 1.21.0
 
 require (
 	github.com/stretchr/testify v1.9.0
 	go.opentelemetry.io/collector/confmap v0.106.1
-	go.opentelemetry.io/collector/featuregate v1.12.0
-	go.opentelemetry.io/collector/internal/globalgates v0.106.1
 	go.uber.org/goleak v1.3.0
 	go.uber.org/zap v1.27.0
 )
@@ -21,6 +21,8 @@ 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.12.0 // indirect
+	go.opentelemetry.io/collector/internal/globalgates v0.106.1 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

confmap/internal/e2e/expand_test.go

@@ -20,6 +20,7 @@ import (
 )
 
 // Test_EscapedEnvVars tests that the resolver supports escaped env vars working together with expand converter.
+// nolint
 func Test_EscapedEnvVars(t *testing.T) {
 	tests := []struct {
 		name   string

otelcol/otelcoltest/config.go

@@ -7,7 +7,6 @@ import (
 	"context"
 
 	"go.opentelemetry.io/collector/confmap"
-	"go.opentelemetry.io/collector/confmap/converter/expandconverter"
 	"go.opentelemetry.io/collector/confmap/provider/envprovider"
 	"go.opentelemetry.io/collector/confmap/provider/fileprovider"
 	"go.opentelemetry.io/collector/confmap/provider/httpprovider"
@@ -26,7 +25,6 @@ func LoadConfig(fileName string, factories otelcol.Factories) (*otelcol.Config,
 				yamlprovider.NewFactory(),
 				httpprovider.NewFactory(),
 			},
-			ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()},
 		},
 	})
 	if err != nil {