Fix JSON output for cgroup_path #2793
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
viktormalik
force-pushed
the
cgroup-path-json-fix
branch
from
93fe238
to
d4e3e77
Compare
|
@viktormalik Wow! Thanks for the very fast fix! |
ajor
requested changes
Oct 6, 2023
There was a problem hiding this comment.
I think the is_quoted_type() function would be the right place to put this fix:
https://github.com/iovisor/bpftrace/blob/281a67a71d06b917d107cd0e85eac7b23ace2b42/src/output.cpp#L10-L15
This would explain how inet works already.
Add cgroup_path to quoted types so that it's surrounded by quotes in
JSON output, otherwise it poses problems for JSON parsers as it may
contain JSON-reserved characters (':').
Also add a test for this. The test passes the produced JSON to Python's
JSON parser to see if it parses correctly. Prior to this change, the
test fails.
viktormalik
force-pushed
the
cgroup-path-json-fix
branch
from
d4e3e77
to
0d62467
Compare
Ah, of course, I completely missed that. Many thanks! Fixed. |
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.
As #2792 noted, for some reason, cgroup path is not surrounded by quotes in the output which poses problems for JSON parsers as it may contain JSON-reserved characters (
:). This is strange, because the same doesn't happen with other builtins, e.g.inet, which also have:in the output.Anyways, add surrounding quotes manually and write a test for this. The test passes the produced JSON to Python's JSON parser to see if it parses correctly. Prior to this change, the test fails.
Fixes #2792.
Checklist
man/adoc/bpftrace.adocand if needed indocs/reference_guide.mdCHANGELOG.md