Add logging.with_fields to beatreceiver config
#42961
+72
−6
There are no files selected for viewing
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 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 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 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 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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -346,6 +346,14 @@ func NewBeatReceiver(settings Settings, receiverConfig map[string]interface{}, u | |
| return nil, fmt.Errorf("error unpacking beats logging config: %w\n%v", err, b.Config.Logging) | ||
| } | ||
|
|
||
| if logpConfig.WithFields != nil { | ||
| var fields = []zapcore.Field{} | ||
| for key, value := range logpConfig.WithFields { | ||
|
There was a problem hiding this comment. You should be able to write a test that ensures setting this produces logs with the expected fields. There are several system tests that run a beat and inspect the log files you could look at. There was a problem hiding this comment. Since this is restricted to beatreceivers - will use the existing tests in elastic-agent to ensure this setting. Related PR on elastic-agent: elastic/elastic-agent#7062 There was a problem hiding this comment. This is a Beats specific change in beat.go, it doesn't make sense to me to test it in agent because a PR in agent could never break this. Agent will rely on this feature, but the elastic agent repository shouldn't be responsible for testing that it works on its own. One way to think about this is a series of contracts that must be upheld:
Those two things tested independently should guarantee this works properly. |
||
| fields = append(fields, zap.Any(key, value)) | ||
| } | ||
| core = core.With(fields) | ||
| } | ||
|
|
||
| if err := logp.ConfigureWithCore(logpConfig, core); err != nil { | ||
| return nil, fmt.Errorf("error configuring beats logp: %w", err) | ||
| } | ||
|
|
||
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree this works, but I'm wondering why
logp.ConfigureWithCoreisn't doing this? It is the logp config that has the option, I would just expect it to happen there, much like the selectors get set there.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My bad, you are right. I will raise close this and open a separate PR on elastic-agent-libs. Thank you for pointing this