Cherry-pick #5808 to 6.1: Fix isolation of modules when merging local and global field settings. #5825
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
urso
force-pushed
the
backport_5808_6.1
branch
from
95513cf to
4ed5a25
Compare
|
@urso Needs rebase because of the CHANGELOG. |
elastic#5808) The user global and local fields configurations must be merged on pipeline setup. The DeepUpdate method did only keep references to the globally shared fields, such that local fields settings do overwrite the shared global state. If more then one beat.Client instance did set local fields, the global state (and all fields added to an event) will be given by the last client being instantiated. The fix Clones the global fields before merging, such that the beat.Client fields operate fully in isolation. (cherry picked from commit 08eb2f5)
urso
force-pushed
the
backport_5808_6.1
branch
from
4ed5a25 to
d6fef59
Compare
|
rebased |
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
elastic#5808) (elastic#5825) The user global and local fields configurations must be merged on pipeline setup. The DeepUpdate method did only keep references to the globally shared fields, such that local fields settings do overwrite the shared global state. If more then one beat.Client instance did set local fields, the global state (and all fields added to an event) will be given by the last client being instantiated. The fix Clones the global fields before merging, such that the beat.Client fields operate fully in isolation. (cherry picked from commit a16dc30)
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.
Cherry-pick of PR #5808 to 6.1 branch. Original message:
Resolves: #5795
The user global and local fields configurations must be merged
on pipeline setup. The DeepUpdate method did only keep references to the
globally shared fields, such that local fields settings do overwrite
the shared global state. If more then one beat.Client instance did set
local fields, the global state (and all fields added to an event) will
be given by the last client being instantiated.
The fix Clones the global fields before merging, such that the
beat.Client fields operate fully in isolation.