Addressed feedback

Author: rads-1996

CHANGELOG.md

@@ -27,7 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3673](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3673))
 - `opentelemetry-instrumentation-starlette`/`opentelemetry-instrumentation-fastapi`: Fixes a crash when host-based routing is used
   ([#3507](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3507))
-- `opentelemetry-instrumentation-fastapi`: Fixes issue [#2808](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2808)
+- `opentelemetry-instrumentation-django`: Fixes invalid type at WSGI request headers and attributes collection.
   ([#3731](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3731))
 - Fix documentation order of sections and headers for Django, Flask, MySQL, mysqlclient, psycopg, psycopg2, pymysql, sqlalchemy instrumentations.
   ([#3719](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3719))

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

@@ -20,6 +20,7 @@
 
 from django import VERSION as django_version
 from django.http import HttpRequest, HttpResponse
+from django.core.handlers.wsgi import WSGIRequest
 
 from opentelemetry.context import detach
 from opentelemetry.instrumentation._semconv import (
@@ -166,19 +167,16 @@ class _DjangoMiddleware(MiddlewareMixin):
     )
 
     @staticmethod
-    def _format_request_objects_in_headers(attributes):
+    def format_request_objects_in_headers(attributes):
         for key, value_list in list(attributes.items()):
             new_values = []
             for value in value_list:
                 if hasattr(value, "__class__"):
-                    if value.__class__.__name__ in (
-                        "HttpRequest",
-                        "WSGIRequest",
-                    ):
+                    if isinstance(value, (HttpRequest, WSGIRequest)):
                         try:
                             method = getattr(value, "method", "UNKNOWN")
-                            path = getattr(value, "path", "UNKNOWN")
-                            new_values.append(f"HttpRequest({method} {path})")
+                            request_path = getattr(value, "path", "UNKNOWN")
+                            new_values.append(f"HttpRequest({method} {request_path})")
                         except (AttributeError, ValueError, TypeError):
                             new_values.append("HttpRequest(...)")
                     else:
@@ -301,7 +299,7 @@ def process_request(self, request):
                     )
                     # Process custom attributes to handle WSGIRequest objects
                     custom_attributes = (
-                        self._format_request_objects_in_headers(
+                        self.format_request_objects_in_headers(
                             custom_attributes
                         )
                     )

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

@@ -1020,31 +1020,6 @@ def tearDownClass(cls):
         super().tearDownClass()
         conf.settings = conf.LazySettings()
 
-    @staticmethod
-    def _format_request_objects_in_headers(attributes):
-        for key, value_list in list(attributes.items()):
-            new_values = []
-            for value in value_list:
-                if hasattr(value, "__class__"):
-                    if value.__class__.__name__ in (
-                        "HttpRequest",
-                        "WSGIRequest",
-                    ):
-                        try:
-                            method = getattr(value, "method", "UNKNOWN")
-                            request_path = getattr(value, "path", "UNKNOWN")
-                            new_values.append(
-                                f"HttpRequest({method} {request_path})"
-                            )
-                        except (AttributeError, ValueError, TypeError):
-                            new_values.append("HttpRequest(...)")
-                    else:
-                        new_values.append(value)
-                else:
-                    new_values.append(value)
-            attributes[key] = new_values
-        return attributes
-
     def test_wsgi_request_in_header_is_properly_formatted(self):
         mock_wsgi_request = Mock(spec=WSGIRequest)
         mock_wsgi_request.method = "GET"
@@ -1060,7 +1035,7 @@ def test_wsgi_request_in_header_is_properly_formatted(self):
             ]
         }
 
-        formatted_attributes = TestMiddlewareWsgiWithCustomHeaders._format_request_objects_in_headers(
+        formatted_attributes =_DjangoMiddleware.format_request_objects_in_headers(
             input_attributes
         )
 
@@ -1081,7 +1056,7 @@ def test_wsgi_request_handles_extraction_error(self):
             "http.request.header.test_wsgirequest_header": ["HttpRequest(...)"]
         }
 
-        formatted_attributes = TestMiddlewareWsgiWithCustomHeaders._format_request_objects_in_headers(
+        formatted_attributes = _DjangoMiddleware.format_request_objects_in_headers(
             input_attributes
         )
 
@@ -1102,7 +1077,7 @@ def test_handles_http_request_as_well(self):
             ]
         }
 
-        formatted_attributes = TestMiddlewareWsgiWithCustomHeaders._format_request_objects_in_headers(
+        formatted_attributes = _DjangoMiddleware.format_request_objects_in_headers(
             input_attributes
         )
 
@@ -1125,7 +1100,7 @@ def test_regular_header_values_are_preserved(self):
             "http.request.header.test_regular_header": ["regular-value"],
         }
 
-        formatted_attributes = TestMiddlewareWsgiWithCustomHeaders._format_request_objects_in_headers(
+        formatted_attributes = _DjangoMiddleware.format_request_objects_in_headers(
             input_attributes
         )