fix django middleware

Author: adriangb

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

@@ -53,6 +53,7 @@
     get_excluded_urls,
     get_traced_request_attrs,
     normalise_request_header_name,
+    normalise_response_header_name,
 )
 
 try:
@@ -111,7 +112,6 @@ def __call__(self, request):
     set_status_code = None
     _is_asgi_supported = False
 
-
 _logger = getLogger(__name__)
 _attributes_by_preference = [
     [
@@ -361,7 +361,7 @@ def process_response(self, request, response):
                             get_custom_headers(
                                 OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_RESPONSE
                             ),
-                            normalise_request_header_name,
+                            normalise_response_header_name,
                         )
                     )
                     for key, value in custom_res_attributes.items():

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

@@ -436,7 +436,14 @@ async def test_no_op_tracer_provider(self):
         self.assertEqual(len(spans), 0)
 
 
-
+@patch.dict(
+    "os.environ",
+    {
+        OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SANITIZE_FIELDS: ".*my-secret.*",
+        OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST: "Custom-Test-Header-1,Custom-Test-Header-2,Custom-Test-Header-3,Regex-Test-Header-.*,Regex-Invalid-Test-Header-.*,.*my-secret.*",
+        OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_RESPONSE: "Custom-Test-Header-1,Custom-Test-Header-2,Custom-Test-Header-3,my-custom-regex-header-.*,invalid-regex-header-.*,.*my-secret.*",
+    },
+)
 class TestMiddlewareAsgiWithCustomHeaders(SimpleTestCase, TestBase):
     @classmethod
     def setUpClass(cls):
@@ -461,14 +468,6 @@ def tearDownClass(cls):
         super().tearDownClass()
         conf.settings = conf.LazySettings()
 
-    @patch.dict(
-        "os.environ",
-        {
-            OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SANITIZE_FIELDS: ".*my-secret.*",
-            OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST: "Custom-Test-Header-1,Custom-Test-Header-2,Custom-Test-Header-3,Regex-Test-Header-.*,Regex-Invalid-Test-Header-.*,.*my-secret.*",
-            OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_RESPONSE: "Custom-Test-Header-1,Custom-Test-Header-2,Custom-Test-Header-3,my-custom-regex-header-.*,invalid-regex-header-.*,.*my-secret.*",
-        },
-    )
     async def test_http_custom_request_headers_in_span_attributes(self):
         expected = {
             "http.request.header.custom_test_header_1": (