Use requests.session instead of requests directly (#439)

xinlili-statsig · web-flow · commit ae330f22136c · 2025-07-10T11:38:40.000-07:00
requests.request() is not fork safe. 
When forking happens, thread pool might be in a bad state. Instead use
session and stored within http_worker
diff --git a/statsig/http_worker.py b/statsig/http_worker.py
@@ -45,6 +45,7 @@ def __init__(
         self.__statsig_metadata = statsig_metadata
         self.__diagnostics = diagnostics
         self.__request_count = 0
+        self.__request_session = requests.session()
 
     def is_pull_worker(self) -> bool:
         return True
@@ -191,7 +192,7 @@ def _run_request_with_strict_timeout(self, method, url, headers, payload, timeou
                                          for_initialize=False, get_text_value_only=False) -> RequestResult:
         def request_task():
             try:
-                with requests.request(method, url, data=payload, headers=headers, timeout=timeout,
+                with self.__request_session.request(method, url, data=payload, headers=headers, timeout=timeout,
                                       stream=True) as response:
                     try:
                         response.raise_for_status()
diff --git a/tests/test_api_overrides.py b/tests/test_api_overrides.py
@@ -35,10 +35,10 @@ def mock_apis(*args, **kwargs):
             return stub.mock(*args, **kwargs)
 
 
-@patch('requests.request', side_effect=mock_apis)
+@patch('requests.Session.request', side_effect=mock_apis)
 class TestApiOverrides(unittest.TestCase):
     @classmethod
-    @patch('requests.request', side_effect=mock_apis)
+    @patch('requests.Session.request', side_effect=mock_apis)
     def setUpClass(cls, mock_request):
         cls.api_override = False
         cls.log_event_override = False
diff --git a/tests/test_background_sync.py b/tests/test_background_sync.py
@@ -19,7 +19,7 @@ def setUp(self):
     def tearDown(self):
         self._client.shutdown()
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def test_sync_cycle(self, mock_request):
         self.config_sync_count = 0
         self.idlist_sync_count = 0
@@ -315,7 +315,7 @@ def id_list_3_callback(url: str, **kwargs):
         self.assertEqual(self.idlist_2_download_count, 1)
         self.assertEqual(self.idlist_3_download_count, 1)
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def test_sync_cycle_no_idlist(self, mock_request):
         self.config_sync_count = 0
         self.idlist_sync_count = 0
@@ -361,7 +361,7 @@ def get_id_lists_callback(url: str, **kwargs):
         self.assertEqual(self.config_sync_count, 2)
         self.assertEqual(self.idlist_sync_count, 2)
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def test_dcs_retry(self, mock_request):
         self.config_sync_count = 0
         self.idlist_sync_count = 0
@@ -405,7 +405,7 @@ def download_config_specs_code_callback(url: str, **kwargs):
         time.sleep(1)
         self.assertEqual(self.config_sync_count, 2)
 
-        time.sleep(1)
+        time.sleep(2)
         self.assertEqual(self.config_sync_count, 3)
 
         self._client.shutdown()
diff --git a/tests/test_bg_thread_spawning.py b/tests/test_bg_thread_spawning.py
@@ -16,7 +16,7 @@ class TestBackgroundThreadSpawning(unittest.TestCase):
     _event = StatsigEvent(_user, "an_event")
     _actions: List[Callable]
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUp(self, mock_request) -> None:
         server = StatsigServer()
         options = StatsigOptions(
diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py
@@ -23,7 +23,7 @@ class TestStatsigConcurrency(unittest.TestCase):
     _event_count_lock = threading.Lock()
 
     @classmethod
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUpClass(cls, mock_request):
         cls._idlist_sync_count = 0
         cls._download_id_list_count = 0
@@ -83,7 +83,7 @@ def log_event_callback(url: str, **kwargs):
     def tearDownClass(cls) -> None:
         statsig.shutdown()
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def test_checking_and_updating_concurrently(self, mock_request):
         self.threads = []
         for x in range(10):
diff --git a/tests/test_concurrency_on_initialize.py b/tests/test_concurrency_on_initialize.py
@@ -12,12 +12,12 @@ def _mock_thread_start(**kwargs):
     raise RuntimeError("Failed to start thread")
 
 
-@patch('requests.request', side_effect=_network_stub.mock)
+@patch('requests.Session.request', side_effect=_network_stub.mock)
 class TestConcurrencyOnInit(unittest.TestCase):
     _server: StatsigServer
     _user = StatsigUser(user_id="a-user")
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUp(self, mock_request) -> None:
         self._server = StatsigServer()
 
diff --git a/tests/test_dcs_override_log_event_interval.py b/tests/test_dcs_override_log_event_interval.py
@@ -14,7 +14,7 @@
 class DCSOverrideTest(unittest.TestCase):
     _network_stub = NetworkStub("http://override-log-event-interval-test")
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUp(self, mock_request):
         self._instance = StatsigServer()
         options = StatsigOptions(
@@ -32,10 +32,10 @@ def setUp(self, mock_request):
         self._user = StatsigUser("dloomb")
         self.flush()
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def flush(self, mock_request):
         self._instance.flush()
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def test_interval_is_overridden(self, mock_request):
         self.assertEqual(self._instance._logger._logger_worker._log_interval, 100.0)
diff --git a/tests/test_diagnostics_core_api.py b/tests/test_diagnostics_core_api.py
@@ -21,13 +21,13 @@
 
 
 @patch("time.time", return_value=123)
-@patch("requests.request", side_effect=_network_stub.mock)
+@patch("requests.Session.request", side_effect=_network_stub.mock)
 class TestDiagnosticsCoreAPI(unittest.TestCase):
     _server: StatsigServer
     _evaluator: _Evaluator
     _user = StatsigUser(user_id="a-user")
 
-    @patch("requests.request", side_effect=_network_stub.mock)
+    @patch("requests.Session.request", side_effect=_network_stub.mock)
     def setUp(self, mock_request) -> None:
         response = json.loads(CONFIG_SPECS_RESPONSE)
         response["diagnostics"] = {
diff --git a/tests/test_eval_callback.py b/tests/test_eval_callback.py
@@ -16,7 +16,7 @@
 _network_stub = NetworkStub("http://test-statsig-e2e")
 
 
-@patch('requests.request', side_effect=_network_stub.mock)
+@patch('requests.Session.request', side_effect=_network_stub.mock)
 class TestEvalCallback(unittest.TestCase):
     _logs = {}
     _gateName = ""
@@ -25,7 +25,7 @@ class TestEvalCallback(unittest.TestCase):
     _spec_match = False
 
     @classmethod
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUpClass(cls, mock_request):
         _network_stub.stub_request_with_value(
             "download_config_specs/.*", 200, json.loads(CONFIG_SPECS_RESPONSE))
diff --git a/tests/test_evaluation_details.py b/tests/test_evaluation_details.py
@@ -15,13 +15,13 @@
 
 
 @patch('time.time', return_value=123)
-@patch('requests.request', side_effect=_network_stub.mock)
+@patch('requests.Session.request', side_effect=_network_stub.mock)
 class TestEvaluationDetails(unittest.TestCase):
     _server: StatsigServer
     _evaluator: _Evaluator
     _user = StatsigUser(user_id="a-user")
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUp(self, mock_request) -> None:
         server = StatsigServer()
         self.options = StatsigOptions(
diff --git a/tests/test_grpc_websocket.py b/tests/test_grpc_websocket.py
@@ -24,13 +24,13 @@
 _network_stub = NetworkStub(_api_override)
 
 
-@patch('requests.request', side_effect=_network_stub.mock)
+@patch('requests.Session.request', side_effect=_network_stub.mock)
 class TestGRPCWebsocketInitialize(unittest.TestCase):
     _server: StatsigServer
     _evaluator: _Evaluator
     _user = StatsigUser(user_id="a-user")
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUp(self, mock_request):
         mock_server, grpc_stub, port = start_grpc_server()
         self.grpc_stub = grpc_stub
diff --git a/tests/test_init_details.py b/tests/test_init_details.py
@@ -14,7 +14,7 @@
 _network_stub = NetworkStub("http://test-init-details")
 
 
-@patch('requests.request', side_effect=_network_stub.mock)
+@patch('requests.Session.request', side_effect=_network_stub.mock)
 class TestInitDetails(unittest.TestCase):
 
     @classmethod
diff --git a/tests/test_init_diagnostics.py b/tests/test_init_diagnostics.py
@@ -20,13 +20,13 @@
 
 
 @patch('time.time', return_value=123)
-@patch('requests.request', side_effect=_network_stub.mock)
+@patch('requests.Session.request', side_effect=_network_stub.mock)
 class TestDiagnostics(unittest.TestCase):
     _server: StatsigServer
     _evaluator: _Evaluator
     _user = StatsigUser(user_id="a-user")
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUp(self, mock_request) -> None:
         self._server = StatsigServer()
         self._options = StatsigOptions(
diff --git a/tests/test_init_timeout.py b/tests/test_init_timeout.py
@@ -16,11 +16,11 @@
 _network_stub = NetworkStub("http://test-init_timeout")
 
 
-@patch('requests.request', side_effect=_network_stub.mock)
+@patch('requests.Session.request', side_effect=_network_stub.mock)
 class TestInitTimeout(unittest.TestCase):
 
     @classmethod
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUpClass(cls, mock_request):
         _network_stub.reset()
 
diff --git a/tests/test_layer_exposures.py b/tests/test_layer_exposures.py
@@ -17,7 +17,7 @@
 _network_stub = NetworkStub("http://test-layer-exposure")
 
 
-@patch('requests.request', side_effect=_network_stub.mock)
+@patch('requests.Session.request', side_effect=_network_stub.mock)
 class TestLayerExposures(TestCaseWithExtras):
     _user = StatsigUser("dloomb")
     _logs = {}
diff --git a/tests/test_logger.py b/tests/test_logger.py
@@ -50,11 +50,11 @@ def on_log(url: str, **kwargs):
     def tearDown(self):
         self._instance.shutdown()
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def flush(self, mock_request):
         self._instance.flush()
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def test_log_size(self, mock_request):
         self._instance.check_gate(self._user, "a_gate")
         self._instance.check_gate(self._user, "b_gate")
@@ -72,7 +72,7 @@ def test_log_size(self, mock_request):
         self._run_and_wait_for_logs(lambda: self._instance.check_gate(self._user, "f_gate"))
         self.assertEqual(len(self._events), 6)
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def test_exposure_dedupe(self, mock_request):
         self._instance.check_gate(self._user, "a_gate")
         self._instance.check_gate(self._user, "a_gate")
@@ -123,7 +123,7 @@ def __get_experiments():
         self._run_and_wait_for_logs(__get_experiments)
         self.assertEqual(len(self._events), 10)
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def test_log_content(self, mock_request):
         self._instance.check_gate(self._user, "a_gate")
         sleep(0.1)
diff --git a/tests/test_logger_worker.py b/tests/test_logger_worker.py
@@ -30,7 +30,7 @@ def setUp(self):
         self.flush()
 
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def flush(self, mock_request):
         self._instance.flush()
 
diff --git a/tests/test_logging_retries.py b/tests/test_logging_retries.py
@@ -15,11 +15,11 @@
 _network_stub = NetworkStub("http://test-retries")
 
 
-@patch('requests.request', side_effect=_network_stub.mock)
+@patch('requests.Session.request', side_effect=_network_stub.mock)
 class TestLoggingRetries(unittest.TestCase):
 
     @classmethod
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUpClass(cls, mock_request):
         _network_stub.stub_request_with_value("download_config_specs/.*", 200, json.loads(CONFIG_SPECS_RESPONSE))
 
diff --git a/tests/test_manual_exposures.py b/tests/test_manual_exposures.py
@@ -15,7 +15,7 @@
 _network_stub = NetworkStub("http://test-manual-exposures")
 
 
-@patch('requests.request', side_effect=_network_stub.mock)
+@patch('requests.Session.request', side_effect=_network_stub.mock)
 class TestManualExposures(TestCaseWithExtras):
     _user = StatsigUser("dloomb")
     _logs = {}
diff --git a/tests/test_optional_callbacks.py b/tests/test_optional_callbacks.py
@@ -13,10 +13,10 @@
     CONFIG_SPECS_RESPONSE = r.read()
 
 
-@patch('requests.request', side_effect=_network_stub.mock)
+@patch('requests.Session.request', side_effect=_network_stub.mock)
 class TestOptionalCallbacks(unittest.TestCase):
     @classmethod
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUpClass(cls, mock_request) -> None:
         cls._events = []
         cls._event_flush_detail = {
diff --git a/tests/test_output_logger.py b/tests/test_output_logger.py
@@ -68,7 +68,7 @@ def check_urls_for_secret(self, key):
 class TestOutputLogger(unittest.TestCase):
 
     @classmethod
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUpClass(cls, mock_request):
         _network_stub.reset()
 
@@ -81,7 +81,7 @@ def dcs_callback(url: str, **kwargs):
     def tearDown(self):
         statsig.shutdown()
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def test_initialize_timeout(self, mock_request):
         logger = MockOutputLogger()
         logger.set_log_level(LogLevel.INFO)
@@ -90,7 +90,7 @@ def test_initialize_timeout(self, mock_request):
         statsig.initialize("secret-key", options)
         self.assertGreaterEqual(len(logger._logs.get("info")), 2)
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def test_initialize_failed_to_load_network_info(self, mock_request):
         logger = MockOutputLogger()
         logger.set_log_level(LogLevel.INFO)
@@ -101,7 +101,7 @@ def test_initialize_failed_to_load_network_info(self, mock_request):
         failed_urls = logger.check_urls_for_secret('secret-key')
         self.assertEqual(len(failed_urls), 0)
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def test_set_logging_level_warning(self, mock_request):
         logger = MockOutputLogger()
         logger.set_log_level(LogLevel.WARNING)
@@ -112,7 +112,7 @@ def test_set_logging_level_warning(self, mock_request):
         failed_urls = logger.check_urls_for_secret('secret-key')
         self.assertEqual(len(failed_urls), 0)
 
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def test_set_logging_level_debug(self, mock_request):
         logger = MockOutputLogger()
         logger.set_log_level(LogLevel.DEBUG)
diff --git a/tests/test_sampling.py b/tests/test_sampling.py
@@ -22,12 +22,12 @@ def generate_random_user_id(length=12):
     return ''.join(random.choice(characters) for _ in range(length))
 
 
-@patch('requests.request', side_effect=_network_stub.mock)
+@patch('requests.Session.request', side_effect=_network_stub.mock)
 class TestEventSampling(unittest.TestCase):
     _events = []
 
     @classmethod
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUpClass(cls, mock_request):
         def log_event_callback(url: str, **kwargs):
             new_events = GzipHelpers.decode_body(kwargs)["events"]
diff --git a/tests/test_statsig_e2e.py b/tests/test_statsig_e2e.py
@@ -16,12 +16,12 @@
 _network_stub = NetworkStub("http://test-statsig-e2e")
 
 
-@patch('requests.request', side_effect=_network_stub.mock)
+@patch('requests.Session.request', side_effect=_network_stub.mock)
 class TestStatsigE2E(unittest.TestCase):
     _logs = {}
 
     @classmethod
-    @patch('requests.request', side_effect=_network_stub.mock)
+    @patch('requests.Session.request', side_effect=_network_stub.mock)
     def setUpClass(cls, mock_request):
         _network_stub.stub_request_with_value(
             "download_config_specs/.*", 200, PARSED_CONFIG_SPEC)
diff --git a/tests/test_statsig_e2e_bootstrapped.py b/tests/test_statsig_e2e_bootstrapped.py
diff --git a/tests/test_storage_adapter.py b/tests/test_storage_adapter.py
diff --git a/tests/test_sync_config_fallback.py b/tests/test_sync_config_fallback.py
diff --git a/tests/test_telemetry_logger.py b/tests/test_telemetry_logger.py
diff --git a/tests/test_ua_parse.py b/tests/test_ua_parse.py
