fix(sessions): Update session also for non sampled events and change filter order (getsentry#1394)

adinauer · web-flow · commit 4cce4b5d9f5b · 2022-04-20T16:58:26.000+02:00
We want to update the session for dropped events in case the event is dropped by sampling. Events dropped by other mechanisms should not update the session. See getsentry/develop#551
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
@@ -260,6 +260,13 @@ def _should_capture(
         if ignored_by_config_option:
             return False
 
+        return True
+
+    def _should_sample_error(
+        self,
+        event,  # type: Event
+    ):
+        # type: (...) -> bool
         not_in_sample_rate = (
             self.options["sample_rate"] < 1.0
             and random.random() >= self.options["sample_rate"]
@@ -349,9 +356,13 @@ def capture_event(
         if session:
             self._update_session_from_event(session, event)
 
-        attachments = hint.get("attachments")
         is_transaction = event_opt.get("type") == "transaction"
 
+        if not is_transaction and not self._should_sample_error(event):
+            return None
+
+        attachments = hint.get("attachments")
+
         # this is outside of the `if` immediately below because even if we don't
         # use the value, we want to make sure we remove it before the event is
         # sent
