parser_json: keep time key when parsing fails #7323
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
The documentation appears to suggest that the time key is discarded from the key after it is "found and parsed", however in the current setup the key is discarded even when parsing fails. This commit resets the `skip` value if the time key parsing fails. Signed-off-by: braydonk <braydonk@google.com>
If skip is not set due to the time key parse failing, don't reset the msgpack map size. Signed-off-by: braydonk <braydonk@google.com>
Add a test for a JSON that fails timestamp parsing to verify that the time key remains in the result. Signed-off-by: braydonk <braydonk@google.com>
braydonk
requested review from
edsiper,
leonardo-albertovich,
fujimotos and
koleini
as code owners
leonardo-albertovich
approved these changes
May 5, 2023
|
Thanks for the contribution @braydonk, do you want to backport this to 2.0 or would you rather have someone from the team do it? |
|
As long as this change is acceptable and merged in main, I can do the backport to 2.0! |
|
Looks good to me, just the usual macOS flakes. |
leonardo-albertovich
pushed a commit
that referenced
this pull request
May 5, 2023
parser_json: do not skip time key when parse fails The documentation appears to suggest that the time key is discarded from the key after it is "found and parsed", however in the current setup the key is discarded even when parsing fails. This commit resets the `skip` value if the time key parsing fails. Additionally, an internal test case has been added for parser_json to validate the correction. Note: This PR is a backport of PR #7323 Signed-off-by: braydonk <braydonk@google.com>
|
Thank you very much for the patch and for taking the time to backport it @braydonk. |
|
No problem! Glad we got this resolved. |
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.
This PR will cause the
jsonparser to retain the time field if parsing the time key fails.Resolves #7322
Enter
[N/A]in the box, if an item is not applicable to your change.Testing
Before we can approve your change; please submit the following in a comment:
If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-testlabel to test for all targets (requires maintainer to do).Documentation
Backporting
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.