Skip to content

Commit 5e29655

Browse files
authored
[confmap] Remove stable confmap.unifyEnvVarExpansion feature gate (#11007)
#### Description Removes stable `confmap.unifyEnvVarExpansion` feature gate.
1 parent 6e49863 commit 5e29655

File tree

4 files changed

+27
-9
lines changed

4 files changed

+27
-9
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: confmap
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Removes stable `confmap.unifyEnvVarExpansion` feature gate.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [11007]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []

internal/globalgates/globalgates.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ package globalgates // import "go.opentelemetry.io/collector/internal/globalgate
55

66
import "go.opentelemetry.io/collector/featuregate"
77

8-
var UseUnifiedEnvVarExpansionRules = featuregate.GlobalRegistry().MustRegister("confmap.unifyEnvVarExpansion",
9-
featuregate.StageStable,
10-
featuregate.WithRegisterFromVersion("v0.103.0"),
11-
featuregate.WithRegisterToVersion("v0.109.0"),
12-
featuregate.WithRegisterDescription("`${FOO}` will now be expanded as if it was `${env:FOO}` and no longer expands $ENV syntax. See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details. When this feature gate is stable, expandconverter will be removed."))
13-
148
var NoopTracerProvider = featuregate.GlobalRegistry().MustRegister("service.noopTracerProvider",
159
featuregate.StageAlpha,
1610
featuregate.WithRegisterFromVersion("v0.107.0"),

otelcol/command.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"github.com/spf13/cobra"
1111

1212
"go.opentelemetry.io/collector/featuregate"
13-
"go.opentelemetry.io/collector/internal/globalgates"
1413
)
1514

1615
// NewCommand constructs a new cobra.Command using the given CollectorSettings.
@@ -55,7 +54,7 @@ func updateSettingsUsingFlags(set *CollectorSettings, flags *flag.FlagSet) error
5554
return errors.New("at least one config flag must be provided")
5655
}
5756

58-
if globalgates.UseUnifiedEnvVarExpansionRules.IsEnabled() && set.ConfigProviderSettings.ResolverSettings.DefaultScheme == "" {
57+
if set.ConfigProviderSettings.ResolverSettings.DefaultScheme == "" {
5958
set.ConfigProviderSettings.ResolverSettings.DefaultScheme = "env"
6059
}
6160

otelcol/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ require (
1313
go.opentelemetry.io/collector/exporter v0.108.1
1414
go.opentelemetry.io/collector/extension v0.108.1
1515
go.opentelemetry.io/collector/featuregate v1.14.1
16-
go.opentelemetry.io/collector/internal/globalgates v0.108.1
1716
go.opentelemetry.io/collector/processor v0.108.1
1817
go.opentelemetry.io/collector/receiver v0.108.1
1918
go.opentelemetry.io/collector/service v0.108.1
@@ -68,6 +67,7 @@ require (
6867
go.opentelemetry.io/collector/consumer v0.108.1 // indirect
6968
go.opentelemetry.io/collector/consumer/consumerprofiles v0.108.1 // indirect
7069
go.opentelemetry.io/collector/consumer/consumertest v0.108.1 // indirect
70+
go.opentelemetry.io/collector/internal/globalgates v0.108.1 // indirect
7171
go.opentelemetry.io/collector/pdata v1.14.1 // indirect
7272
go.opentelemetry.io/collector/pdata/pprofile v0.108.1 // indirect
7373
go.opentelemetry.io/collector/pdata/testdata v0.108.1 // indirect

0 commit comments

Comments
 (0)