Move config reloading to beatcmd #9371
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This pull request does not have a backport label. Could you fix it @axw? 🙏
NOTE: |
mergify
bot
added
the
backport-skip
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
🤖 GitHub commentsExpand to view the GitHub comments
To re-run your PR in the CI, just comment with:
|
beatcmd is now provided with a function that returns a "Runner", given some parameters: a complete configuration object containing both input and output configuration, a logger, and beat.Info. beatcmd registers with the libbeat management API for handling config changes. beatcmd takes care of stopping and starting Runners in response to config reloads. beater is now only responsible for running a single instance of the APM Server logic with a static configuration. beater does not depend on beatcmd by design. Some of the test helper code in beater has been moved to a new package, beatertest.
📚 Go benchmark reportDiff with the report generated with https://pkg.go.dev/golang.org/x/perf/cmd/benchstat |
marclop
approved these changes
Oct 17, 2022
| @@ -283,14 +257,25 @@ func (b *Beat) Run(ctx context.Context) error { | |||
| }() | |||
| defer logp.Info("%s stopped.", b.Info.Beat) | |||
|
|
|||
| logger := logp.NewLogger("") | |||
| if runtime.GOARCH == "386" { | |||
| logger.Warn("" + | |||
There was a problem hiding this comment.
Is this empty concatenation necessary?
There was a problem hiding this comment.
Only necessary for my compulsion to have the proceeding strings lined up :)
I can get rid of it if you prefer?
There was a problem hiding this comment.
I'm fine with it, I was just curious to learn why.
| logp.Info("%s started.", b.Info.Beat) | ||
| b.Manager.SetStopCallback(cancel) | ||
| return beater.Run(&b.Beat) | ||
| if err := g.Wait(); err != nil && !errors.Is(err, context.Canceled) { |
There was a problem hiding this comment.
We're calling g.Wait here and then on line 271 again. Is that intentional?
There was a problem hiding this comment.
It's intentional to ensure all goroutines have exited by the time the Run method returns. Not strictly necessary, but may avoid surprises in tests with code from prior tests still running. I'll add a comment.
There was a problem hiding this comment.
I think the comment will help clarify things for readers. I thought that was why, but wasn't sure.
- Don't overwrite ctx in Runner.Run while it's being read - Atomically increment "requests" in HTTP handler in test - Allow for extra log message in test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation/summary
beatcmd is now provided with a function that returns a "Runner", given some parameters: a complete configuration object containing both input and output configuration, a logger, and beat.Info. beatcmd registers with the libbeat management API for handling config changes. beatcmd takes care of stopping and starting Runners in response to config reloads.
beater is now only responsible for running a single instance of the APM Server logic with a static configuration. beater does not depend on beatcmd by design. Some of the test helper code in beater has been moved to a new package, beatertest. In a followup we should rename beate", to clarify that it is no longer beat-centric.
Checklist
- [ ] Update CHANGELOG.asciidoc- [ ] Update package changelog.yml (only if changes toapmpackagehave been made)- [ ] Documentation has been updatedHow to test these changes
Non-functional change.
Related issues
Closes #8928