refactor: keep shutdown synchronization minimal

Author: WuJiayi0307

featbit_openfeature/provider.py

@@ -62,9 +62,7 @@ def __init__(self, client: FBClient, initialization_timeout: float = 15.0):
         self._initialization_timeout = initialization_timeout
         self._context_converter = EvaluationContextConverter()
         self._details_converter = ResolutionDetailsConverter()
-        # Listener registration and event emission can synchronously re-enter
-        # provider lifecycle methods through user callbacks.
-        self._lifecycle_lock = threading.RLock()
+        self._lifecycle_lock = threading.Lock()
         self._shutdown_started = False
         self._flag_change_listener: _FlagChangeListener | None = None
         self._status_listener_registered = False
@@ -295,12 +293,9 @@ def _register_listeners(self) -> None:
 
     def _emit_configuration_changed(self, flag_key: str) -> None:
         try:
-            with self._lifecycle_lock:
-                if self._shutdown_started:
-                    return
-                self.emit_provider_configuration_changed(
-                    ProviderEventDetails(flags_changed=[flag_key])
-                )
+            self.emit_provider_configuration_changed(
+                ProviderEventDetails(flags_changed=[flag_key])
+            )
         except Exception:
             logger.exception("Failed to emit OpenFeature configuration change event")
 
@@ -309,19 +304,19 @@ def _handle_data_update_status(self, state: State) -> None:
             with self._lifecycle_lock:
                 if self._shutdown_started:
                     return
-                if state.state_type == StateType.OK:
-                    self.emit_provider_ready(ProviderEventDetails())
-                elif state.state_type == StateType.INTERRUPTED:
-                    self.emit_provider_stale(
-                        ProviderEventDetails(message=self._state_message(state))
-                    )
-                elif state.state_type == StateType.OFF:
-                    self.emit_provider_error(
-                        ProviderEventDetails(
-                            error_code=ErrorCode.PROVIDER_FATAL,
-                            message=self._state_message(state),
-                        )
+            if state.state_type == StateType.OK:
+                self.emit_provider_ready(ProviderEventDetails())
+            elif state.state_type == StateType.INTERRUPTED:
+                self.emit_provider_stale(
+                    ProviderEventDetails(message=self._state_message(state))
+                )
+            elif state.state_type == StateType.OFF:
+                self.emit_provider_error(
+                    ProviderEventDetails(
+                        error_code=ErrorCode.PROVIDER_FATAL,
+                        message=self._state_message(state),
                     )
+                )
         except Exception:
             logger.exception("Failed to emit OpenFeature provider status event")
 

tests/test_provider.py

@@ -1,5 +1,4 @@
 from concurrent.futures import ThreadPoolExecutor
-from threading import Event, Thread
 from unittest.mock import Mock
 
 import pytest
@@ -258,30 +257,16 @@ def test_shutdown_never_exposes_client_stop_failure():
     client.stop.assert_called_once_with()
 
 
-def test_shutdown_prevents_concurrent_listener_registration_and_events():
+def test_shutdown_prevents_listener_registration_and_status_events():
     client = make_client()
     provider = FeatBitProvider(client)
     emitter = Mock()
     provider.attach(emitter)
-    stop_entered = Event()
-    release_stop = Event()
-
-    def blocking_stop():
-        stop_entered.set()
-        release_stop.wait(timeout=2)
-
-    client.stop.side_effect = blocking_stop
-    shutdown_thread = Thread(target=provider.shutdown)
-    shutdown_thread.start()
-    assert stop_entered.wait(timeout=2)
+    provider.shutdown()
 
     provider._register_listeners()
     provider._handle_data_update_status(State.ok_state())
-    provider._emit_configuration_changed("checkout")
 
-    release_stop.set()
-    shutdown_thread.join(timeout=2)
-    assert not shutdown_thread.is_alive()
     client.update_status_provider.add_listener.assert_not_called()
     client.flag_tracker.add_flag_changed_listener.assert_not_called()
     emitter.assert_not_called()