Update tests

Author: rads-1996

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

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import types
 import logging
+import types
 from logging import getLogger
 from time import time
 from timeit import default_timer
@@ -138,8 +138,10 @@ def filter(self, record: logging.LogRecord) -> bool:
         record.request = str(request)
         return True
 
-_wsgi_logger = logging.getLogger("django.request")
-_wsgi_logger.addFilter(RequestFilter())
+
+_wsgi_request_logger = logging.getLogger("django.request")
+_wsgi_request_logger.addFilter(RequestFilter())
+
 
 def _is_asgi_request(request: HttpRequest) -> bool:
     return ASGIRequest is not None and isinstance(request, ASGIRequest)
@@ -174,14 +176,6 @@ class _DjangoMiddleware(MiddlewareMixin):
     _otel_response_hook: Callable[[Span, HttpRequest, HttpResponse], None] = (
         None
     )
-    
-    @staticmethod
-    def format_request_objects_in_headers(attributes):
-        for _, value_list in attributes.items():
-            for index, value in enumerate(value_list):
-                if isinstance(value, HttpRequest):
-                    value_list[index] = str(value)
-        return attributes
 
     @staticmethod
     def _get_span_name(request):
@@ -294,10 +288,6 @@ def process_request(self, request):
                     custom_attributes = (
                         wsgi_collect_custom_request_headers_attributes(carrier)
                     )
-                    # Process custom attributes to handle WSGIRequest objects
-                    custom_attributes = self.format_request_objects_in_headers(
-                        custom_attributes
-                    )
 
                     if len(custom_attributes) > 0:
                         span.set_attributes(custom_attributes)

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

@@ -15,12 +15,13 @@
 # pylint: disable=E0611
 # pylint: disable=too-many-lines
 
+import logging
 from sys import modules
 from timeit import default_timer
+from unittest import TestCase
 from unittest.mock import Mock, patch
 
 from django import VERSION, conf
-from django.core.handlers.wsgi import WSGIRequest
 from django.http import HttpRequest, HttpResponse
 from django.test.client import Client
 from django.test.utils import setup_test_environment, teardown_test_environment
@@ -36,6 +37,9 @@
     DjangoInstrumentor,
     _DjangoMiddleware,
 )
+from opentelemetry.instrumentation.django.middleware.otel_middleware import (
+    RequestFilter,
+)
 from opentelemetry.instrumentation.propagators import (
     TraceResponsePropagator,
     set_global_response_propagator,
@@ -101,6 +105,53 @@ def path(path_argument, *args, **kwargs):
 _django_instrumentor = DjangoInstrumentor()
 
 
+# pylint: disable=too-many-public-methods
+class TestRequestFilter(TestCase):
+    def test_converts_http_request_to_string(self):
+        class DummyRequest:
+            def __str__(self):
+                return "<DummyRequest method=GET path=/example/>"
+
+        request = DummyRequest()
+
+        record = logging.LogRecord(
+            name="django.request",
+            level=logging.ERROR,
+            pathname=__file__,
+            lineno=0,
+            msg="test message",
+            args=(),
+            exc_info=None,
+        )
+        record.request = request
+
+        expected_repr = str(request)
+
+        request_filter = RequestFilter()
+        result = request_filter.filter(record)
+
+        self.assertTrue(result)
+        self.assertEqual(record.request, expected_repr)
+        self.assertIsInstance(record.request, str)
+
+    def test_handles_missing_request_attribute(self):
+        record = logging.LogRecord(
+            name="django.request",
+            level=logging.INFO,
+            pathname=__file__,
+            lineno=0,
+            msg="no request",
+            args=(),
+            exc_info=None,
+        )
+
+        request_filter = RequestFilter()
+        result = request_filter.filter(record)
+
+        self.assertTrue(result)
+        self.assertEqual(record.request, "None")
+
+
 # pylint: disable=too-many-public-methods
 class TestMiddleware(WsgiTestBase):
     @classmethod
@@ -1020,102 +1071,6 @@ def tearDownClass(cls):
         super().tearDownClass()
         conf.settings = conf.LazySettings()
 
-    def test_wsgi_request_in_header_is_properly_formatted(self):
-        mock_wsgi_request = Mock(spec=WSGIRequest)
-        mock_wsgi_request.method = "GET"
-        mock_wsgi_request.path = "/test/path"
-        mock_wsgi_request.__class__.__name__ = "WSGIRequest"
-
-        input_attributes = {
-            "http.request.header.test_wsgirequest_header": [mock_wsgi_request]
-        }
-        expected_attributes = {
-            "http.request.header.test_wsgirequest_header": [
-                str(mock_wsgi_request)
-            ]
-        }
-
-        formatted_attributes = (
-            _DjangoMiddleware.format_request_objects_in_headers(
-                input_attributes
-            )
-        )
-
-        self.assertEqual(formatted_attributes, expected_attributes)
-
-    def test_wsgi_request_handles_extraction_error(self):
-        mock_wsgi_request = Mock(spec=WSGIRequest)
-        mock_wsgi_request.__class__.__name__ = "WSGIRequest"
-
-        type(mock_wsgi_request).method = property(
-            lambda self: (_ for _ in ()).throw(ValueError("Test error"))
-        )
-
-        input_attributes = {
-            "http.request.header.test_wsgirequest_header": [mock_wsgi_request]
-        }
-        expected_attributes = {
-            "http.request.header.test_wsgirequest_header": [
-                str(mock_wsgi_request)
-            ]
-        }
-
-        formatted_attributes = (
-            _DjangoMiddleware.format_request_objects_in_headers(
-                input_attributes
-            )
-        )
-
-        self.assertEqual(formatted_attributes, expected_attributes)
-
-    def test_handles_http_request_as_well(self):
-        mock_http_request = Mock(spec=HttpRequest)
-        mock_http_request.method = "POST"
-        mock_http_request.path = "/api/data"
-        mock_http_request.__class__.__name__ = "HttpRequest"
-
-        input_attributes = {
-            "http.request.header.test_httprequest_header": [mock_http_request]
-        }
-        expected_attributes = {
-            "http.request.header.test_httprequest_header": [
-                str(mock_http_request)
-            ]
-        }
-
-        formatted_attributes = (
-            _DjangoMiddleware.format_request_objects_in_headers(
-                input_attributes
-            )
-        )
-
-        self.assertEqual(formatted_attributes, expected_attributes)
-
-    def test_regular_header_values_are_preserved(self):
-        mock_wsgi_request = Mock(spec=WSGIRequest)
-        mock_wsgi_request.method = "GET"
-        mock_wsgi_request.path = "/test/path"
-        mock_wsgi_request.__class__.__name__ = "WSGIRequest"
-
-        input_attributes = {
-            "http.request.header.test_wsgirequest_header": [mock_wsgi_request],
-            "http.request.header.test_regular_header": ["regular-value"],
-        }
-        expected_attributes = {
-            "http.request.header.test_wsgirequest_header": [
-                str(mock_wsgi_request)
-            ],
-            "http.request.header.test_regular_header": ["regular-value"],
-        }
-
-        formatted_attributes = (
-            _DjangoMiddleware.format_request_objects_in_headers(
-                input_attributes
-            )
-        )
-
-        self.assertEqual(formatted_attributes, expected_attributes)
-
     def test_http_custom_request_headers_in_span_attributes(self):
         expected = {
             "http.request.header.custom_test_header_1": (