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

[8.16] Surface config parsing error under EA managed mode (backport #14574) #14718

Merged
merged 3 commits into from
Nov 25, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 22, 2024

Motivation/summary

By wrapping reloader errors in a way that EA manager understands (i.e. in a MultiError of UnitError), newRunner initialization errors, including config parsing errors, will be surfaced and logged.

Checklist

- [ ] Update CHANGELOG.asciidoc I expect this to go into 8.17 first, then 8.16, but there may be uncertainty around this. We can add changelog before the release.

  • Documentation has been updated

How to test these changes

Start apm-server in EA managed mode (e.g. on ESS), pass in an invalid integration policy, e.g. setting apm-server.rum.response_headers to a string instead of a list. Check that in fleet UI that EA input unit has failed. Check that an error is logged.

Related issues

Fixes #14560


This is an automatic backport of pull request #14574 done by [Mergify](https://mergify.com).

By wrapping reloader errors in a way that EA manager understands (i.e. in a MultiError of UnitError), newRunner initialization errors, including config parsing errors, will be surfaced and logged.

(cherry picked from commit 1b21d1d)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 22, 2024
@mergify mergify bot requested a review from a team as a code owner November 22, 2024 21:08
Copy link
Contributor Author

mergify bot commented Nov 22, 2024

Cherry-pick of 1b21d1d has failed:

On branch mergify/bp/8.16/pr-14574
Your branch is up to date with 'origin/8.16'.

You are currently cherry-picking commit 1b21d1dbf.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   NOTICE.txt
	modified:   internal/beatcmd/beat_test.go
	modified:   internal/beatcmd/reloader.go
	modified:   internal/beatcmd/reloader_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Contributor Author

mergify bot commented Nov 25, 2024

This pull request has not been merged yet. Could you please review and merge it @carsonip? 🙏

@mergify mergify bot merged commit c164f30 into 8.16 Nov 25, 2024
13 checks passed
@mergify mergify bot deleted the mergify/bp/8.16/pr-14574 branch November 25, 2024 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant