ref: Simplify limits from the integrations (#39)

Author: mitsuhiko

sentry_sdk/integrations/_wsgi.py

@@ -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,
                     },
                 )
@@ -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

sentry_sdk/utils.py

@@ -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):
@@ -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]

tests/integrations/flask/test_flask.py

@@ -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
 
@@ -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
 
@@ -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"]