fix: Strip the event late and correctly handle frame stripping (#40)

Author: mitsuhiko

sentry_sdk/client.py

@@ -103,13 +103,15 @@ def _prepare_event(self, event, scope, hint=None):
         event = handle_in_app(
             event, self.options["in_app_exclude"], self.options["in_app_include"]
         )
-        event = strip_event(event)
 
         before_send = self.options["before_send"]
         if before_send is not None:
             event = before_send(event)
 
+        # 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)
             event = flatten_metadata(event)
             event = convert_types(event)
 

sentry_sdk/utils.py

@@ -476,8 +476,9 @@ def strip_event(event):
 
 
 def strip_frame(frame):
-    frame["vars"], meta = strip_databag(frame.get("vars"))
-    return frame, ({"vars": meta} if meta is not None else None)
+    if "vars" in frame:
+        frame["vars"] = strip_databag(frame["vars"])
+    return frame
 
 
 def convert_types(obj):