fix: Actually strip frame vars

Author: untitaker

sentry_sdk/client.py

@@ -5,7 +5,7 @@
 
 from sentry_sdk._compat import string_types
 from sentry_sdk.utils import (
-    strip_event,
+    strip_event_mut,
     flatten_metadata,
     convert_types,
     handle_in_app,
@@ -129,7 +129,7 @@ def _prepare_event(self, event, hint, scope):
         # Postprocess the event in the very end so that annotated types do
         # generally not surface in before_send
         if event is not None:
-            event = strip_event(event)
+            strip_event_mut(event)
             event = flatten_metadata(event)
             event = convert_types(event)
 

sentry_sdk/utils.py

@@ -556,22 +556,35 @@ def inner(obj):
     return obj
 
 
-def strip_event(event):
-    old_frames = event.get("stacktrace", {}).get("frames", None)
-    if old_frames:
-        event["stacktrace"]["frames"] = [strip_frame(frame) for frame in old_frames]
+def strip_event_mut(event):
+    strip_stacktrace_mut(event.get("stacktrace", None))
+    exception = event.get("exception", None)
+    if exception:
+        for exception in exception.get("values", None) or ():
+            strip_stacktrace_mut(exception.get("stacktrace", None))
 
-    old_request_data = event.get("request", {}).get("data", None)
-    if old_request_data:
-        event["request"]["data"] = strip_databag(old_request_data)
+    strip_request_mut(event.get("request", None))
 
-    return event
+
+def strip_stacktrace_mut(stacktrace):
+    if not stacktrace:
+        return
+    for frame in stacktrace.get("frames", None) or ():
+        strip_frame_mut(frame)
+
+
+def strip_request_mut(request):
+    if not request:
+        return
+    data = request.get("data", None)
+    if not data:
+        return
+    request["data"] = strip_databag(data)
 
 
-def strip_frame(frame):
+def strip_frame_mut(frame):
     if "vars" in frame:
         frame["vars"] = strip_databag(frame["vars"])
-    return frame
 
 
 def convert_types(obj):

tests/test_event.py

@@ -0,0 +1,39 @@
+import sys
+import json
+
+from sentry_sdk.utils import (
+    AnnotatedValue,
+    convert_types,
+    event_from_exception,
+    flatten_metadata,
+    strip_databag,
+    strip_event_mut,
+)
+
+
+def test_flatten_metadata():
+    assert flatten_metadata({"foo": u"bar"}) == {"foo": u"bar"}
+    assert flatten_metadata({"foo": ["bar"]}) == {"foo": [u"bar"]}
+    assert flatten_metadata({"foo": [AnnotatedValue("bar", u"meta")]}) == {
+        "foo": [u"bar"],
+        "_meta": {"foo": {"0": {"": u"meta"}}},
+    }
+
+
+def test_strip_databag():
+    d = strip_databag({"foo": u"a" * 2000})
+    assert len(d["foo"].value) == 512
+
+
+def test_strip_exception_vars():
+    try:
+        a = "A" * 16000  # noqa
+        1 / 0
+    except Exception:
+        event, _ = event_from_exception(sys.exc_info())
+
+    assert len(json.dumps(event)) > 10000
+    strip_event_mut(event)
+    event = flatten_metadata(event)
+    event = convert_types(event)
+    assert len(json.dumps(event)) < 10000