Release v3.21.0 (#1150)

Author: alexmojaki

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release Notes
 
+## [v3.21.0] (2025-06-17)
+
+* Add up counter/histogram metrics in spans by @alexmojaki in [#1099](https://github.com/pydantic/logfire/pull/1099)
+* Fix kwargs in proxy metric instruments, preventing warning about duplicate histograms by @alexmojaki in [#1149](https://github.com/pydantic/logfire/pull/1149)
+
 ## [v3.20.0] (2025-06-16)
 
 * Add baggage utilities by @dmontagu in [#1128](https://github.com/pydantic/logfire/pull/1128)
@@ -742,3 +747,4 @@ First release from new repo!
 [v3.18.0]: https://github.com/pydantic/logfire/compare/v3.17.0...v3.18.0
 [v3.19.0]: https://github.com/pydantic/logfire/compare/v3.18.0...v3.19.0
 [v3.20.0]: https://github.com/pydantic/logfire/compare/v3.19.0...v3.20.0
+[v3.21.0]: https://github.com/pydantic/logfire/compare/v3.20.0...v3.21.0

logfire-api/logfire_api/_internal/config.pyi

@@ -81,11 +81,9 @@ class PydanticPlugin:
 
 @dataclass
 class MetricsOptions:
-    """Configuration of metrics.
-
-    This only has one option for now, but it's a place to add more related options in the future.
-    """
+    """Configuration of metrics."""
     additional_readers: Sequence[MetricReader] = ...
+    collect_in_spans: bool = ...
 
 @dataclass
 class CodeSource:

logfire-api/logfire_api/_internal/metrics.pyi

@@ -1,4 +1,5 @@
 import dataclasses
+from .utils import handle_internal_errors as handle_internal_errors
 from _typeshed import Incomplete
 from abc import ABC
 from collections.abc import Sequence
@@ -40,22 +41,19 @@ class _ProxyMeter(Meter):
 InstrumentT = TypeVar('InstrumentT', bound=Instrument)
 
 class _ProxyInstrument(ABC, Generic[InstrumentT]):
-    def __init__(self, instrument: InstrumentT, name: str, unit: str, description: str) -> None: ...
+    def __init__(self, meter: Meter, **kwargs: Any) -> None: ...
     def on_meter_set(self, meter: Meter) -> None:
         """Called when a real meter is set on the creating _ProxyMeter."""
 
-class _ProxyAsynchronousInstrument(_ProxyInstrument[InstrumentT], ABC):
-    def __init__(self, instrument: InstrumentT, name: str, callbacks: Sequence[CallbackT] | None, unit: str, description: str) -> None: ...
-
 class _ProxyCounter(_ProxyInstrument[Counter], Counter):
     def add(self, amount: int | float, attributes: Attributes | None = None, *args: Any, **kwargs: Any) -> None: ...
 
 class _ProxyHistogram(_ProxyInstrument[Histogram], Histogram):
     def record(self, amount: int | float, attributes: Attributes | None = None, *args: Any, **kwargs: Any) -> None: ...
 
-class _ProxyObservableCounter(_ProxyAsynchronousInstrument[ObservableCounter], ObservableCounter): ...
-class _ProxyObservableGauge(_ProxyAsynchronousInstrument[ObservableGauge], ObservableGauge): ...
-class _ProxyObservableUpDownCounter(_ProxyAsynchronousInstrument[ObservableUpDownCounter], ObservableUpDownCounter): ...
+class _ProxyObservableCounter(_ProxyInstrument[ObservableCounter], ObservableCounter): ...
+class _ProxyObservableGauge(_ProxyInstrument[ObservableGauge], ObservableGauge): ...
+class _ProxyObservableUpDownCounter(_ProxyInstrument[ObservableUpDownCounter], ObservableUpDownCounter): ...
 
 class _ProxyUpDownCounter(_ProxyInstrument[UpDownCounter], UpDownCounter):
     def add(self, amount: int | float, attributes: Attributes | None = None, *args: Any, **kwargs: Any) -> None: ...

logfire-api/logfire_api/_internal/tracer.pyi

@@ -15,9 +15,9 @@ from opentelemetry.trace.status import Status, StatusCode
 from opentelemetry.util import types as otel_types
 from threading import Lock
 from typing import Any, Callable
-from weakref import WeakKeyDictionary, WeakSet
+from weakref import WeakKeyDictionary, WeakValueDictionary
 
-OPEN_SPANS: WeakSet[_LogfireWrappedSpan]
+OPEN_SPANS: WeakValueDictionary[tuple[int, int], _LogfireWrappedSpan]
 
 @dataclass
 class ProxyTracerProvider(TracerProvider):
@@ -36,6 +36,12 @@ class ProxyTracerProvider(TracerProvider):
     def resource(self) -> Resource: ...
     def force_flush(self, timeout_millis: int = 30000) -> bool: ...
 
+@dataclass
+class SpanMetric:
+    details: dict[tuple[tuple[str, otel_types.AttributeValue], ...], float] = field(default_factory=Incomplete)
+    def dump(self): ...
+    def increment(self, attributes: Mapping[str, otel_types.AttributeValue], value: float): ...
+
 @dataclass(eq=False)
 class _LogfireWrappedSpan(trace_api.Span, ReadableSpan):
     """A span that wraps another span and overrides some behaviors in a logfire-specific way.
@@ -47,6 +53,8 @@ class _LogfireWrappedSpan(trace_api.Span, ReadableSpan):
     """
     span: Span
     ns_timestamp_generator: Callable[[], int]
+    record_metrics: bool
+    metrics: dict[str, SpanMetric] = field(default_factory=Incomplete)
     def __post_init__(self) -> None: ...
     def end(self, end_time: int | None = None) -> None: ...
     def get_span_context(self) -> SpanContext: ...
@@ -58,6 +66,7 @@ class _LogfireWrappedSpan(trace_api.Span, ReadableSpan):
     def is_recording(self) -> bool: ...
     def set_status(self, status: Status | StatusCode, description: str | None = None) -> None: ...
     def record_exception(self, exception: BaseException, attributes: otel_types.Attributes = None, timestamp: int | None = None, escaped: bool = False) -> None: ...
+    def increment_metric(self, name: str, attributes: Mapping[str, otel_types.AttributeValue], value: float) -> None: ...
     def __exit__(self, exc_type: type[BaseException] | None, exc_value: BaseException | None, traceback: Any) -> None: ...
     def __getattr__(self, name: str) -> Any: ...
 

logfire-api/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "logfire-api"
-version = "3.20.0"
+version = "3.21.0"
 description = "Shim for the Logfire SDK which does nothing unless Logfire is installed"
 authors = [
     { name = "Pydantic Team", email = "[email protected]" },

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "logfire"
-version = "3.20.0"
+version = "3.21.0"
 description = "The best Python observability tool! 🪵🔥"
 requires-python = ">=3.9"
 authors = [