fix(django): Send correct "url" transaction source if Django resolver fails to resolve (#1525)

Author: sl0thentr0py

sentry_sdk/integrations/django/__init__.py

@@ -9,7 +9,7 @@
 from sentry_sdk.hub import Hub, _should_send_default_pii
 from sentry_sdk.scope import add_global_event_processor
 from sentry_sdk.serializer import add_global_repr_processor
-from sentry_sdk.tracing import SOURCE_FOR_STYLE
+from sentry_sdk.tracing import SOURCE_FOR_STYLE, TRANSACTION_SOURCE_URL
 from sentry_sdk.tracing_utils import record_sql_queries
 from sentry_sdk.utils import (
     HAS_REAL_CONTEXTVARS,
@@ -323,12 +323,10 @@ def _patch_django_asgi_handler():
 def _set_transaction_name_and_source(scope, transaction_style, request):
     # type: (Scope, str, WSGIRequest) -> None
     try:
-        transaction_name = ""
+        transaction_name = None
         if transaction_style == "function_name":
             fn = resolve(request.path).func
-            transaction_name = (
-                transaction_from_function(getattr(fn, "view_class", fn)) or ""
-            )
+            transaction_name = transaction_from_function(getattr(fn, "view_class", fn))
 
         elif transaction_style == "url":
             if hasattr(request, "urlconf"):
@@ -338,9 +336,15 @@ def _set_transaction_name_and_source(scope, transaction_style, request):
             else:
                 transaction_name = LEGACY_RESOLVER.resolve(request.path_info)
 
+        if transaction_name is None:
+            transaction_name = request.path_info
+            source = TRANSACTION_SOURCE_URL
+        else:
+            source = SOURCE_FOR_STYLE[transaction_style]
+
         scope.set_transaction_name(
             transaction_name,
-            source=SOURCE_FOR_STYLE[transaction_style],
+            source=source,
         )
     except Exception:
         pass

sentry_sdk/integrations/django/transactions.py

@@ -127,10 +127,10 @@ def resolve(
         path,  # type: str
         urlconf=None,  # type: Union[None, Tuple[URLPattern, URLPattern, URLResolver], Tuple[URLPattern]]
     ):
-        # type: (...) -> str
+        # type: (...) -> Optional[str]
         resolver = get_resolver(urlconf)
         match = self._resolve(resolver, path)
-        return match or path
+        return match
 
 
 LEGACY_RESOLVER = RavenResolver()

tests/integrations/django/test_basic.py

@@ -469,27 +469,36 @@ def test_django_connect_breadcrumbs(
 
 
 @pytest.mark.parametrize(
-    "transaction_style,expected_transaction,expected_source",
+    "transaction_style,client_url,expected_transaction,expected_source,expected_response",
     [
-        ("function_name", "tests.integrations.django.myapp.views.message", "component"),
-        ("url", "/message", "route"),
+        (
+            "function_name",
+            "/message",
+            "tests.integrations.django.myapp.views.message",
+            "component",
+            b"ok",
+        ),
+        ("url", "/message", "/message", "route", b"ok"),
+        ("url", "/404", "/404", "url", b"404"),
     ],
 )
 def test_transaction_style(
     sentry_init,
     client,
     capture_events,
     transaction_style,
+    client_url,
     expected_transaction,
     expected_source,
+    expected_response,
 ):
     sentry_init(
         integrations=[DjangoIntegration(transaction_style=transaction_style)],
         send_default_pii=True,
     )
     events = capture_events()
-    content, status, headers = client.get(reverse("message"))
-    assert b"".join(content) == b"ok"
+    content, status, headers = client.get(client_url)
+    assert b"".join(content) == expected_response
 
     (event,) = events
     assert event["transaction"] == expected_transaction

tests/integrations/django/test_transactions.py

@@ -30,7 +30,7 @@
 def test_legacy_resolver_no_match():
     resolver = RavenResolver()
     result = resolver.resolve("/foo/bar", example_url_conf)
-    assert result == "/foo/bar"
+    assert result is None
 
 
 def test_legacy_resolver_complex_match():