Merge branch 'main' into main

Author: xrmx

CHANGELOG.md

@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- `opentelemetry-api`: Convert objects of any type other than AnyValue in attributes to string to be exportable
+  ([#4808](https://github.com/open-telemetry/opentelemetry-python/pull/4808))
 - docs: Added sqlcommenter example
   ([#4734](https://github.com/open-telemetry/opentelemetry-python/pull/4734))
 - build: bump ruff to 0.14.1
@@ -27,6 +29,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4676](https://github.com/open-telemetry/opentelemetry-python/pull/4676))
 - [BREAKING] Rename several classes from Log to LogRecord
   ([#4647](https://github.com/open-telemetry/opentelemetry-python/pull/4647))
+- Fix type checking for built in metric exporters
+  ([#4820](https://github.com/open-telemetry/opentelemetry-python/pull/4820))
 
   **Migration Guide:**
 
@@ -1721,7 +1725,7 @@ can cause a deadlock to occur over `logging._lock` in some cases ([#4636](https:
 - Add reset for the global configuration object, for testing purposes
   ([#636](https://github.com/open-telemetry/opentelemetry-python/pull/636))
 - Add support for programmatic instrumentation
-  ([#579](https://github.com/open-telemetry/opentelemetry-python/pull/569))
+  ([#579](https://github.com/open-telemetry/opentelemetry-python/pull/579))
 
 ### Changed
 

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

@@ -118,7 +118,7 @@ def _clean_attribute(
     return None
 
 
-def _clean_extended_attribute_value(
+def _clean_extended_attribute_value(  # pylint: disable=too-many-branches
     value: types.AnyValue, max_len: Optional[int]
 ) -> types.AnyValue:
     # for primitive types just return the value and eventually shorten the string length
@@ -180,11 +180,19 @@ 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",
-    )
+    # Some applications such as Django add values to log records whose types fall outside the
+    # primitive types and `_VALID_ANY_VALUE_TYPES`, i.e., they are not of type `AnyValue`.
+    # Rather than attempt to whitelist every possible instrumentation, we stringify those values here
+    # so they can still be represented as attributes, falling back to the original TypeError only if
+    # converting to string raises.
+    try:
+        return str(value)
+    except Exception:
+        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(

opentelemetry-api/tests/attributes/test_attributes.py

@@ -301,3 +301,22 @@ 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 when _clean_extended_attribute is called."""
+
+        class DummyWSGIRequest:
+            def __str__(self):
+                return "<DummyWSGIRequest method=GET path=/example/>"
+
+        wsgi_request = DummyWSGIRequest()
+
+        cleaned_value = _clean_extended_attribute(
+            "request", wsgi_request, None
+        )
+
+        # Verify we get a string back from the cleaner
+        self.assertIsInstance(cleaned_value, str)
+        self.assertEqual(
+            "<DummyWSGIRequest method=GET path=/example/>", cleaned_value
+        )

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

@@ -145,7 +145,7 @@ def __init__(
         self,
         out: IO = stdout,
         formatter: Callable[
-            ["opentelemetry.sdk.metrics.export.MetricsData"], str
+            [MetricsData], str
         ] = lambda metrics_data: metrics_data.to_json() + linesep,
         preferred_temporality: dict[type, AggregationTemporality]
         | None = None,
@@ -362,7 +362,7 @@ def _set_collect_callback(
     @abstractmethod
     def _receive_metrics(
         self,
-        metrics_data: "opentelemetry.sdk.metrics.export.MetricsData",
+        metrics_data: MetricsData,
         timeout_millis: float = 10_000,
         **kwargs,
     ) -> None:
@@ -406,13 +406,11 @@ def __init__(
             preferred_aggregation=preferred_aggregation,
         )
         self._lock = RLock()
-        self._metrics_data: "opentelemetry.sdk.metrics.export.MetricsData" = (
-            None
-        )
+        self._metrics_data: MetricsData = None
 
     def get_metrics_data(
         self,
-    ) -> Optional["opentelemetry.sdk.metrics.export.MetricsData"]:
+    ) -> Optional[MetricsData]:
         """Reads and returns current metrics from the SDK"""
         with self._lock:
             self.collect()
@@ -422,7 +420,7 @@ def get_metrics_data(
 
     def _receive_metrics(
         self,
-        metrics_data: "opentelemetry.sdk.metrics.export.MetricsData",
+        metrics_data: MetricsData,
         timeout_millis: float = 10_000,
         **kwargs,
     ) -> None:

opentelemetry-sdk/src/opentelemetry/sdk/metrics/export/__init__.py

@@ -13,8 +13,10 @@
 # limitations under the License.
 
 
-from opentelemetry.sdk.metrics._internal.export import (
+from opentelemetry.sdk.metrics._internal.aggregation import (
     AggregationTemporality,
+)
+from opentelemetry.sdk.metrics._internal.export import (
     ConsoleMetricExporter,
     InMemoryMetricReader,
     MetricExporter,

opentelemetry-sdk/src/opentelemetry/sdk/trace/export/__init__.py

@@ -63,7 +63,7 @@ class SpanExporter:
 
     def export(
         self, spans: typing.Sequence[ReadableSpan]
-    ) -> "SpanExportResult":
+    ) -> "SpanExportResult":  # pyright: ignore[reportReturnType]
         """Exports a batch of telemetry data.
 
         Args:
@@ -79,7 +79,7 @@ def shutdown(self) -> None:
         Called when the SDK is shut down.
         """
 
-    def force_flush(self, timeout_millis: int = 30000) -> bool:
+    def force_flush(self, timeout_millis: int = 30000) -> bool:  # pyright: ignore[reportReturnType]
         """Hint to ensure that the export of any spans the exporter has received
         prior to the call to ForceFlush SHOULD be completed as soon as possible, preferably
         before returning from this method.
@@ -102,7 +102,7 @@ def on_start(
         pass
 
     def on_end(self, span: ReadableSpan) -> None:
-        if not span.context.trace_flags.sampled:
+        if not (span.context and span.context.trace_flags.sampled):
             return
         token = attach(set_value(_SUPPRESS_INSTRUMENTATION_KEY, True))
         try:
@@ -188,7 +188,7 @@ def on_start(
         pass
 
     def on_end(self, span: ReadableSpan) -> None:
-        if not span.context.trace_flags.sampled:
+        if not (span.context and span.context.trace_flags.sampled):
             return
         self._batch_processor.emit(span)
 

pyproject.toml

@@ -111,11 +111,8 @@ include = [
 exclude = [
   "opentelemetry-sdk/tests",
   "opentelemetry-sdk/src/opentelemetry/sdk/_events",
-  "opentelemetry-sdk/src/opentelemetry/sdk/error_handler",
-  "opentelemetry-sdk/src/opentelemetry/sdk/metrics",
-  "opentelemetry-sdk/src/opentelemetry/sdk/trace/export",
+  "opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/",
   "opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py",
-  "opentelemetry-sdk/src/opentelemetry/sdk/util",
   "opentelemetry-sdk/benchmarks",
   "exporter/opentelemetry-exporter-otlp-proto-grpc/tests",
 ]