Update to OTel 1.37.0, drop support for <1.35.0 (#1398)

Author: alexmojaki

.github/workflows/daily_deps_test.yml

@@ -47,16 +47,10 @@ jobs:
           # OpenTelemetry versions
           - python-version: '3.13'
             pydantic-version: 'main'
-            otel-version: '1.33'
+            otel-version: '1.36'
           - python-version: '3.13'
             pydantic-version: 'main'
-            otel-version: '1.32'
-          - python-version: '3.13'
-            pydantic-version: 'main'
-            otel-version: '1.31'
-          - python-version: '3.13'
-            pydantic-version: 'main'
-            otel-version: '1.30'
+            otel-version: '1.35'
     env:
       PYTHON: ${{ matrix.python-version }}
     steps:

.github/workflows/main.yml

@@ -70,7 +70,7 @@ jobs:
               otel-version: '1'  # i.e. the latest
             - python-version: '3.13'
               pydantic-version: '2'  # i.e. the latest
-              otel-version: '1.30'
+              otel-version: '1.35'
     env:
       PYTHON: ${{ matrix.python-version }}
     steps:

docs/integrations/system-metrics.md

@@ -78,6 +78,9 @@ logfire.instrument_system_metrics({
     'process.memory.usage': None,
     'process.memory.virtual': None,
     'process.thread.count': None,
+    'cpython.gc.collected_objects': None,
+    'cpython.gc.collections': None,
+    'cpython.gc.uncollectable_objects': None,
 })
 ```
 

logfire/_internal/exporters/dynamic_batch.py

@@ -8,11 +8,6 @@
 
 from logfire._internal.exporters.wrapper import WrapperSpanProcessor
 
-try:
-    from opentelemetry.sdk._shared_internal import BatchProcessor
-except ImportError:
-    BatchProcessor = None
-
 
 class DynamicBatchSpanProcessor(WrapperSpanProcessor):
     """A wrapper around a BatchSpanProcessor that dynamically adjusts the schedule delay.
@@ -37,37 +32,18 @@ def on_end(self, span: ReadableSpan) -> None:
             self.schedule_delay_millis = self.final_delay
         super().on_end(span)
 
-    if BatchProcessor:
-
-        @property
-        def batch_processor(self):  # type: ignore
-            return self.processor._batch_processor  # type: ignore
-
-        @property
-        def span_exporter(self) -> SpanExporter:  # type: ignore
-            return self.batch_processor._exporter  # type: ignore
-
-        @property
-        def schedule_delay_millis(self) -> float:  # type: ignore
-            return self.batch_processor._schedule_delay * 1000  # type: ignore
-
-        @schedule_delay_millis.setter
-        def schedule_delay_millis(self, value: float):  # type: ignore
-            self.batch_processor._schedule_delay = value / 1000  # type: ignore
-    else:
-
-        @property
-        def batch_processor(self):
-            return self.processor
+    @property
+    def batch_processor(self):
+        return self.processor._batch_processor  # type: ignore
 
-        @property
-        def span_exporter(self) -> SpanExporter:
-            return self.processor.span_exporter  # type: ignore
+    @property
+    def span_exporter(self) -> SpanExporter:
+        return self.batch_processor._exporter  # type: ignore
 
-        @property
-        def schedule_delay_millis(self) -> float:
-            return self.processor.schedule_delay_millis  # type: ignore
+    @property
+    def schedule_delay_millis(self) -> float:
+        return self.batch_processor._schedule_delay * 1000  # type: ignore
 
-        @schedule_delay_millis.setter
-        def schedule_delay_millis(self, value: float):
-            self.processor.schedule_delay_millis = value  # type: ignore
+    @schedule_delay_millis.setter
+    def schedule_delay_millis(self, value: float):
+        self.batch_processor._schedule_delay = value / 1000  # type: ignore

logfire/_internal/exporters/logs.py

@@ -20,8 +20,6 @@ def on_emit(self, log_data: LogData):
         with logfire.suppress_instrumentation():
             return super().on_emit(log_data)
 
-    emit = on_emit
-
 
 @dataclass
 class MainLogProcessorWrapper(WrapperLogProcessor):
@@ -30,5 +28,3 @@ class MainLogProcessorWrapper(WrapperLogProcessor):
     def on_emit(self, log_data: LogData):
         log_data.log_record = self.scrubber.scrub_log(log_data.log_record)
         return super().on_emit(log_data)
-
-    emit = on_emit

logfire/_internal/exporters/processor_wrapper.py

@@ -79,6 +79,7 @@ def on_end(self, span: ReadableSpan) -> None:
             _tweak_asgi_send_receive_spans(span_dict)
             _tweak_sqlalchemy_connect_spans(span_dict)
             _tweak_http_spans(span_dict)
+            _tweak_fastapi_span(span_dict)
             _summarize_db_statement(span_dict)
             _set_error_level_and_status(span_dict)
             _transform_langchain_span(span_dict)
@@ -299,6 +300,34 @@ def _summarize_db_statement(span: ReadableSpanDict):
         span['attributes'] = {**attributes, ATTRIBUTES_MESSAGE_KEY: summary}
 
 
+def _tweak_fastapi_span(span: ReadableSpanDict):
+    scope = span['instrumentation_scope']
+
+    if not (scope and scope.name == 'opentelemetry.instrumentation.fastapi'):
+        return
+
+    # Our fastapi instrumentation records some exceptions directly on the request span.
+    # These might be handled and not seen again, or they may bubble through and be recorded by the OTel middleware,
+    # thus appearing twice on the same span.
+    # We dedupe them here, keeping the latter event which has a fuller traceback.
+    events = span['events']
+    new_events: list[Event] = []
+    # (type, message) keys of exceptions we've seen.
+    seen_exceptions: set[tuple[Any, Any]] = set()
+    # Go in reverse order to give the latter events precedence.
+    for event in events[::-1]:
+        attrs = event.attributes
+        if not (event.name == 'exception' and attrs and 'exception.type' in attrs and 'exception.message' in attrs):
+            new_events.append(event)
+            continue
+        key = (attrs['exception.type'], attrs['exception.message'])
+        if key in seen_exceptions and attrs.get('recorded_by_logfire_fastapi'):
+            continue
+        seen_exceptions.add(key)
+        new_events.append(event)
+    span['events'] = new_events[::-1]
+
+
 def _transform_langchain_span(span: ReadableSpanDict):
     """Transform spans generated by LangSmith to work better in the Logfire UI.
 

logfire/_internal/exporters/wrapper.py

@@ -93,18 +93,8 @@ class WrapperLogProcessor(LogRecordProcessor):
 
     processor: LogRecordProcessor
 
-    if hasattr(LogRecordProcessor, 'on_emit'):
-
-        def on_emit(self, log_data: LogData) -> None:
-            return self.processor.on_emit(log_data)
-
-        emit = on_emit
-    else:
-
-        def emit(self, log_data: LogData) -> None:
-            return self.processor.emit(log_data)  # type: ignore
-
-        on_emit = emit
+    def on_emit(self, log_data: LogData) -> None:
+        return self.processor.on_emit(log_data)
 
     def shutdown(self):
         return self.processor.shutdown()

logfire/_internal/integrations/fastapi.py

@@ -186,7 +186,7 @@ def set_timestamp(attribute_name: str):
                 # Record the end timestamp before recording exceptions.
                 set_timestamp('end_timestamp')
         except Exception as exc:
-            root_span.record_exception(exc)
+            root_span.record_exception(exc, attributes={'recorded_by_logfire_fastapi': True})
             raise
 
     async def solve_dependencies(self, request: Request | WebSocket, original: Awaitable[Any]) -> Any:

logfire/_internal/integrations/system_metrics.py

@@ -53,6 +53,9 @@
         'process.memory.virtual',
         'process.thread.count',
         'process.runtime.gc_count',
+        'cpython.gc.collected_objects',
+        'cpython.gc.collections',
+        'cpython.gc.uncollectable_objects',
     ]
 ] = Literal[  # type: ignore  # but pyright doesn't like it
     'system.cpu.simple_utilization',
@@ -80,6 +83,9 @@
     'process.memory.virtual',
     'process.thread.count',
     'process.runtime.gc_count',
+    'cpython.gc.collected_objects',
+    'cpython.gc.collections',
+    'cpython.gc.uncollectable_objects',
 ]
 
 Config = dict[MetricName, Optional[Iterable[str]]]

pyproject.toml

@@ -45,8 +45,8 @@ classifiers = [
     "Framework :: OpenTelemetry :: Instrumentations",
 ]
 dependencies = [
-    "opentelemetry-sdk >= 1.21.0, < 1.37.0",
-    "opentelemetry-exporter-otlp-proto-http >= 1.21.0, < 1.37.0",
+    "opentelemetry-sdk >= 1.35.0, < 1.38.0",
+    "opentelemetry-exporter-otlp-proto-http >= 1.35.0, < 1.38.0",
     "opentelemetry-instrumentation >= 0.41b0",
     "rich >= 13.4.2",
     "protobuf >= 4.23.4",