fix: Fix infinite loop in transport (getsentry#656)

untitaker · web-flow · commit 44346360312f · 2020-03-25T13:39:16.000+01:00
Fix getsentry#655
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
@@ -24,7 +24,13 @@
 DEFAULT_LEVEL = logging.INFO
 DEFAULT_EVENT_LEVEL = logging.ERROR
 
-_IGNORED_LOGGERS = set(["sentry_sdk.errors"])
+# Capturing events from those loggers causes recursion errors. We cannot allow
+# the user to unconditionally create events from those loggers under any
+# circumstances.
+#
+# Note: Ignoring by logger name here is better than mucking with thread-locals.
+# We do not necessarily know whether thread-locals work 100% correctly in the user's environment.
+_IGNORED_LOGGERS = set(["sentry_sdk.errors", "urllib3.connectionpool"])
 
 
 def ignore_logger(
diff --git a/tests/test_transport.py b/tests/test_transport.py
@@ -8,6 +8,7 @@
 
 from sentry_sdk import Hub, Client, add_breadcrumb, capture_message
 from sentry_sdk.transport import _parse_rate_limits
+from sentry_sdk.integrations.logging import LoggingIntegration
 
 
 @pytest.fixture(params=[True, False])
@@ -57,6 +58,23 @@ def test_transport_works(
     assert any("Sending event" in record.msg for record in caplog.records) == debug
 
 
+def test_transport_infinite_loop(httpserver, request):
+    httpserver.serve_content("ok", 200)
+
+    client = Client(
+        "http://foobar@{}/123".format(httpserver.url[len("http://") :]),
+        debug=True,
+        # Make sure we cannot create events from our own logging
+        integrations=[LoggingIntegration(event_level=logging.DEBUG)],
+    )
+
+    with Hub(client):
+        capture_message("hi")
+        client.flush()
+
+    assert len(httpserver.requests) == 1
+
+
 NOW = datetime(2014, 6, 2)
 
 
