Tests

Author: rads-1996

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

@@ -20,19 +20,20 @@
 
 from opentelemetry.util import types
 
-WSGIRequest = None  # type: ignore
-_HAS_DJANGO = False
-if TYPE_CHECKING:
+
+def _get_wsgi_request_type():
+    """Get WSGIRequest type if Django is available, otherwise return None."""
     try:
-        from django.core.handlers.wsgi import WSGIRequest
-        _HAS_DJANGO = True
+        from django.core.handlers.wsgi import WSGIRequest  # type: ignore
+        return WSGIRequest
     except ImportError:
-        pass
+        return None
 
 # bytes are accepted as a user supplied value for attributes but
 # decoded to strings internally.
 _VALID_ATTR_VALUE_TYPES = (bool, str, bytes, int, float)
 # AnyValue possible values
+_WSGIRequest = _get_wsgi_request_type()
 _VALID_ANY_VALUE_TYPES = (
     type(None),
     bool,
@@ -42,7 +43,7 @@
     str,
     Sequence,
     Mapping,
-) + ((WSGIRequest,) if _HAS_DJANGO else ())
+) + ((_WSGIRequest,) if _WSGIRequest is not None else ())
 
 
 _logger = logging.getLogger(__name__)
@@ -137,7 +138,7 @@ def _clean_extended_attribute_value(
             value = value[:max_len]
         return value
 
-    if _HAS_DJANGO and WSGIRequest is not None and (isinstance(value, WSGIRequest)):
+    if _WSGIRequest is not None and isinstance(value, _WSGIRequest):
         wsgi_data = {
             "method": getattr(value, "method", None),
             "path": getattr(value, "path", None),

opentelemetry-api/tests/attributes/test_attributes.py

@@ -17,25 +17,26 @@
 import io
 import unittest
 from typing import TYPE_CHECKING, MutableSequence
-
-_HAS_DJANGO = False
-WSGIRequest = None
-settings = None
-if TYPE_CHECKING:
-    try:
-        from django.conf import settings
-        from django.core.handlers.wsgi import WSGIRequest
-        _HAS_DJANGO = True
-    except ImportError:
-       pass
-
 from opentelemetry.attributes import (
     BoundedAttributes,
     _clean_attribute,
     _clean_extended_attribute,
+    _get_wsgi_request_type,
 )
 
 
+def _get_django_settings():
+    """Get Django settings if available, otherwise return None."""
+    try:
+        from django.conf import settings  # pyright: ignore[reportMissingImports]
+        return settings
+    except ImportError:
+        return None
+
+
+_WSGIRequest = _get_wsgi_request_type()
+_settings = _get_django_settings()
+
 class TestAttributes(unittest.TestCase):
     # pylint: disable=invalid-name
     def assertValid(self, value, key="k"):
@@ -195,9 +196,11 @@ def test_mapping(self):
         )
 
     def test_wsgi_request_attribute(self):
-        if _HAS_DJANGO and WSGIRequest is not None:
-            if settings and not settings.configured:
-                settings.configure(
+        if _WSGIRequest is None or _settings is None:
+            self.skipTest("Django not available")
+            
+        if not _settings.configured:
+            _settings.configure(
                     DEBUG=True,
                     SECRET_KEY="test-secret-key",
                     USE_TZ=True,
@@ -225,9 +228,7 @@ def test_wsgi_request_attribute(self):
             }
 
             # Create a WSGIRequest object
-            wsgi_request = WSGIRequest(environ)
-
-            # Test that WSGIRequest gets cleaned to a dictionary format
+            wsgi_request = _WSGIRequest(environ)   
             expected_cleaned = {
                 "method": "GET",
                 "path": "/test",