test oroborous

Author: colin-sentry

sentry_sdk/client.py

@@ -892,7 +892,6 @@ def _capture_experimental_log(self, scope, log):
                 "error": logging.ERROR,
                 "fatal": logging.CRITICAL,
             }
-            # Be careful editing this line, you can add infinite logging loops with the logger integration
             logger.log(
                 severity_text_to_logging_level.get(log["severity_text"], logging.DEBUG),
                 f'[Sentry Logs] {log["body"]}',

sentry_sdk/integrations/logging.py

@@ -345,9 +345,6 @@ def emit(self, record):
             if not client.options["_experiments"].get("enable_sentry_logs", False):
                 return
 
-            if record.msg.startswith("[Sentry Logs]"):
-                return  # avoid infinite loop when debug is true
-
             SentryLogsHandler._capture_log_from_record(client, record)
 
     @staticmethod

tests/test_logs.py

@@ -6,7 +6,7 @@
 
 import sentry_sdk
 from sentry_sdk import _experimental_logger as sentry_logger
-
+from sentry_sdk.integrations.logging import LoggingIntegration
 
 minimum_python_37 = pytest.mark.skipif(
     sys.version_info < (3, 7), reason="Asyncio tests need Python >= 3.7"
@@ -263,3 +263,21 @@ def test_logger_integration_debug(sentry_init, capture_envelopes):
     python_logger.debug("this is %s a template %s", "1", "2")
 
     assert len(envelopes) == 0
+
+
+@minimum_python_37
+def test_no_log_infinite_loop(sentry_init, capture_envelopes):
+    """
+    If 'debug' mode is true, and you set a low log level in the logging integration, there should be no infinite loops.
+    """
+    sentry_init(
+        _experiments={"enable_sentry_logs": True},
+        integrations=[LoggingIntegration(level=logging.DEBUG)],
+        debug=True,
+    )
+    envelopes = capture_envelopes()
+
+    python_logger = logging.Logger("test-logger")
+    python_logger.debug("this is %s a template %s", "1", "2")
+
+    assert len(envelopes) == 1