Move logic to api

Author: rads-1996

opentelemetry-api/src/opentelemetry/attributes/__init__.py

@@ -180,11 +180,6 @@ def _clean_extended_attribute_value(
         # Freeze mutable sequences defensively
         return tuple(cleaned_seq)
 
-    raise TypeError(
-        f"Invalid type {type(value).__name__} for attribute value. "
-        f"Expected one of {[valid_type.__name__ for valid_type in _VALID_ANY_VALUE_TYPES]} or a "
-        "sequence of those types",
-    )
 
 
 def _clean_extended_attribute(
@@ -279,6 +274,9 @@ def __setitem__(self, key: str, value: types.AnyValue) -> None:
                 return
 
             if self._extended_attributes:
+                # Convert types other than AnyValue to strings before cleaning
+                if not isinstance(value, _VALID_ANY_VALUE_TYPES):
+                    value = str(value)
                 value = _clean_extended_attribute(
                     key, value, self.max_value_len
                 )

opentelemetry-api/tests/attributes/test_attributes.py

@@ -301,3 +301,30 @@ def test_extended_attributes(self):
             bdict["key"] = "value"
 
         clean_extended_attribute_mock.assert_called_once()
+
+    def test_wsgi_request_conversion_to_string(self):
+        """Test that WSGI request objects are converted to strings before calling _clean_extended_attribute."""
+        
+        class DummyWSGIRequest:
+            def __str__(self):
+                return "<DummyWSGIRequest method=GET path=/example/>"
+        
+        bdict = BoundedAttributes(extended_attributes=True, immutable=False)
+        wsgi_request = DummyWSGIRequest()
+        original_request = wsgi_request  # Keep reference to original object
+        
+        with unittest.mock.patch(
+            "opentelemetry.attributes._clean_extended_attribute",
+            return_value="stringified_request",
+        ) as clean_extended_attribute_mock:
+            bdict["request"] = wsgi_request
+        
+        # Verify that _clean_extended_attribute was called
+        clean_extended_attribute_mock.assert_called_once()
+        
+        # Verify that the value passed to _clean_extended_attribute is a string, not the original object
+        call_args = clean_extended_attribute_mock.call_args
+        passed_value = call_args[0][1]  # Second argument is the value
+        self.assertIsInstance(passed_value, str)
+        self.assertNotEqual(passed_value, original_request)  # Should be stringified, not the original object
+        self.assertIn("DummyWSGIRequest", passed_value)  # String representation includes class name

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/__init__.py

@@ -36,7 +36,6 @@
 from opentelemetry.sdk._shared_internal import (
     BatchProcessor,
     DuplicateFilter,
-    RequestFilter,
 )
 from opentelemetry.sdk.environment_variables import (
     OTEL_BLRP_EXPORT_TIMEOUT,
@@ -55,8 +54,6 @@
 )
 _logger = logging.getLogger(__name__)
 _logger.addFilter(DuplicateFilter())
-_wsgi_request_logger = logging.getLogger("django.request")
-_wsgi_request_logger.addFilter(RequestFilter())
 
 
 class LogRecordExportResult(enum.Enum):

opentelemetry-sdk/src/opentelemetry/sdk/_shared_internal/__init__.py

@@ -62,13 +62,6 @@ def filter(self, record):
         return False
 
 
-class RequestFilter(logging.Filter):
-    def filter(self, record: logging.LogRecord) -> bool:
-        request = getattr(record, "request", None)
-        record.request = str(request)
-        return True
-
-
 class BatchExportStrategy(enum.Enum):
     EXPORT_ALL = 0
     EXPORT_WHILE_BATCH_EXCEEDS_THRESHOLD = 1
@@ -120,8 +113,6 @@ def __init__(
         )
         self._logger = logging.getLogger(__name__)
         self._logger.addFilter(DuplicateFilter())
-        self._wsgi_request_logger = logging.getLogger("django.request")
-        self._wsgi_request_logger.addFilter(RequestFilter())
         self._exporting = exporting
 
         self._shutdown = False

opentelemetry-sdk/tests/shared_internal/test_batch_processor.py

@@ -38,7 +38,6 @@
 )
 from opentelemetry.sdk._shared_internal import (
     DuplicateFilter,
-    RequestFilter,
 )
 from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
@@ -265,49 +264,3 @@ def test_duplicate_logs_filter_works(self):
             test_logger.info("message")
             test_logger.info("message")
         self.assertEqual(len(cm.output), 1)
-
-
-class TestRequestFilter(unittest.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(getattr(record, "request", None), expected_repr)
-        self.assertIsInstance(getattr(record, "request", None), 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(getattr(record, "request", None), "None")