Fix json collector decorator and switch json parsing library to orjson #553
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
Bumps [boto3](https://github.com/boto/boto3) from 1.33.7 to 1.33.9. - [Release notes](https://github.com/boto/boto3/releases) - [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst) - [Commits](boto/boto3@1.33.7...1.33.9) --- updated-dependencies: - dependency-name: boto3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
aspacca
force-pushed
the
pre-v1.11.0-release
branch
from
448411d to
80e19be
Compare
|
Minimum allowed coverage is Generated by 🐒 cobertura-action against 1dc42f3 |
girodav
reviewed
Dec 8, 2023
handlers/aws/utils.py
Outdated
| @@ -313,8 +313,11 @@ def get_trigger_type_and_config_source(event: dict[str, Any]) -> tuple[str, str] | |||
| and "eventSource" in body["Records"][0] | |||
| ): | |||
| event_source = body["Records"][0]["eventSource"] | |||
| if event_source not in _available_triggers: | |||
| raise Exception | |||
There was a problem hiding this comment.
I would add an exception message of some kind here
There was a problem hiding this comment.
I added a message only where the exceptions will bubble up to the function callar
Comment on lines
+240
to
+245
| single: list[tuple[Union[StorageReader, bytes], int, int, bytes]] = list( | ||
| [ | ||
| (data, starting_offset, ending_offset, newline) | ||
| for data, starting_offset, ending_offset, newline, _ in iterator | ||
| ] | ||
| ) |
There was a problem hiding this comment.
I find this DS a bit hard to digest. Maybe a comment with an example entry could help
storage/decorator.py
Outdated
Comment on lines
283
to
284
| # if it's not a json object we can just forward the content by lines | ||
| if not json_collector_state.has_an_object_start: |
There was a problem hiding this comment.
This comment does not seem to be consistent with the if statement below. Should this use json_collector_state.is_a_json_object instead?
aspacca
changed the title
|
@girodav addressed your comment, please review :) |
girodav
previously approved these changes
Dec 8, 2023
|
@girodav , I fixed a couple of comments and review status was dismissed feel free to re-approve and merge, thanks :) |
girodav
approved these changes
Dec 11, 2023
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.
Bug/Enhancement
What does this PR do?
Fix a bug related to event list from field expander where, if json content type was single and spanning more than 1000 lines the circuit breaker of the json decorator will kick in
It also switch orjson parsing library over ujson one
Why is it important?
A regression was introduced on json decorator while refactored with #544
Also switching from usjon to orjson improves performances
Checklist
- [ ] I have made corresponding changes to the documentation- [ ] I have made corresponding change to the default configuration filesCHANGELOG.mdAuthor's Checklist
How to test this PR locally
Related issues
Use cases
Screenshots
Logs