lint

instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/__init__.py

@@ -353,8 +353,8 @@ def _instrument(self, **kwargs):
                 description="Duration of HTTP server requests.",
                 unit="s",
             )
-        _DjangoMiddleware._active_request_counter = create_http_server_active_requests(
-            meter
+        _DjangoMiddleware._active_request_counter = (
+            create_http_server_active_requests(meter)
         )
         # This can not be solved, but is an inherent problem of this approach:
         # the order of middleware entries matters, and here you have no control

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

@@ -172,9 +172,9 @@ class _DjangoMiddleware(MiddlewareMixin):
     _sem_conv_opt_in_mode = _HTTPStabilityMode.DEFAULT
 
     _otel_request_hook: Callable[[Span, HttpRequest], None] = None
-    _otel_response_hook: Callable[[Span, HttpRequest, HttpResponse], None] = (
-        None
-    )
+    _otel_response_hook: Callable[
+        [Span, HttpRequest, HttpResponse], None
+    ] = None
 
     @staticmethod
     def _get_span_name(request):
@@ -245,9 +245,9 @@ def process_request(self, request):
             self._sem_conv_opt_in_mode,
         )
 
-        request.META[self._environ_active_request_attr_key] = (
-            active_requests_count_attrs
-        )
+        request.META[
+            self._environ_active_request_attr_key
+        ] = active_requests_count_attrs
         # Pass all of attributes to duration key because we will filter during response
         request.META[self._environ_duration_attr_key] = attributes
         self._active_request_counter.add(1, active_requests_count_attrs)
@@ -459,6 +459,7 @@ def process_response(self, request, response):
 
         return response
 
+
 def _parse_duration_attrs(
     req_attrs, sem_conv_opt_in_mode=_HTTPStabilityMode.DEFAULT
 ):

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

@@ -253,9 +253,7 @@ def test_traced_get_new_semconv(self):
         self.assertEqual(span.attributes[CLIENT_ADDRESS], "127.0.0.1")
         self.assertEqual(span.attributes[NETWORK_PROTOCOL_VERSION], "1.1")
         if DJANGO_2_2:
-            self.assertEqual(
-                span.attributes[HTTP_ROUTE], "^traced/"
-            )
+            self.assertEqual(span.attributes[HTTP_ROUTE], "^traced/")
         self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 200)
 
     def test_traced_get_both_semconv(self):
@@ -286,9 +284,7 @@ def test_traced_get_both_semconv(self):
         self.assertEqual(span.attributes[CLIENT_ADDRESS], "127.0.0.1")
         self.assertEqual(span.attributes[NETWORK_PROTOCOL_VERSION], "1.1")
         if DJANGO_2_2:
-            self.assertEqual(
-                span.attributes[HTTP_ROUTE], "^traced/"
-            )
+            self.assertEqual(span.attributes[HTTP_ROUTE], "^traced/")
         self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 200)
 
     def test_not_recording(self):
@@ -354,9 +350,7 @@ def test_traced_post_new_semconv(self):
         self.assertEqual(span.attributes[CLIENT_ADDRESS], "127.0.0.1")
         self.assertEqual(span.attributes[NETWORK_PROTOCOL_VERSION], "1.1")
         if DJANGO_2_2:
-            self.assertEqual(
-                span.attributes[HTTP_ROUTE], "^traced/"
-            )
+            self.assertEqual(span.attributes[HTTP_ROUTE], "^traced/")
         self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 200)
 
     def test_traced_post_both_semconv(self):
@@ -383,9 +377,7 @@ def test_traced_post_both_semconv(self):
         self.assertEqual(span.attributes[CLIENT_ADDRESS], "127.0.0.1")
         self.assertEqual(span.attributes[NETWORK_PROTOCOL_VERSION], "1.1")
         if DJANGO_2_2:
-            self.assertEqual(
-                span.attributes[HTTP_ROUTE], "^traced/"
-            )
+            self.assertEqual(span.attributes[HTTP_ROUTE], "^traced/")
         self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 200)
 
     def test_error(self):
@@ -436,21 +428,15 @@ def test_error_new_semconv(self):
         self.assertEqual(span.status.status_code, StatusCode.ERROR)
         self.assertEqual(span.attributes[HTTP_REQUEST_METHOD], "GET")
         if DJANGO_2_2:
-            self.assertEqual(
-                span.attributes[HTTP_ROUTE], "^error/"
-            )
+            self.assertEqual(span.attributes[HTTP_ROUTE], "^error/")
         self.assertEqual(span.attributes[URL_SCHEME], "http")
         self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 500)
 
         self.assertEqual(len(span.events), 1)
         event = span.events[0]
         self.assertEqual(event.name, "exception")
-        self.assertEqual(
-            event.attributes[EXCEPTION_TYPE], "ValueError"
-        )
-        self.assertEqual(
-            event.attributes[EXCEPTION_MESSAGE], "error"
-        )
+        self.assertEqual(event.attributes[EXCEPTION_TYPE], "ValueError")
+        self.assertEqual(event.attributes[EXCEPTION_MESSAGE], "error")
 
     def test_error_both_semconv(self):
         with self.assertRaises(ValueError):
@@ -477,21 +463,15 @@ def test_error_both_semconv(self):
         self.assertEqual(span.attributes[SpanAttributes.HTTP_STATUS_CODE], 500)
         self.assertEqual(span.attributes[HTTP_REQUEST_METHOD], "GET")
         if DJANGO_2_2:
-            self.assertEqual(
-                span.attributes[HTTP_ROUTE], "^error/"
-            )
+            self.assertEqual(span.attributes[HTTP_ROUTE], "^error/")
         self.assertEqual(span.attributes[URL_SCHEME], "http")
         self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 500)
 
         self.assertEqual(len(span.events), 1)
         event = span.events[0]
         self.assertEqual(event.name, "exception")
-        self.assertEqual(
-            event.attributes[EXCEPTION_TYPE], "ValueError"
-        )
-        self.assertEqual(
-            event.attributes[EXCEPTION_MESSAGE], "error"
-        )
+        self.assertEqual(event.attributes[EXCEPTION_TYPE], "ValueError")
+        self.assertEqual(event.attributes[EXCEPTION_MESSAGE], "error")
 
     def test_exclude_lists(self):
         client = Client()
@@ -558,7 +538,9 @@ def test_span_name_404(self):
         self.assertEqual(span.name, "GET")
 
     def test_nonstandard_http_method_span_name(self):
-        Client().request(REQUEST_METHOD="NONSTANDARD", PATH_INFO="/span_name/1234/")
+        Client().request(
+            REQUEST_METHOD="NONSTANDARD", PATH_INFO="/span_name/1234/"
+        )
         span_list = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(span_list), 1)
 

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

@@ -276,9 +276,7 @@ async def test_traced_get_new_semconv(self):
         self.assertEqual(span.attributes[SERVER_PORT], 80)
         self.assertEqual(span.attributes[CLIENT_ADDRESS], "127.0.0.1")
         self.assertEqual(span.attributes[NETWORK_PROTOCOL_VERSION], "1.1")
-        self.assertEqual(
-            span.attributes[HTTP_ROUTE], "^traced/"
-        )
+        self.assertEqual(span.attributes[HTTP_ROUTE], "^traced/")
         self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 200)
 
     async def test_traced_get_both_semconv(self):
@@ -304,9 +302,7 @@ async def test_traced_get_both_semconv(self):
         self.assertEqual(span.attributes[SERVER_PORT], 80)
         self.assertEqual(span.attributes[CLIENT_ADDRESS], "127.0.0.1")
         self.assertEqual(span.attributes[NETWORK_PROTOCOL_VERSION], "1.1")
-        self.assertEqual(
-            span.attributes[HTTP_ROUTE], "^traced/"
-        )
+        self.assertEqual(span.attributes[HTTP_ROUTE], "^traced/")
         self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 200)
 
     async def test_not_recording(self):
@@ -360,10 +356,8 @@ async def test_traced_post_new_semconv(self):
         self.assertEqual(span.attributes[SERVER_PORT], 80)
         self.assertEqual(span.attributes[CLIENT_ADDRESS], "127.0.0.1")
         self.assertEqual(span.attributes[NETWORK_PROTOCOL_VERSION], "1.1")
-        self.assertEqual(
-            span.attributes[HTTP_ROUTE], "^traced/"
-        )
-        self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 200)   
+        self.assertEqual(span.attributes[HTTP_ROUTE], "^traced/")
+        self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 200)
 
     async def test_traced_post_both_semconv(self):
         await self.async_client.post("/traced/")
@@ -388,10 +382,8 @@ async def test_traced_post_both_semconv(self):
         self.assertEqual(span.attributes[SERVER_PORT], 80)
         self.assertEqual(span.attributes[CLIENT_ADDRESS], "127.0.0.1")
         self.assertEqual(span.attributes[NETWORK_PROTOCOL_VERSION], "1.1")
-        self.assertEqual(
-            span.attributes[HTTP_ROUTE], "^traced/"
-        )
-        self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 200)  
+        self.assertEqual(span.attributes[HTTP_ROUTE], "^traced/")
+        self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 200)
 
     async def test_error(self):
         with self.assertRaises(ValueError):
@@ -423,7 +415,7 @@ async def test_error(self):
         self.assertEqual(
             event.attributes[SpanAttributes.EXCEPTION_MESSAGE], "error"
         )
-    
+
     async def test_error_new_semconv(self):
         with self.assertRaises(ValueError):
             await self.async_client.get("/error/")
@@ -437,21 +429,15 @@ async def test_error_new_semconv(self):
         self.assertEqual(span.kind, SpanKind.SERVER)
         self.assertEqual(span.status.status_code, StatusCode.ERROR)
         self.assertEqual(span.attributes[HTTP_REQUEST_METHOD], "GET")
-        self.assertEqual(
-            span.attributes[HTTP_ROUTE], "^error/"
-        )
+        self.assertEqual(span.attributes[HTTP_ROUTE], "^error/")
         self.assertEqual(span.attributes[URL_SCHEME], "http")
         self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 500)
 
         self.assertEqual(len(span.events), 1)
         event = span.events[0]
         self.assertEqual(event.name, "exception")
-        self.assertEqual(
-            event.attributes[EXCEPTION_TYPE], "ValueError"
-        )
-        self.assertEqual(
-            event.attributes[EXCEPTION_MESSAGE], "error"
-        )
+        self.assertEqual(event.attributes[EXCEPTION_TYPE], "ValueError")
+        self.assertEqual(event.attributes[EXCEPTION_MESSAGE], "error")
 
     async def test_error_both_semconv(self):
         with self.assertRaises(ValueError):
@@ -470,27 +456,19 @@ async def test_error_both_semconv(self):
             span.attributes[SpanAttributes.HTTP_URL],
             "http://127.0.0.1/error/",
         )
-        self.assertEqual(
-            span.attributes[SpanAttributes.HTTP_ROUTE], "^error/"
-        )
+        self.assertEqual(span.attributes[SpanAttributes.HTTP_ROUTE], "^error/")
         self.assertEqual(span.attributes[SpanAttributes.HTTP_SCHEME], "http")
         self.assertEqual(span.attributes[SpanAttributes.HTTP_STATUS_CODE], 500)
         self.assertEqual(span.attributes[HTTP_REQUEST_METHOD], "GET")
-        self.assertEqual(
-            span.attributes[HTTP_ROUTE], "^error/"
-        )
+        self.assertEqual(span.attributes[HTTP_ROUTE], "^error/")
         self.assertEqual(span.attributes[URL_SCHEME], "http")
         self.assertEqual(span.attributes[HTTP_RESPONSE_STATUS_CODE], 500)
 
         self.assertEqual(len(span.events), 1)
         event = span.events[0]
         self.assertEqual(event.name, "exception")
-        self.assertEqual(
-            event.attributes[EXCEPTION_TYPE], "ValueError"
-        )
-        self.assertEqual(
-            event.attributes[EXCEPTION_MESSAGE], "error"
-        )
+        self.assertEqual(event.attributes[EXCEPTION_TYPE], "ValueError")
+        self.assertEqual(event.attributes[EXCEPTION_MESSAGE], "error")
 
     async def test_exclude_lists(self):
         await self.async_client.get("/excluded_arg/123")
@@ -538,7 +516,9 @@ async def test_span_name_404(self):
         self.assertEqual(span.name, "GET")
 
     async def test_nonstandard_http_method_span_name(self):
-        await self.async_client.request(method="NONSTANDARD", path="/span_name/1234/")
+        await self.async_client.request(
+            method="NONSTANDARD", path="/span_name/1234/"
+        )
         span_list = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(span_list), 1)
 

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

@@ -35,12 +35,12 @@ def response_with_custom_header(request):
     response = HttpResponse()
     response["custom-test-header-1"] = "test-header-value-1"
     response["custom-test-header-2"] = "test-header-value-2"
-    response["my-custom-regex-header-1"] = (
-        "my-custom-regex-value-1,my-custom-regex-value-2"
-    )
-    response["my-custom-regex-header-2"] = (
-        "my-custom-regex-value-3,my-custom-regex-value-4"
-    )
+    response[
+        "my-custom-regex-header-1"
+    ] = "my-custom-regex-value-1,my-custom-regex-value-2"
+    response[
+        "my-custom-regex-header-2"
+    ] = "my-custom-regex-value-3,my-custom-regex-value-4"
     response["my-secret-header"] = "my-secret-value"
     return response