Stacktrace: Pass with_locals parameter. (getsentry#279)

kobybum · untitaker · commit d25fba854956 · 2019-03-05T10:37:49.000+01:00
* Stacktrace: Pass with_locals parameter.

* fix: Formatting
diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py
@@ -118,7 +118,7 @@ def _prepare_event(
             with capture_internal_exceptions():
                 event["threads"] = [
                     {
-                        "stacktrace": current_stacktrace(),
+                        "stacktrace": current_stacktrace(self.options["with_locals"]),
                         "crashed": False,
                         "current": True,
                     }
diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py
@@ -158,12 +158,13 @@ def _emit(self, record):
             return
 
         hint = None  # type: Optional[Dict[str, Any]]
+        client_options = hub.client.options
 
         # exc_info might be None or (None, None, None)
         if record.exc_info is not None and record.exc_info[0] is not None:
             event, hint = event_from_exception(
                 record.exc_info,
-                client_options=hub.client.options,
+                client_options=client_options,
                 mechanism={"type": "logging", "handled": True},
             )
         elif record.exc_info and record.exc_info[0] is None:
@@ -172,7 +173,7 @@ def _emit(self, record):
             with capture_internal_exceptions():
                 event["threads"] = [
                     {
-                        "stacktrace": current_stacktrace(),
+                        "stacktrace": current_stacktrace(client_options["with_locals"]),
                         "crashed": False,
                         "current": True,
                     }
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -143,6 +143,26 @@ def bar():
     assert functions[-2:] == ["foo", "bar"]
 
 
+def test_attach_stacktrace_enabled_no_locals():
+    events = []
+    hub = Hub(
+        Client(attach_stacktrace=True, with_locals=False, transport=events.append)
+    )
+
+    def foo():
+        bar()
+
+    def bar():
+        hub.capture_message("HI")
+
+    foo()
+
+    event, = events
+    thread, = event["threads"]
+    local_vars = [x.get("vars") for x in thread["stacktrace"]["frames"]]
+    assert local_vars[-2:] == [None, None]
+
+
 def test_attach_stacktrace_disabled():
     events = []
     hub = Hub(Client(attach_stacktrace=False, transport=events.append))

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ def _prepare_event(`
`118`	`118`	`with capture_internal_exceptions():`
`119`	`119`	`event["threads"] = [`
`120`	`120`	`{`
`121`		`- "stacktrace": current_stacktrace(),`
	`121`	`+ "stacktrace": current_stacktrace(self.options["with_locals"]),`
`122`	`122`	`"crashed": False,`
`123`	`123`	`"current": True,`
`124`	`124`	`}`