Skip to content

Commit

Permalink
[confmap]remove stable featuregate
Browse files Browse the repository at this point in the history
  • Loading branch information
atoulme committed Jan 24, 2024
1 parent f13e6a3 commit 239057d
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 13 deletions.
25 changes: 25 additions & 0 deletions .chloggen/remove_confmap.expandEnabled_stable.yaml
Original file line number Diff line number Diff line change
@@ -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: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: confmap

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Remove the `confmap.expandEnabled` feature gate, it has been declared stable since 0.75.0.

# One or more tracking issues or pull requests related to the change
issues: [9369]

# (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]
6 changes: 3 additions & 3 deletions confmap/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ require (
github.com/knadh/koanf/v2 v2.0.1
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector/featuregate v1.0.1
go.uber.org/goleak v1.3.0
go.uber.org/multierr v1.11.0
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
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
github.com/rogpeppe/go-internal v1.10.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
)

replace go.opentelemetry.io/collector/featuregate => ../featuregate
Expand Down
10 changes: 8 additions & 2 deletions confmap/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions confmap/resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,12 @@ import (
"strings"

"go.uber.org/multierr"

"go.opentelemetry.io/collector/featuregate"
)

// follows drive-letter specification:
// https://datatracker.ietf.org/doc/html/draft-kerwin-file-scheme-07.html#section-2.2
var driverLetterRegexp = regexp.MustCompile("^[A-z]:")

var _ = featuregate.GlobalRegistry().MustRegister(
"confmap.expandEnabled",
featuregate.StageStable,
featuregate.WithRegisterToVersion("v0.75.0"),
featuregate.WithRegisterDescription("controls whether expanding embedded external config providers URIs"))

// Resolver resolves a configuration as a Conf.
type Resolver struct {
uris []location
Expand Down

0 comments on commit 239057d

Please sign in to comment.