Skip to content

Commit 0ea524b

Browse files
committedJun 21, 2023
re-add a name fallback
This was removed in open-telemetry#1759.
1 parent db85f97 commit 0ea524b

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed
 

‎instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware/otel_middleware.py

+3
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,9 @@ def _get_span_name(request):
174174

175175
if hasattr(match, "route") and match.route:
176176
return f"{request.method} {match.route}"
177+
178+
if hasattr(match, "url_name") and match.url_name:
179+
return f"{request.method} {match.url_name}"
177180

178181
return request.method
179182

‎instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,10 @@
7878
from django.urls import path
7979
else:
8080
from django.conf.urls import url as re_path
81+
8182
def path(p, *args, **kwargs):
82-
return re_path(r"^%s$" % p, *args, **kwargs)
83+
return re_path(r"^%s$" % p, *args, **kwargs)
84+
8385

8486
urlpatterns = [
8587
re_path(r"^traced/", traced),
@@ -217,7 +219,7 @@ def test_empty_path(self):
217219

218220
span = spans[0]
219221

220-
self.assertEqual(span.name, "empty")
222+
self.assertEqual(span.name, "GET empty")
221223

222224
def test_traced_post(self):
223225
Client().post("/traced/")

0 commit comments

Comments
 (0)