Skip to content

Commit

Permalink
chore: bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
VihasMakwana committed Nov 29, 2024
1 parent 33264a5 commit ee77a68
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 2 deletions.
25 changes: 25 additions & 0 deletions .chloggen/envprovider-bugfix-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: bug_fix

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Set the config key to default if env is unset of set to empty string

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

# (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: []
4 changes: 2 additions & 2 deletions confmap/provider/envprovider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ func (emp *provider) Retrieve(_ context.Context, uri string, _ confmap.WatcherFu
}

val, exists := os.LookupEnv(envVarName)
if !exists {
if !exists || val == "" {
if defaultValuePtr != nil {
val = *defaultValuePtr
} else {
emp.logger.Warn("Configuration references unset environment variable", zap.String("name", envVarName))
emp.logger.Warn("Configuration references unset/empty environment variable", zap.String("name", envVarName))
}
} else if len(val) == 0 {
emp.logger.Info("Configuration references empty environment variable", zap.String("name", envVarName))
Expand Down

0 comments on commit ee77a68

Please sign in to comment.