Skip to content

Commit 370c656

Browse files
committed
make django1 compliant with specification
1 parent 1513461 commit 370c656

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

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

+6-16
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def test_templated_route_get(self):
152152
span.name,
153153
"GET ^route/(?P<year>[0-9]{4})/template/$"
154154
if DJANGO_2_2
155-
else "tests.views.traced_template",
155+
else "GET",
156156
)
157157
self.assertEqual(span.kind, SpanKind.SERVER)
158158
self.assertEqual(span.status.status_code, StatusCode.UNSET)
@@ -177,9 +177,7 @@ def test_traced_get(self):
177177

178178
span = spans[0]
179179

180-
self.assertEqual(
181-
span.name, "GET ^traced/" if DJANGO_2_2 else "tests.views.traced"
182-
)
180+
self.assertEqual(span.name, "GET ^traced/" if DJANGO_2_2 else "GET")
183181
self.assertEqual(span.kind, SpanKind.SERVER)
184182
self.assertEqual(span.status.status_code, StatusCode.UNSET)
185183
self.assertEqual(span.attributes[SpanAttributes.HTTP_METHOD], "GET")
@@ -215,9 +213,7 @@ def test_traced_post(self):
215213

216214
span = spans[0]
217215

218-
self.assertEqual(
219-
span.name, "POST ^traced/" if DJANGO_2_2 else "tests.views.traced"
220-
)
216+
self.assertEqual(span.name, "POST ^traced/" if DJANGO_2_2 else "GET")
221217
self.assertEqual(span.kind, SpanKind.SERVER)
222218
self.assertEqual(span.status.status_code, StatusCode.UNSET)
223219
self.assertEqual(span.attributes[SpanAttributes.HTTP_METHOD], "POST")
@@ -241,9 +237,7 @@ def test_error(self):
241237

242238
span = spans[0]
243239

244-
self.assertEqual(
245-
span.name, "GET ^error/" if DJANGO_2_2 else "tests.views.error"
246-
)
240+
self.assertEqual(span.name, "GET ^error/" if DJANGO_2_2 else "GET")
247241
self.assertEqual(span.kind, SpanKind.SERVER)
248242
self.assertEqual(span.status.status_code, StatusCode.ERROR)
249243
self.assertEqual(span.attributes[SpanAttributes.HTTP_METHOD], "GET")
@@ -307,9 +301,7 @@ def test_span_name(self):
307301
span = span_list[0]
308302
self.assertEqual(
309303
span.name,
310-
"GET ^span_name/([0-9]{4})/$"
311-
if DJANGO_2_2
312-
else "tests.views.route_span_name",
304+
"GET ^span_name/([0-9]{4})/$" if DJANGO_2_2 else "GET",
313305
)
314306

315307
def test_span_name_for_query_string(self):
@@ -323,9 +315,7 @@ def test_span_name_for_query_string(self):
323315
span = span_list[0]
324316
self.assertEqual(
325317
span.name,
326-
"GET ^span_name/([0-9]{4})/$"
327-
if DJANGO_2_2
328-
else "tests.views.route_span_name",
318+
"GET ^span_name/([0-9]{4})/$" if DJANGO_2_2 else "GET",
329319
)
330320

331321
def test_span_name_404(self):

0 commit comments

Comments
 (0)