Add reset of the running flag

Author: ericapisani

sentry_sdk/_batcher.py

@@ -52,6 +52,7 @@ def _reset_in_child() -> None:
 
     def _reset_thread_state(self) -> None:
         self._buffer = []
+        self._running = True
         self._lock = threading.Lock()
         self._active = threading.local()
         self._flush_event = threading.Event()

sentry_sdk/_span_batcher.py

@@ -66,6 +66,7 @@ def _reset_in_child() -> None:
     def _reset_thread_state(self) -> None:
         self._span_buffer = defaultdict(list)
         self._running_size = defaultdict(lambda: 0)
+        self._running = True
 
         self._lock = threading.Lock()
         self._active = threading.local()

tests/test_logs.py

@@ -844,21 +844,24 @@ def test_log_batcher_lock_reset_in_child_after_fork(sentry_init):
 
     original_lock = batcher._lock
     original_lock.acquire()
+
     batcher._buffer.append(object())
     batcher._active.flag = True
     batcher._flush_event.set()
+    batcher._running = False
+
     pid = os.fork()
     if pid == 0:
-        # Child: was the lock object replaced and is the new one not
-        # held? Without the fix, _lock is `original_lock` inherited
-        # locked, so `replaced` is False. blocking=False guarantees the
-        # child can't hang on a regression.
         replaced = batcher._lock is not original_lock
         unheld = batcher._lock.acquire(blocking=False)
+
         flusher_reset = batcher._flusher is None and batcher._flusher_pid is None
         buffer_reset = len(batcher._buffer) == 0
         active_reset = not getattr(batcher._active, "flag", False)
+
         event_reset = not batcher._flush_event.is_set()
+        running_reset = batcher._running is True
+
         os._exit(
             0
             if replaced
@@ -867,6 +870,7 @@ def test_log_batcher_lock_reset_in_child_after_fork(sentry_init):
             and buffer_reset
             and active_reset
             and event_reset
+            and running_reset
             else 1
         )
 

tests/test_metrics.py

@@ -543,6 +543,7 @@ def test_metrics_batcher_lock_reset_in_child_after_fork(sentry_init):
     batcher._buffer.append(object())
     batcher._active.flag = True
     batcher._flush_event.set()
+    batcher._running = False
 
     pid = os.fork()
     if pid == 0:
@@ -553,6 +554,7 @@ def test_metrics_batcher_lock_reset_in_child_after_fork(sentry_init):
         buffer_reset = len(batcher._buffer) == 0
         active_reset = not getattr(batcher._active, "flag", False)
         event_reset = not batcher._flush_event.is_set()
+        running_reset = batcher._running is True
 
         os._exit(
             0
@@ -562,6 +564,7 @@ def test_metrics_batcher_lock_reset_in_child_after_fork(sentry_init):
             and buffer_reset
             and active_reset
             and event_reset
+            and running_reset
             else 1
         )
 

tests/tracing/test_span_streaming.py

@@ -1588,6 +1588,7 @@ def test_span_batcher_lock_reset_in_child_after_fork(sentry_init):
     batcher._running_size["test-trace-id"] = 42
     batcher._active.flag = True
     batcher._flush_event.set()
+    batcher._running = False
 
     pid = os.fork()
     if pid == 0:
@@ -1600,6 +1601,7 @@ def test_span_batcher_lock_reset_in_child_after_fork(sentry_init):
 
         active_reset = not getattr(batcher._active, "flag", False)
         event_reset = not batcher._flush_event.is_set()
+        running_reset = batcher._running is True
 
         os._exit(
             0
@@ -1610,6 +1612,7 @@ def test_span_batcher_lock_reset_in_child_after_fork(sentry_init):
             and running_size_reset
             and active_reset
             and event_reset
+            and running_reset
             else 1
         )