Skip to content

ref: Simplify limits from the integrations #39

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
mitsuhiko merged 2 commits into from
Aug 31, 2018
Merged

ref: Simplify limits from the integrations #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e6a424
ref: Simplify limits from the integrations
mitsuhiko Aug 31, 2018
24547c6
Merge branch 'master' into ref/new-limits
mitsuhiko Aug 31, 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
4 changes: 2 additions & 2 deletions sentry_sdk/integrations/_wsgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def extract_into_event(self, event):
data = AnnotatedValue(
"",
{
"rem": [["!rawbody", "x", 0, content_length]],
"rem": [["!raw", "x", 0, content_length]],
"len": content_length,
},
)
Expand Down Expand Up @@ -109,7 +109,7 @@ def parsed_body(self):
for k, v in files.items():
size = self.size_of_file(v)
data[k] = AnnotatedValue(
"", {"len": size, "rem": [["!filecontent", "x", 0, size]]}
"", {"len": size, "rem": [["!raw", "x", 0, size]]}
)

return data
Expand Down
4 changes: 2 additions & 2 deletions sentry_sdk/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ def convert_types(obj):
def strip_databag(obj, remaining_depth=20):
assert not isinstance(obj, bytes), "bytes should have been normalized before"
if remaining_depth <= 0:
return AnnotatedValue(None, {"rem": [["!dep", "x"]]})
return AnnotatedValue(None, {"rem": [["!limit", "x"]]})
if isinstance(obj, text_type):
return strip_string(obj)
if isinstance(obj, Mapping):
Expand All @@ -515,7 +515,7 @@ def strip_string(value, assume_length=None, max_length=512):
value=value[: max_length - 3] + u"...",
metadata={
"len": assume_length,
"rem": [["!len", "x", max_length - 3, max_length]],
"rem": [["!limit", "x", max_length - 3, max_length]],
},
)
return value[:max_length]
Expand Down
8 changes: 4 additions & 4 deletions tests/integrations/flask/test_flask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def index():

event, = events
assert event[""]["request"]["data"]["foo"]["bar"] == {
"": {"len": 2000, "rem": [["!len", "x", 509, 512]]}
"": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
}
assert len(event["request"]["data"]["foo"]["bar"]) == 512

Expand All @@ -205,7 +205,7 @@ def index():

event, = events
assert event[""]["request"]["data"]["foo"] == {
"": {"len": 2000, "rem": [["!len", "x", 509, 512]]}
"": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
}
assert len(event["request"]["data"]["foo"]) == 512

Expand Down Expand Up @@ -261,12 +261,12 @@ def index():

event, = events
assert event[""]["request"]["data"]["foo"] == {
"": {"len": 2000, "rem": [["!len", "x", 509, 512]]}
"": {"len": 2000, "rem": [["!limit", "x", 509, 512]]}
}
assert len(event["request"]["data"]["foo"]) == 512

assert event[""]["request"]["data"]["file"] == {
"": {"len": 0, "rem": [["!filecontent", "x", 0, 0]]}
"": {"len": 0, "rem": [["!raw", "x", 0, 0]]}
}
assert not event["request"]["data"]["file"]

Expand Down