Skip to content

Speed up SanitizingJSONEncoder on large objects w/ tests #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kattrali merged 10 commits into from
Apr 6, 2018
Merged

Speed up SanitizingJSONEncoder on large objects w/ tests #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
19ae2bb
Speed up SanitizingJSONEncoder on large objects
jonls Apr 3, 2018
b97a296
Add large json object test
martin308 Apr 4, 2018
5f911f6
Test backwards compatibility
martin308 Apr 4, 2018
4af9859
Temp: print time taken
martin308 Apr 5, 2018
afc359b
Remove unused import
martin308 Apr 5, 2018
f24fc1a
Bump allowable time for py26
martin308 Apr 5, 2018
6126125
💄 fix linting issues
martin308 Apr 5, 2018
33c72ee
Add test failure reason
martin308 Apr 5, 2018
d855466
Support older python versions
martin308 Apr 5, 2018
72f83d6
Slow travis is slow
martin308 Apr 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions bugsnag/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,16 @@ def filter_string_values(self, obj, ignored=None):
Remove any value from the dictionary which match the key filters
"""
if not ignored:
ignored = []
ignored = set()

if type(ignored) is list:
ignored = set(ignored)

if id(obj) in ignored:
return self.recursive_value

if isinstance(obj, dict):
ignored.append(id(obj))
ignored.add(id(obj))

clean_dict = {}
for key, value in six.iteritems(obj):
Expand Down Expand Up @@ -84,15 +87,18 @@ def _sanitize(self, obj, trim_strings, ignored=None):
MAX_STRING_LENGTH
"""
if not ignored:
ignored = []
ignored = set()

if type(ignored) is list:
ignored = set(ignored)

if id(obj) in ignored:
return self.recursive_value
elif isinstance(obj, dict):
ignored.append(id(obj))
ignored.add(id(obj))
return self._sanitize_dict(obj, trim_strings, ignored)
elif isinstance(obj, (set, tuple, list)):
ignored.append(id(obj))
ignored.add(id(obj))
items = []
for value in obj:
items.append(self._sanitize(value, trim_strings, ignored))
Expand Down
Loading