Add the stack option back to the Logging integration (getsentry#176)

jrideout · untitaker · commit cc81d01b0763 · 2018-11-27T16:46:22.000+01:00
* fix: Default to sixty seconds if no Retry-After is given

* fix: Skip py34
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
@@ -7,6 +7,7 @@
 from sentry_sdk.utils import (
     to_string,
     event_from_exception,
+    current_stacktrace,
     capture_internal_exceptions,
 )
 from sentry_sdk.integrations import Integration
@@ -145,6 +146,17 @@ def _emit(self, record):
                 client_options=hub.client.options,
                 mechanism={"type": "logging", "handled": True},
             )
+        elif record.exc_info and record.exc_info[0] is None:
+            event = {}
+            hint = None
+            with capture_internal_exceptions():
+                event["threads"] = [
+                    {
+                        "stacktrace": current_stacktrace(),
+                        "crashed": False,
+                        "current": True,
+                    }
+                ]
         else:
             event = {}
             hint = None
diff --git a/tests/integrations/logging/test_logging.py b/tests/integrations/logging/test_logging.py
@@ -1,3 +1,5 @@
+import sys
+
 import pytest
 import logging
 
@@ -36,6 +38,7 @@ def test_logging_defaults(integrations, sentry_init, capture_events):
     assert event["level"] == "fatal"
     assert any(crumb["message"] == "bread" for crumb in event["breadcrumbs"])
     assert not any(crumb["message"] == "LOL" for crumb in event["breadcrumbs"])
+    assert "threads" not in event
 
 
 def test_logging_extra_data(sentry_init, capture_events):
@@ -53,3 +56,20 @@ def test_logging_extra_data(sentry_init, capture_events):
         crumb["message"] == "bread" and crumb["data"] == {"foo": 42}
         for crumb in event["breadcrumbs"]
     )
+
+
+@pytest.mark.xfail(sys.version_info[:2] == (3, 4), reason="buggy logging module")
+def test_logging_stack(sentry_init, capture_events):
+    sentry_init(integrations=[LoggingIntegration()], default_integrations=False)
+    events = capture_events()
+
+    logger.error("first", exc_info=True)
+    logger.error("second")
+
+    event_with, event_without, = events
+
+    assert event_with["level"] == "error"
+    assert event_with["threads"][0]["stacktrace"]["frames"]
+
+    assert event_without["level"] == "error"
+    assert "threads" not in event_without
