Release v3.6.0 (#872)

Author: alexmojaki

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Release Notes
 
+## [v3.6.0] (2025-02-18)
+
+* Set log level to warning instead of error for 4xx HTTPExceptions from FastAPI/Starlette by @alexmojaki in [#858](https://github.com/pydantic/logfire/pull/858)
+* Add option to disable printing tags to console by @dmontagu in [#860](https://github.com/pydantic/logfire/pull/860)
+* Experimental support for OTel logs by @alexmojaki in [#863](https://github.com/pydantic/logfire/pull/863), [#870](https://github.com/pydantic/logfire/pull/870), and [#871](https://github.com/pydantic/logfire/pull/871)
+* Fix `excluded_urls` typo in instrument_flask by @alexmojaki in [#852](https://github.com/pydantic/logfire/pull/852)
+* Catch more errors when checking for sqlalchemy objects by @alexmojaki in [#854](https://github.com/pydantic/logfire/pull/854)
+* Don't scrub exception message by @alexmojaki in [#865](https://github.com/pydantic/logfire/pull/865)
+* Only skip logging to console after updating span stack and indentation by @alexmojaki in [#844](https://github.com/pydantic/logfire/pull/844)
+
 ## [v3.5.3] (2025-02-05)
 
 * Fixes for capturing httpx bodies by @alexmojaki in [#842](https://github.com/pydantic/logfire/pull/842)
@@ -570,3 +580,4 @@ First release from new repo!
 [v3.5.1]: https://github.com/pydantic/logfire/compare/v3.5.0...v3.5.1
 [v3.5.2]: https://github.com/pydantic/logfire/compare/v3.5.1...v3.5.2
 [v3.5.3]: https://github.com/pydantic/logfire/compare/v3.5.2...v3.5.3
+[v3.6.0]: https://github.com/pydantic/logfire/compare/v3.5.3...v3.6.0

logfire-api/logfire_api/_internal/config.pyi

@@ -5,12 +5,14 @@ from .auth import DEFAULT_FILE as DEFAULT_FILE, DefaultFile as DefaultFile, is_l
 from .config_params import ParamManager as ParamManager, PydanticPluginRecordValues as PydanticPluginRecordValues
 from .constants import LevelName as LevelName, OTLP_MAX_BODY_SIZE as OTLP_MAX_BODY_SIZE, RESOURCE_ATTRIBUTES_CODE_ROOT_PATH as RESOURCE_ATTRIBUTES_CODE_ROOT_PATH, RESOURCE_ATTRIBUTES_CODE_WORK_DIR as RESOURCE_ATTRIBUTES_CODE_WORK_DIR, RESOURCE_ATTRIBUTES_DEPLOYMENT_ENVIRONMENT_NAME as RESOURCE_ATTRIBUTES_DEPLOYMENT_ENVIRONMENT_NAME, RESOURCE_ATTRIBUTES_VCS_REPOSITORY_REF_REVISION as RESOURCE_ATTRIBUTES_VCS_REPOSITORY_REF_REVISION, RESOURCE_ATTRIBUTES_VCS_REPOSITORY_URL as RESOURCE_ATTRIBUTES_VCS_REPOSITORY_URL
 from .exporters.console import ConsoleColorsValues as ConsoleColorsValues, IndentedConsoleSpanExporter as IndentedConsoleSpanExporter, ShowParentsConsoleSpanExporter as ShowParentsConsoleSpanExporter, SimpleConsoleSpanExporter as SimpleConsoleSpanExporter
-from .exporters.otlp import OTLPExporterHttpSession as OTLPExporterHttpSession, QuietSpanExporter as QuietSpanExporter, RetryFewerSpansSpanExporter as RetryFewerSpansSpanExporter
+from .exporters.logs import CheckSuppressInstrumentationLogProcessorWrapper as CheckSuppressInstrumentationLogProcessorWrapper
+from .exporters.otlp import OTLPExporterHttpSession as OTLPExporterHttpSession, QuietLogExporter as QuietLogExporter, QuietSpanExporter as QuietSpanExporter, RetryFewerSpansSpanExporter as RetryFewerSpansSpanExporter
 from .exporters.processor_wrapper import CheckSuppressInstrumentationProcessorWrapper as CheckSuppressInstrumentationProcessorWrapper, MainSpanProcessorWrapper as MainSpanProcessorWrapper
 from .exporters.quiet_metrics import QuietMetricExporter as QuietMetricExporter
 from .exporters.remove_pending import RemovePendingSpansExporter as RemovePendingSpansExporter
 from .exporters.test import TestExporter as TestExporter
 from .integrations.executors import instrument_executors as instrument_executors
+from .logs import ProxyLoggerProvider as ProxyLoggerProvider
 from .main import Logfire as Logfire
 from .metrics import ProxyMeterProvider as ProxyMeterProvider
 from .scrubbing import BaseScrubber as BaseScrubber, NOOP_SCRUBBER as NOOP_SCRUBBER, Scrubber as Scrubber, ScrubbingOptions as ScrubbingOptions
@@ -23,6 +25,8 @@ 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._events import EventLoggerProvider
+from opentelemetry.sdk._logs import LogRecordProcessor as LogRecordProcessor
 from opentelemetry.sdk.metrics.export import MetricReader as MetricReader
 from opentelemetry.sdk.trace import SpanProcessor
 from opentelemetry.sdk.trace.id_generator import IdGenerator
@@ -52,6 +56,7 @@ class AdvancedOptions:
     base_url: str = ...
     id_generator: IdGenerator = ...
     ns_timestamp_generator: Callable[[], int] = ...
+    log_record_processors: Sequence[LogRecordProcessor] = ...
 
 @dataclass
 class PydanticPlugin:
@@ -200,6 +205,22 @@ class LogfireConfig(_LogfireConfigData):
         Returns:
             The meter provider.
         """
+    def get_logger_provider(self) -> ProxyLoggerProvider:
+        """Get a logger provider from this `LogfireConfig`.
+
+        This is used internally and should not be called by users of the SDK.
+
+        Returns:
+            The logger provider.
+        """
+    def get_event_logger_provider(self) -> EventLoggerProvider:
+        """Get an event logger provider from this `LogfireConfig`.
+
+        This is used internally and should not be called by users of the SDK.
+
+        Returns:
+            The event logger provider.
+        """
     def warn_if_not_initialized(self, message: str): ...
     def suppress_scopes(self, *scopes: str) -> None: ...
 

logfire-api/logfire_api/_internal/constants.pyi

@@ -23,8 +23,6 @@ ATTRIBUTES_LOGGING_ARGS_KEY: Incomplete
 ATTRIBUTES_LOGGING_NAME: Incomplete
 ATTRIBUTES_VALIDATION_ERROR_KEY: str
 ATTRIBUTES_SCRUBBED_KEY: Incomplete
-NULL_ARGS_KEY: str
-PENDING_SPAN_NAME_SUFFIX: str
 LOGFIRE_BASE_URL: str
 RESOURCE_ATTRIBUTES_PACKAGE_VERSIONS: str
 RESOURCE_ATTRIBUTES_DEPLOYMENT_ENVIRONMENT_NAME: str

logfire-api/logfire_api/_internal/exporters/logs.pyi

@@ -0,0 +1,10 @@
+from logfire._internal.exporters.wrapper import WrapperLogProcessor as WrapperLogProcessor
+from logfire._internal.utils import is_instrumentation_suppressed as is_instrumentation_suppressed
+from opentelemetry.sdk._logs import LogData
+
+class CheckSuppressInstrumentationLogProcessorWrapper(WrapperLogProcessor):
+    """Checks if instrumentation is suppressed, then suppresses instrumentation itself.
+
+    Placed at the root of the tree of processors.
+    """
+    def emit(self, log_data: LogData): ...

logfire-api/logfire_api/_internal/exporters/otlp.pyi

@@ -1,9 +1,10 @@
 import requests
 from ..stack_info import STACK_INFO_KEYS as STACK_INFO_KEYS
 from ..utils import logger as logger, platform_is_emscripten as platform_is_emscripten, truncate_string as truncate_string
-from .wrapper import WrapperSpanExporter as WrapperSpanExporter
+from .wrapper import WrapperLogExporter as WrapperLogExporter, WrapperSpanExporter as WrapperSpanExporter
 from _typeshed import Incomplete
 from functools import cached_property
+from opentelemetry.sdk._logs import LogData as LogData
 from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExportResult
 from requests import Session
@@ -51,3 +52,7 @@ class BodyTooLargeError(Exception):
 class QuietSpanExporter(WrapperSpanExporter):
     """A SpanExporter that catches request exceptions to prevent OTEL from logging a huge traceback."""
     def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult: ...
+
+class QuietLogExporter(WrapperLogExporter):
+    """A LogExporter that catches request exceptions to prevent OTEL from logging a huge traceback."""
+    def export(self, batch: Sequence[LogData]): ...

logfire-api/logfire_api/_internal/exporters/processor_wrapper.pyi

@@ -1,4 +1,4 @@
-from ..constants import ATTRIBUTES_LOG_LEVEL_NUM_KEY as ATTRIBUTES_LOG_LEVEL_NUM_KEY, ATTRIBUTES_MESSAGE_KEY as ATTRIBUTES_MESSAGE_KEY, ATTRIBUTES_MESSAGE_TEMPLATE_KEY as ATTRIBUTES_MESSAGE_TEMPLATE_KEY, ATTRIBUTES_SPAN_TYPE_KEY as ATTRIBUTES_SPAN_TYPE_KEY, LEVEL_NUMBERS as LEVEL_NUMBERS, PENDING_SPAN_NAME_SUFFIX as PENDING_SPAN_NAME_SUFFIX, log_level_attributes as log_level_attributes
+from ..constants import ATTRIBUTES_LOG_LEVEL_NUM_KEY as ATTRIBUTES_LOG_LEVEL_NUM_KEY, ATTRIBUTES_MESSAGE_KEY as ATTRIBUTES_MESSAGE_KEY, ATTRIBUTES_MESSAGE_TEMPLATE_KEY as ATTRIBUTES_MESSAGE_TEMPLATE_KEY, LEVEL_NUMBERS as LEVEL_NUMBERS, log_level_attributes as log_level_attributes
 from ..db_statement_summary import message_from_db_statement as message_from_db_statement
 from ..scrubbing import BaseScrubber as BaseScrubber
 from ..utils import ReadableSpanDict as ReadableSpanDict, is_asgi_send_receive_span_name as is_asgi_send_receive_span_name, is_instrumentation_suppressed as is_instrumentation_suppressed, span_to_dict as span_to_dict, truncate_string as truncate_string

logfire-api/logfire_api/_internal/exporters/wrapper.pyi

@@ -1,6 +1,8 @@
 from _typeshed import Incomplete
 from dataclasses import dataclass
 from opentelemetry import context
+from opentelemetry.sdk._logs import LogData, LogRecordProcessor
+from opentelemetry.sdk._logs.export import LogExportResult, LogExporter
 from opentelemetry.sdk.metrics.export import AggregationTemporality as AggregationTemporality, MetricExportResult, MetricExporter, MetricsData
 from opentelemetry.sdk.metrics.view import Aggregation as Aggregation
 from opentelemetry.sdk.trace import ReadableSpan, Span, SpanProcessor
@@ -31,3 +33,18 @@ class WrapperSpanProcessor(SpanProcessor):
     def on_end(self, span: ReadableSpan) -> None: ...
     def shutdown(self) -> None: ...
     def force_flush(self, timeout_millis: int = 30000) -> bool: ...
+
+@dataclass
+class WrapperLogExporter(LogExporter):
+    """A base class for LogExporters that wrap another exporter."""
+    exporter: LogExporter
+    def export(self, batch: Sequence[LogData]) -> LogExportResult: ...
+    def shutdown(self): ...
+
+@dataclass
+class WrapperLogProcessor(LogRecordProcessor):
+    """A base class for SpanProcessors that wrap another processor."""
+    processor: LogRecordProcessor
+    def emit(self, log_data: LogData): ...
+    def shutdown(self): ...
+    def force_flush(self, timeout_millis: int = 30000): ...

logfire-api/logfire_api/_internal/integrations/flask.pyi

@@ -1,9 +1,10 @@
 from flask.app import Flask
+from logfire._internal.stack_info import warn_at_user_stacklevel as warn_at_user_stacklevel
 from logfire._internal.utils import maybe_capture_server_headers as maybe_capture_server_headers
 from logfire.integrations.flask import CommenterOptions as CommenterOptions, RequestHook as RequestHook, ResponseHook as ResponseHook
 from typing import Any
 
-def instrument_flask(app: Flask, *, capture_headers: bool, enable_commenter: bool, commenter_options: CommenterOptions | None, exclude_urls: str | None = None, request_hook: RequestHook | None = None, response_hook: ResponseHook | None = None, **kwargs: Any):
+def instrument_flask(app: Flask, *, capture_headers: bool, enable_commenter: bool, commenter_options: CommenterOptions | None, excluded_urls: str | None = None, request_hook: RequestHook | None = None, response_hook: ResponseHook | None = None, **kwargs: Any):
     """Instrument `app` so that spans are automatically created for each request.
 
     See the `Logfire.instrument_flask` method for details.

logfire-api/logfire_api/_internal/logs.pyi

@@ -0,0 +1,28 @@
+from dataclasses import dataclass
+from opentelemetry._logs import LogRecord, Logger, LoggerProvider
+from opentelemetry.util.types import Attributes
+from threading import Lock
+from weakref import WeakSet
+
+@dataclass
+class ProxyLoggerProvider(LoggerProvider):
+    """A logger provider that wraps another internal logger provider allowing it to be re-assigned."""
+    provider: LoggerProvider
+    loggers: WeakSet[ProxyLogger] = ...
+    lock: Lock = ...
+    suppressed_scopes: set[str] = ...
+    def get_logger(self, name: str, version: str | None = None, schema_url: str | None = None, attributes: Attributes | None = None) -> Logger: ...
+    def suppress_scopes(self, *scopes: str) -> None: ...
+    def set_provider(self, logger_provider: LoggerProvider) -> None: ...
+    def __getattr__(self, item: str): ...
+
+@dataclass(eq=False)
+class ProxyLogger(Logger):
+    logger: Logger
+    name: str
+    version: str | None = ...
+    schema_url: str | None = ...
+    attributes: Attributes | None = ...
+    def emit(self, record: LogRecord) -> None: ...
+    def set_logger(self, provider: LoggerProvider) -> None: ...
+    def __getattr__(self, item: str): ...

logfire-api/logfire_api/_internal/main.pyi

@@ -14,7 +14,7 @@ from ..version import VERSION as VERSION
 from .auto_trace import AutoTraceModule as AutoTraceModule, install_auto_tracing as install_auto_tracing
 from .config import GLOBAL_CONFIG as GLOBAL_CONFIG, LogfireConfig as LogfireConfig
 from .config_params import PydanticPluginRecordValues as PydanticPluginRecordValues
-from .constants import ATTRIBUTES_JSON_SCHEMA_KEY as ATTRIBUTES_JSON_SCHEMA_KEY, ATTRIBUTES_LOG_LEVEL_NUM_KEY as ATTRIBUTES_LOG_LEVEL_NUM_KEY, ATTRIBUTES_MESSAGE_KEY as ATTRIBUTES_MESSAGE_KEY, ATTRIBUTES_MESSAGE_TEMPLATE_KEY as ATTRIBUTES_MESSAGE_TEMPLATE_KEY, ATTRIBUTES_SAMPLE_RATE_KEY as ATTRIBUTES_SAMPLE_RATE_KEY, ATTRIBUTES_SPAN_TYPE_KEY as ATTRIBUTES_SPAN_TYPE_KEY, ATTRIBUTES_TAGS_KEY as ATTRIBUTES_TAGS_KEY, DISABLE_CONSOLE_KEY as DISABLE_CONSOLE_KEY, LEVEL_NUMBERS as LEVEL_NUMBERS, LevelName as LevelName, NULL_ARGS_KEY as NULL_ARGS_KEY, OTLP_MAX_INT_SIZE as OTLP_MAX_INT_SIZE, log_level_attributes as log_level_attributes
+from .constants import ATTRIBUTES_JSON_SCHEMA_KEY as ATTRIBUTES_JSON_SCHEMA_KEY, ATTRIBUTES_LOG_LEVEL_NUM_KEY as ATTRIBUTES_LOG_LEVEL_NUM_KEY, ATTRIBUTES_MESSAGE_KEY as ATTRIBUTES_MESSAGE_KEY, ATTRIBUTES_MESSAGE_TEMPLATE_KEY as ATTRIBUTES_MESSAGE_TEMPLATE_KEY, ATTRIBUTES_SAMPLE_RATE_KEY as ATTRIBUTES_SAMPLE_RATE_KEY, ATTRIBUTES_SPAN_TYPE_KEY as ATTRIBUTES_SPAN_TYPE_KEY, ATTRIBUTES_TAGS_KEY as ATTRIBUTES_TAGS_KEY, DISABLE_CONSOLE_KEY as DISABLE_CONSOLE_KEY, LEVEL_NUMBERS as LEVEL_NUMBERS, LevelName as LevelName, OTLP_MAX_INT_SIZE as OTLP_MAX_INT_SIZE, log_level_attributes as log_level_attributes
 from .formatter import logfire_format as logfire_format, logfire_format_with_magic as logfire_format_with_magic
 from .instrument import instrument as instrument
 from .integrations.asgi import ASGIApp as ASGIApp, ASGIInstrumentKwargs as ASGIInstrumentKwargs
@@ -615,7 +615,7 @@ class Logfire:
     def instrument_psycopg(self, conn_or_module: PsycopgConnection | Psycopg2Connection, **kwargs: Any) -> None: ...
     @overload
     def instrument_psycopg(self, conn_or_module: None | Literal['psycopg', 'psycopg2'] | ModuleType = None, enable_commenter: bool = False, commenter_options: PsycopgCommenterOptions | None = None, **kwargs: Any) -> None: ...
-    def instrument_flask(self, app: Flask, *, capture_headers: bool = False, enable_commenter: bool = True, commenter_options: FlaskCommenterOptions | None = None, exclude_urls: str | None = None, request_hook: FlaskRequestHook | None = None, response_hook: FlaskResponseHook | None = None, **kwargs: Any) -> None:
+    def instrument_flask(self, app: Flask, *, capture_headers: bool = False, enable_commenter: bool = True, commenter_options: FlaskCommenterOptions | None = None, excluded_urls: str | None = None, request_hook: FlaskRequestHook | None = None, response_hook: FlaskResponseHook | None = None, **kwargs: Any) -> None:
         """Instrument `app` so that spans are automatically created for each request.
 
         Uses the
@@ -628,7 +628,7 @@ class Logfire:
             enable_commenter: Adds comments to SQL queries performed by Flask, so that database logs have additional context.
             commenter_options: Configure the tags to be added to the SQL comments.
                 See more about it on the [SQLCommenter Configurations](https://opentelemetry-python-contrib.readthedocs.io/en/latest/instrumentation/flask/flask.html#sqlcommenter-configurations).
-            exclude_urls: A string containing a comma-delimited list of regexes used to exclude URLs from tracking.
+            excluded_urls: A string containing a comma-delimited list of regexes used to exclude URLs from tracking.
             request_hook: A function called right after a span is created for a request.
             response_hook: A function called right before a span is finished for the response.
             **kwargs: Additional keyword arguments to pass to the OpenTelemetry Flask instrumentation.
@@ -1110,12 +1110,8 @@ def prepare_otlp_attributes(attributes: dict[str, Any]) -> dict[str, otel_types.
 
     This will convert any non-OpenTelemetry compatible types to JSON.
     """
-def set_user_attribute(otlp_attributes: dict[str, otel_types.AttributeValue], key: str, value: Any) -> tuple[str, otel_types.AttributeValue]:
-    """Convert a user attribute to an OpenTelemetry compatible type and add it to the given dictionary.
-
-    Returns the final key and value that was added to the dictionary.
-    The key will be the original key unless the value was `None`, in which case it will be `NULL_ARGS_KEY`.
-    """
+def prepare_otlp_attribute(value: Any) -> otel_types.AttributeValue:
+    """Convert a user attribute to an OpenTelemetry compatible type."""
 def set_user_attributes_on_raw_span(span: Span, attributes: dict[str, Any]) -> None: ...
 P = ParamSpec('P')
 R = TypeVar('R')