modify pending flush inside lock

Author: alexander-alderman-webb

sentry_sdk/_span_batcher.py

@@ -129,7 +129,8 @@ def add(self, span: "SpanJSON") -> None:
                 self._running_size[span["trace_id"]] += self._estimate_size(span)
 
                 if (
-                    size + 1 >= self.MAX_BEFORE_FLUSH
+                    span["is_segment"] is True
+                    or size + 1 >= self.MAX_BEFORE_FLUSH
                     or self._running_size[span["trace_id"]]
                     >= self.MAX_BYTES_BEFORE_FLUSH
                 ):
@@ -139,7 +140,6 @@ def add(self, span: "SpanJSON") -> None:
                     notify = False
 
             if span["is_segment"] is True:
-                self._pending_flush.add(span["trace_id"])
                 self._flush(only_pending=True)
             elif notify:
                 self._flush_event.set()