Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pkg/stanza] Handle entry error of callback function in ProcessWithCallback #35769

Merged
merged 8 commits into from
Oct 23, 2024
31 changes: 31 additions & 0 deletions .chloggen/stanza_handle_cb_errors.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# 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. filelogreceiver)
component: pkg/stanza

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Handle error of callback function of `ParserOperator.ProcessWithCallback`

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

# (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: |
`ProcessWithCallback` of `ParserOperator` first calls the `ParseWith` method
which properly handles errors with `HandleEntryError`.
Then the callback function is called and its returned error should also
be handled by the `HandleEntryError` ensuring a consistent experience.

# 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: [user]
2 changes: 1 addition & 1 deletion pkg/stanza/operator/helper/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func (p *ParserOperator) ProcessWithCallback(ctx context.Context, entry *entry.E
if cb != nil {
err = cb(entry)
if err != nil {
return err
return p.HandleEntryError(ctx, entry, err)
}
}

Expand Down