fix: Django template frame in correct position, fix getsentry#281

untitaker · untitaker · commit 4cbc1cffc790 · 2019-03-05T22:26:12.000+01:00
diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py
@@ -157,10 +157,20 @@ def process_django_templates(event, hint):
             ):
                 frame = get_template_frame_from_exception(exc_value)
                 if frame is not None:
-                    frames = exception.setdefault("stacktrace", {}).setdefault(
-                        "frames", []
-                    )
-                    frames.append(frame)
+                    frames = exception.get("stacktrace", {}).get("frames", [])
+
+                    for i in reversed(range(len(frames))):
+                        f = frames[i]
+                        if (
+                            f.get("function") in ("parse", "render")
+                            and f.get("module") == "django.template.base"
+                        ):
+                            i += 1
+                            break
+                    else:
+                        i = len(frames)
+
+                    frames.insert(i, frame)
 
             return event
 
diff --git a/sentry_sdk/integrations/django/templates.py b/sentry_sdk/integrations/django/templates.py
@@ -64,6 +64,7 @@ def _get_template_frame_from_debug(debug):
         "pre_context": pre_context[-5:],
         "post_context": post_context[:5],
         "context_line": context_line,
+        "in_app": True,
     }
 
 
diff --git a/tests/integrations/django/test_basic.py b/tests/integrations/django/test_basic.py
@@ -334,3 +334,13 @@ def test_template_exception(sentry_init, client, capture_events):
     assert template_frame["lineno"] == 10
     assert template_frame["in_app"]
     assert template_frame["filename"].endswith("error.html")
+
+    filenames = [
+        (f.get("function"), f.get("module")) for f in exception["stacktrace"]["frames"]
+    ]
+    assert filenames[1] == (u"template_exc", u"tests.integrations.django.myapp.views")
+    assert filenames[-3:] == [
+        (u"parse", u"django.template.base"),
+        (None, None),
+        (u"invalid_block_tag", u"django.template.base"),
+    ]

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ def _get_template_frame_from_debug(debug):`
`64`	`64`	`"pre_context": pre_context[-5:],`
`65`	`65`	`"post_context": post_context[:5],`
`66`	`66`	`"context_line": context_line,`
	`67`	`+ "in_app": True,`
`67`	`68`	`}`
`68`	`69`
`69`	`70`