Skip to content

Commit

Permalink
Merge branch 'main' into tlscheckreceiver
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-burt committed Sep 26, 2024
2 parents f995c0d + 0f2fea6 commit 2f70ad2
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
27 changes: 27 additions & 0 deletions .chloggen/add_receivercreator_config_validation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 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. filelogreceiver)
component: receivercreator

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Validate endpoint's configuration before starting receivers

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [33145]

# (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:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# 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: []
3 changes: 3 additions & 0 deletions receiver/receivercreator/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ func (run *receiverRunner) loadRuntimeReceiverConfig(
if err := mergedConfig.Unmarshal(receiverCfg); err != nil {
return nil, "", fmt.Errorf("failed to load %q template config: %w", receiver.id.String(), err)
}
if err := component.ValidateConfig(receiverCfg); err != nil {
return nil, "", fmt.Errorf("invalid runtime receiver config: receivers::%s: %w", receiver.id, err)
}
return receiverCfg, targetEndpoint, nil
}

Expand Down

0 comments on commit 2f70ad2

Please sign in to comment.