Skip to content

Commit c082833

Browse files
committed
[builder] Remove undocumented handling of DIST_* environment variables replacements
1 parent 7be639f commit c082833

File tree

2 files changed

+26
-10
lines changed

2 files changed

+26
-10
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: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: builder
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove undocumented handling of `DIST_*` environment variables replacements
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [13335]
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: []

cmd/builder/internal/command.go

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ package internal // import "go.opentelemetry.io/collector/cmd/builder/internal"
55

66
import (
77
"fmt"
8-
"strings"
9-
108
"github.com/knadh/koanf/parsers/yaml"
119
"github.com/knadh/koanf/providers/env/v2"
1210
"github.com/knadh/koanf/providers/file"
@@ -116,14 +114,7 @@ func initConfig(flags *flag.FlagSet) (*builder.Config, error) {
116114
}
117115

118116
// handle env variables
119-
if err = k.Load(env.Provider(".", env.Opt{
120-
TransformFunc: func(key string, value string) (string, any) {
121-
// Only values from the `dist.` group can be set,
122-
// and the subfields in `dist.` contain `_` in their names.
123-
// All other fields are arrays and the koanf env provider doesn't provide a straightforward way to set arrays.
124-
return strings.Replace(strings.ToLower(key), "dist_", "dist.", 1), value
125-
},
126-
}), nil); err != nil {
117+
if err = k.Load(env.Provider(".", env.Opt{}), nil); err != nil {
127118
return nil, fmt.Errorf("failed to load environment variables: %w", err)
128119
}
129120

0 commit comments

Comments
 (0)