microbootstrap 1.5.0__tar.gz → 1.5.2__tar.gz

{microbootstrap-1.5.0 → microbootstrap-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: microbootstrap
-Version: 1.5.0
+Version: 1.5.2
 Summary: Package for bootstrapping new micro-services
 Keywords: python,microservice,bootstrap,opentelemetry,logging,error-tracing,litestar,fastapi,fastmcp,mcp
 Author: community-of-python

{microbootstrap-1.5.0 → microbootstrap-1.5.2}/microbootstrap/__init__.py

@@ -5,6 +5,7 @@ from microbootstrap.instruments.opentelemetry_instrument import (
     FastStreamOpentelemetryConfig,
     FastStreamTelemetryMiddlewareProtocol,
     OpentelemetryConfig,
+    opentelemetry_baggage_scope,
 )
 from microbootstrap.instruments.prometheus_instrument import (
     FastApiPrometheusConfig,
@@ -45,4 +46,5 @@ __all__ = (
     "PyroscopeConfig",
     "SentryConfig",
     "SwaggerConfig",
+    "opentelemetry_baggage_scope",
 )

{microbootstrap-1.5.0 → microbootstrap-1.5.2}/microbootstrap/bootstrappers/faststream.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
+import functools
 import json
 import typing
 
 import prometheus_client
+import sentry_sdk
 import structlog
 import typing_extensions
 from faststream._internal.logger.logger_proxy import RealLoggerObject
@@ -26,6 +28,29 @@ from microbootstrap.settings import FastStreamSettings
 
 
 tracer: typing.Final = trace.get_tracer(__name__)
+MessageT = typing.TypeVar("MessageT")
+ResponseT = typing.TypeVar("ResponseT")
+
+
+def _with_sentry_isolation_scope(
+    process_message: typing.Callable[[MessageT], typing.Awaitable[ResponseT]],
+) -> typing.Callable[[MessageT], typing.Awaitable[ResponseT]]:
+    @functools.wraps(process_message)
+    async def isolated_process_message(message: MessageT) -> ResponseT:
+        with sentry_sdk.isolation_scope():
+            return await process_message(message)
+
+    return isolated_process_message
+
+
+def _isolate_faststream_subscribers(application: AsgiFastStream) -> None:
+    for broker in application.brokers:
+        for subscriber in broker.subscribers:
+            object.__setattr__(
+                subscriber,
+                "process_message",
+                _with_sentry_isolation_scope(subscriber.process_message),
+            )
 
 
 class KwargsAsgiFastStream(AsgiFastStream):
@@ -51,7 +76,18 @@ class FastStreamBootstrapper(ApplicationBootstrapper[FastStreamSettings, AsgiFas
         }
 
 
-FastStreamBootstrapper.use_instrument()(SentryInstrument)
+@FastStreamBootstrapper.use_instrument()
+class FastStreamSentryInstrument(SentryInstrument):
+    def bootstrap_after(self, application: AsgiFastStream) -> AsgiFastStream:  # type: ignore[override]
+        # FastStream logs handler errors after custom broker middlewares exit, so the isolation scope
+        # must enclose the subscriber's complete processing lifecycle.
+        if application.brokers:
+            _isolate_faststream_subscribers(application)
+        else:
+            application.on_startup(functools.partial(_isolate_faststream_subscribers, application))
+        return application
+
+
 FastStreamBootstrapper.use_instrument()(PyroscopeInstrument)
 
 

{microbootstrap-1.5.0 → microbootstrap-1.5.2}/microbootstrap/instruments/opentelemetry_instrument.py

@@ -1,4 +1,5 @@
 from __future__ import annotations
+import contextlib
 import dataclasses
 import logging
 import os
@@ -6,7 +7,7 @@ import typing
 
 import pydantic
 import structlog
-from opentelemetry import baggage
+from opentelemetry import baggage, context
 from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
 from opentelemetry.instrumentation.dependencies import DependencyConflictError
 from opentelemetry.instrumentation.environment_variables import OTEL_PYTHON_DISABLED_INSTRUMENTATIONS
@@ -39,6 +40,25 @@ if typing.TYPE_CHECKING:
 OpentelemetryConfigT = typing.TypeVar("OpentelemetryConfigT", bound="OpentelemetryConfig")
 
 
+@contextlib.contextmanager
+def opentelemetry_baggage_scope(
+    baggage_values: typing.Mapping[str, object | None],
+) -> typing.Iterator[None]:
+    baggage_context = context.get_current()
+    for key, value in baggage_values.items():
+        baggage_context = (
+            baggage.set_baggage(key, value, context=baggage_context)
+            if value is not None
+            else baggage.remove_baggage(key, context=baggage_context)
+        )
+
+    token: typing.Final = context.attach(baggage_context)
+    try:
+        yield
+    finally:
+        context.detach(token)
+
+
 @dataclasses.dataclass()
 class OpenTelemetryInstrumentor:
     instrumentor: BaseInstrumentor

{microbootstrap-1.5.0 → microbootstrap-1.5.2}/microbootstrap/middlewares/fastapi.py

@@ -26,10 +26,7 @@ def build_fastapi_logging_middleware(
                 return await call_next(request)
 
             start_time: typing.Final = time.perf_counter_ns()
-            try:
-                response = await call_next(request)
-            except Exception:  # noqa: BLE001
-                response = fastapi.Response(status_code=500)
+            response = await call_next(request)
 
             fill_log_message(
                 "exception" if response.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR else "info",

{microbootstrap-1.5.0 → microbootstrap-1.5.2}/pyproject.toml

@@ -58,7 +58,7 @@ dependencies = [
     "opentelemetry-instrumentation-asgi>=0.46b0",
     "orjson>=3.10.18",
 ]
-version = "1.5.0"
+version = "1.5.2"
 
 [[project.authors]]
 name = "community-of-python"

{microbootstrap-1.5.0 → microbootstrap-1.5.2}/pyproject.toml.orig

@@ -58,7 +58,7 @@ dependencies = [
     "opentelemetry-instrumentation-asgi>=0.46b0",
     "orjson>=3.10.18",
 ]
-version = "1.5.0"
+version = "1.5.2"
 authors = [{ name = "community-of-python" }]
 
 [project.optional-dependencies]