Release v2.5.0 (#629)

Author: alexmojaki

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release Notes
 
+## [v2.5.0] (2024-11-27)
+
+* Add `logfire.suppress_scopes` method by @alexmojaki in [#628](https://github.com/pydantic/logfire/pull/628)
+* Replace `ModuleNotFoundError` by `ImportError` by @Kludex in [#622](https://github.com/pydantic/logfire/pull/622)
+
 ## [v2.4.1] (2024-11-21)
 
 * Allow new context argument of metric instrument methods to be passed positionally by @alexmojaki in [#616](https://github.com/pydantic/logfire/pull/616)
@@ -439,3 +444,4 @@ First release from new repo!
 [v2.3.0]: https://github.com/pydantic/logfire/compare/v2.2.1...v2.3.0
 [v2.4.0]: https://github.com/pydantic/logfire/compare/v2.3.0...v2.4.0
 [v2.4.1]: https://github.com/pydantic/logfire/compare/v2.4.0...v2.4.1
+[v2.5.0]: https://github.com/pydantic/logfire/compare/v2.4.1...v2.5.0

logfire-api/logfire_api/__init__.pyi

@@ -12,7 +12,7 @@ from .version import VERSION as VERSION
 from logfire.sampling import SamplingOptions as SamplingOptions
 from typing import Any
 
-__all__ = ['Logfire', 'LogfireSpan', 'LevelName', 'AdvancedOptions', 'ConsoleOptions', 'CodeSource', 'PydanticPlugin', 'configure', 'span', 'instrument', 'log', 'trace', 'debug', 'notice', 'info', 'warn', 'error', 'exception', 'fatal', 'force_flush', 'log_slow_async_callbacks', 'install_auto_tracing', 'instrument_asgi', 'instrument_wsgi', 'instrument_pydantic', 'instrument_fastapi', 'instrument_openai', 'instrument_anthropic', 'instrument_asyncpg', 'instrument_httpx', 'instrument_celery', 'instrument_requests', 'instrument_psycopg', 'instrument_django', 'instrument_flask', 'instrument_starlette', 'instrument_aiohttp_client', 'instrument_sqlalchemy', 'instrument_redis', 'instrument_pymongo', 'instrument_mysql', 'instrument_system_metrics', 'AutoTraceModule', 'with_tags', 'with_settings', 'shutdown', 'load_spans_from_file', 'no_auto_trace', 'ScrubMatch', 'ScrubbingOptions', 'VERSION', 'suppress_instrumentation', 'StructlogProcessor', 'LogfireLoggingHandler', 'loguru_handler', 'SamplingOptions', 'MetricsOptions']
+__all__ = ['Logfire', 'LogfireSpan', 'LevelName', 'AdvancedOptions', 'ConsoleOptions', 'CodeSource', 'PydanticPlugin', 'configure', 'span', 'instrument', 'log', 'trace', 'debug', 'notice', 'info', 'warn', 'error', 'exception', 'fatal', 'force_flush', 'log_slow_async_callbacks', 'install_auto_tracing', 'instrument_asgi', 'instrument_wsgi', 'instrument_pydantic', 'instrument_fastapi', 'instrument_openai', 'instrument_anthropic', 'instrument_asyncpg', 'instrument_httpx', 'instrument_celery', 'instrument_requests', 'instrument_psycopg', 'instrument_django', 'instrument_flask', 'instrument_starlette', 'instrument_aiohttp_client', 'instrument_sqlalchemy', 'instrument_redis', 'instrument_pymongo', 'instrument_mysql', 'instrument_system_metrics', 'AutoTraceModule', 'with_tags', 'with_settings', 'suppress_scopes', 'shutdown', 'load_spans_from_file', 'no_auto_trace', 'ScrubMatch', 'ScrubbingOptions', 'VERSION', 'suppress_instrumentation', 'StructlogProcessor', 'LogfireLoggingHandler', 'loguru_handler', 'SamplingOptions', 'MetricsOptions']
 
 DEFAULT_LOGFIRE_INSTANCE = Logfire()
 span = DEFAULT_LOGFIRE_INSTANCE.span
@@ -40,6 +40,7 @@ instrument_redis = DEFAULT_LOGFIRE_INSTANCE.instrument_redis
 instrument_pymongo = DEFAULT_LOGFIRE_INSTANCE.instrument_pymongo
 instrument_mysql = DEFAULT_LOGFIRE_INSTANCE.instrument_mysql
 instrument_system_metrics = DEFAULT_LOGFIRE_INSTANCE.instrument_system_metrics
+suppress_scopes = DEFAULT_LOGFIRE_INSTANCE.suppress_scopes
 shutdown = DEFAULT_LOGFIRE_INSTANCE.shutdown
 with_tags = DEFAULT_LOGFIRE_INSTANCE.with_tags
 with_settings = DEFAULT_LOGFIRE_INSTANCE.with_settings

logfire-api/logfire_api/_internal/config.pyi

@@ -20,12 +20,10 @@ from .tracer import PendingSpanProcessor as PendingSpanProcessor, ProxyTracerPro
 from .utils import SeededRandomIdGenerator as SeededRandomIdGenerator, UnexpectedResponse as UnexpectedResponse, ensure_data_dir_exists as ensure_data_dir_exists, read_toml_file as read_toml_file, suppress_instrumentation as suppress_instrumentation
 from _typeshed import Incomplete
 from dataclasses import dataclass
-from functools import cached_property
 from logfire.exceptions import LogfireConfigError as LogfireConfigError
 from logfire.sampling import SamplingOptions as SamplingOptions
 from logfire.sampling._tail_sampling import TailSamplingProcessor as TailSamplingProcessor
 from logfire.version import VERSION as VERSION
-from opentelemetry.metrics import Meter
 from opentelemetry.sdk.metrics.export import MetricReader as MetricReader
 from opentelemetry.sdk.trace import SpanProcessor
 from opentelemetry.sdk.trace.id_generator import IdGenerator
@@ -204,15 +202,7 @@ class LogfireConfig(_LogfireConfigData):
             The meter provider.
         """
     def warn_if_not_initialized(self, message: str): ...
-    @cached_property
-    def meter(self) -> Meter:
-        """Get a meter from this `LogfireConfig`.
-
-        This is used internally and should not be called by users of the SDK.
-
-        Returns:
-            The meter.
-        """
+    def suppress_scopes(self, *scopes: str) -> None: ...
 
 GLOBAL_CONFIG: Incomplete
 

logfire-api/logfire_api/_internal/main.pyi

@@ -970,6 +970,12 @@ class Logfire:
             unit: The unit of the metric.
             description: The description of the metric.
         """
+    def suppress_scopes(self, *scopes: str) -> None:
+        """Prevent spans and metrics from being created for the given OpenTelemetry scope names.
+
+        To get the scope name of a span/metric,
+        check the value of the `otel_scope_name` column in the Logfire database.
+        """
     def shutdown(self, timeout_millis: int = 30000, flush: bool = True) -> bool:
         """Shut down all tracers and meters.
 

logfire-api/logfire_api/_internal/metrics.pyi

@@ -14,7 +14,9 @@ class ProxyMeterProvider(MeterProvider):
     provider: MeterProvider
     meters: WeakSet[_ProxyMeter] = ...
     lock: Lock = ...
+    suppressed_scopes: set[str] = ...
     def get_meter(self, name: str, version: str | None = None, schema_url: str | None = None, *args: Any, **kwargs: Any) -> Meter: ...
+    def suppress_scopes(self, *scopes: str) -> None: ...
     def set_meter_provider(self, meter_provider: MeterProvider) -> None: ...
     def shutdown(self, timeout_millis: float = 30000) -> None: ...
     def force_flush(self, timeout_millis: float = 30000) -> None: ...

logfire-api/logfire_api/_internal/tracer.pyi

@@ -1,6 +1,7 @@
 import opentelemetry.trace as trace_api
 from .config import LogfireConfig as LogfireConfig
 from .constants import ATTRIBUTES_MESSAGE_KEY as ATTRIBUTES_MESSAGE_KEY, ATTRIBUTES_PENDING_SPAN_REAL_PARENT_KEY as ATTRIBUTES_PENDING_SPAN_REAL_PARENT_KEY, ATTRIBUTES_SAMPLE_RATE_KEY as ATTRIBUTES_SAMPLE_RATE_KEY, ATTRIBUTES_SPAN_TYPE_KEY as ATTRIBUTES_SPAN_TYPE_KEY, PENDING_SPAN_NAME_SUFFIX as PENDING_SPAN_NAME_SUFFIX
+from _typeshed import Incomplete
 from dataclasses import dataclass
 from opentelemetry import context as context_api
 from opentelemetry.context import Context
@@ -21,8 +22,10 @@ class ProxyTracerProvider(TracerProvider):
     config: LogfireConfig
     tracers: WeakKeyDictionary[_ProxyTracer, Callable[[], Tracer]] = ...
     lock: Lock = ...
+    suppressed_scopes: set[str] = ...
     def set_provider(self, provider: SDKTracerProvider) -> None: ...
-    def get_tracer(self, *args: Any, is_span_tracer: bool = True, **kwargs: Any) -> _ProxyTracer: ...
+    def suppress_scopes(self, *scopes: str) -> None: ...
+    def get_tracer(self, instrumenting_module_name: str, *args: Any, is_span_tracer: bool = True, **kwargs: Any) -> _ProxyTracer: ...
     def add_span_processor(self, span_processor: Any) -> None: ...
     def shutdown(self) -> None: ...
     @property
@@ -49,6 +52,7 @@ class _MaybeDeterministicTimestampSpan(trace_api.Span, ReadableSpan):
 @dataclass
 class _ProxyTracer(Tracer):
     """A tracer that wraps another internal tracer allowing it to be re-assigned."""
+    instrumenting_module_name: str
     tracer: Tracer
     provider: ProxyTracerProvider
     is_span_tracer: bool
@@ -58,6 +62,10 @@ class _ProxyTracer(Tracer):
     def start_span(self, name: str, context: Context | None = None, kind: SpanKind = ..., attributes: otel_types.Attributes = None, links: Sequence[Link] | None = None, start_time: int | None = None, record_exception: bool = True, set_status_on_exception: bool = True) -> Span: ...
     start_as_current_span = ...
 
+class SuppressedTracer(Tracer):
+    def start_span(self, name: str, context: Context | None = None, *args: Any, **kwargs: Any) -> Span: ...
+    start_as_current_span: Incomplete
+
 @dataclass
 class PendingSpanProcessor(SpanProcessor):
     """Span processor that emits an extra pending span for each span as it starts.

logfire-api/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "logfire-api"
-version = "2.4.1"
+version = "2.5.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 = "2.4.1"
+version = "2.5.0"
 description = "The best Python observability tool! 🪵🔥"
 requires-python = ">=3.8"
 authors = [