beamlit 0.0.34rc53__py3-none-any.whl → 0.0.34rc55__py3-none-any.whl

beamlit/common/instrumentation.py

@@ -1,7 +1,12 @@
+import logging
 from typing import Any
 
 from fastapi import FastAPI
-from opentelemetry import metrics, trace
+from opentelemetry import _logs, metrics, trace
+from opentelemetry._logs import set_logger_provider
+from opentelemetry.exporter.otlp.proto.grpc._log_exporter import (
+    OTLPLogExporter,
+)
 from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import (
     OTLPMetricExporter,
 )
@@ -10,8 +15,9 @@ from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (
 )
 from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
 from opentelemetry.instrumentation.httpx import HTTPXClientInstrumentor
-from opentelemetry.instrumentation.logging import LoggingInstrumentor
 from opentelemetry.metrics import NoOpMeterProvider
+from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
+from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
 from opentelemetry.sdk.metrics import MeterProvider
 from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
 from opentelemetry.sdk.resources import Resource
@@ -24,6 +30,7 @@ from .settings import get_settings
 
 tracer: trace.Tracer | None = None
 meter: metrics.Meter | None = None
+logger: LoggerProvider | None = None
 
 
 def get_tracer() -> trace.Tracer:
@@ -38,6 +45,12 @@ def get_meter() -> metrics.Meter:
     return meter
 
 
+def get_logger() -> LoggerProvider:
+    if logger is None:
+        raise Exception("Logger is not initialized")
+    return logger
+
+
 def get_resource_attributes() -> Dict[str, Any]:
     resources = Resource.create()
     resources_dict: Dict[str, Any] = {}
@@ -68,12 +81,17 @@ def get_span_exporter() -> OTLPSpanExporter | None:
     return OTLPSpanExporter()
 
 
+def get_log_exporter() -> OTLPLogExporter | None:
+    settings = get_settings()
+    if not settings.enable_opentelemetry:
+        return None
+    return OTLPLogExporter()
+
+
 def instrument_app(app: FastAPI):
     global tracer
     global meter
     settings = get_settings()
-    if settings is None:
-        raise Exception("Settings are not initialized")
 
     if not settings.enable_opentelemetry:
         # Use NoOp implementations to stub tracing and metrics
@@ -113,11 +131,30 @@ def instrument_app(app: FastAPI):
     else:
         meter = metrics.get_meter(__name__)
 
+    if not isinstance(_logs.get_logger_provider(), LoggerProvider):
+        logger_provider = LoggerProvider()
+        set_logger_provider(logger_provider)
+        logger_provider.add_log_record_processor(
+            BatchLogRecordProcessor(get_log_exporter())
+        )
+        handler = LoggingHandler(
+            level=logging.NOTSET, logger_provider=logger_provider
+        )
+        logging.getLogger().addHandler(handler)
+    else:
+        logger_provider = _logs.get_logger_provider()
+
     # Only instrument the app when OpenTelemetry is enabled
-    FastAPIInstrumentor.instrument_app(
-        app=app, tracer_provider=trace.get_tracer_provider(), meter_provider=metrics.get_meter_provider()
-    )
-    HTTPXClientInstrumentor().instrument(meter_provider=metrics.get_meter_provider())
-    LoggingInstrumentor(tracer_provider=trace.get_tracer_provider()).instrument(
-        set_logging_format=True
-    )
+    FastAPIInstrumentor.instrument_app(app)
+    HTTPXClientInstrumentor().instrument()
+
+
+def shutdown_instrumentation():
+    if tracer is not None:
+        trace_provider = trace.get_tracer_provider()
+        if isinstance(trace_provider, TracerProvider):
+            trace_provider.shutdown()
+    if meter is not None:
+        meter_provider = metrics.get_meter_provider()
+        if isinstance(meter_provider, MeterProvider):
+            meter_provider.shutdown()

beamlit/serve/app.py

@@ -3,6 +3,7 @@ import importlib
 import os
 import sys
 import traceback
+from contextlib import asynccontextmanager
 from logging import getLogger
 from uuid import uuid4
 
@@ -13,9 +14,9 @@ from traceloop.sdk import Traceloop
 
 from beamlit.common import HTTPError, get_settings, init
 from beamlit.common.instrumentation import (
-    get_metrics_exporter,
     get_resource_attributes,
     get_span_exporter,
+    shutdown_instrumentation,
     instrument_app,
 )
 
@@ -41,16 +42,14 @@ logger.info(
     f" on {settings.server.host}:{settings.server.port}"
 )
 
-if settings.enable_opentelemetry:
-    Traceloop.init(
-        app_name=settings.name,
-        exporter=get_span_exporter(),
-        metrics_exporter=get_metrics_exporter(),
-        resource_attributes=get_resource_attributes(),
-        should_enrich_metrics=os.getenv("ENRICHED_METRICS", "false") == "true",
-    )
 
-app = FastAPI(docs_url=None, redoc_url=None)
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    yield
+    shutdown_instrumentation()
+
+
+app = FastAPI(docs_url=None, redoc_url=None, lifespan=lifespan)
 app.add_middleware(
     CorrelationIdMiddleware,
     header_name="x-beamlit-request-id",
@@ -59,6 +58,13 @@ app.add_middleware(
 app.add_middleware(AddProcessTimeHeader)
 app.add_middleware(AccessLogMiddleware)
 instrument_app(app)
+if settings.enable_opentelemetry:
+    Traceloop.init(
+        app_name=settings.name,
+        exporter=get_span_exporter(),
+        resource_attributes=get_resource_attributes(),
+        should_enrich_metrics=os.getenv("ENRICHED_METRICS", "false") == "true",
+    )
 
 
 @app.get("/health")

{beamlit-0.0.34rc53.dist-info → beamlit-0.0.34rc55.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: beamlit
-Version: 0.0.34rc53
+Version: 0.0.34rc55
 Summary: Add your description here
 Author-email: cploujoux <ch.ploujoux@gmail.com>
 Requires-Python: >=3.12
@@ -17,7 +17,6 @@ Requires-Dist: opentelemetry-api>=1.28.2
 Requires-Dist: opentelemetry-exporter-otlp>=1.28.2
 Requires-Dist: opentelemetry-instrumentation-fastapi>=0.49b2
 Requires-Dist: opentelemetry-instrumentation-httpx>=0.49b2
-Requires-Dist: opentelemetry-instrumentation-logging>=0.49b2
 Requires-Dist: opentelemetry-sdk>=1.28.2
 Requires-Dist: pydantic-settings<2.7.0,>=2.6.1
 Requires-Dist: pydantic<2.11.0,>=2.10.3

{beamlit-0.0.34rc53.dist-info → beamlit-0.0.34rc55.dist-info}/RECORD

@@ -130,7 +130,7 @@ beamlit/authentication/credentials.py,sha256=p_1xenabCbQuRz7BiFk7oTK4uCxAt_zoyku
 beamlit/authentication/device_mode.py,sha256=tmr22gllKOZwBRub_QjF5pYa425x-nE8tQNpZ_EGR6g,3644
 beamlit/common/__init__.py,sha256=saX5X3hRCJ9erSlXuSkZ2VGgquvpgdcofAU_9sM4bCE,354
 beamlit/common/error.py,sha256=f9oJDFxhoHK-vpjxBgEp0NwWIk0N_THPemUI7uQxVzU,270
-beamlit/common/instrumentation.py,sha256=GVYeat7qCcqzDoKSYig3s8ZCC172R9JiQIr3Evv3kik,4293
+beamlit/common/instrumentation.py,sha256=bW3UN0Ca24zPFZSYjqWkrFfBVDp_yL10T3jVD403KvI,5386
 beamlit/common/logger.py,sha256=nN_dSOl4bs13QU3Rod-w3e3jYOnlSrHx3_bs-ACY6Aw,1115
 beamlit/common/secrets.py,sha256=sid81bOe3LflkMKDHwBsBs9nIju8bp5-v9qU9gkyNMc,212
 beamlit/common/settings.py,sha256=b2rvby-ufG3M0AB1ReoWFM-1EzF1LaE-gbokO9HvQDI,3810
@@ -252,10 +252,10 @@ beamlit/models/websocket_channel.py,sha256=jg3vN7yS_oOIwGtndtIUr1LsyEA58RXLXahqS
 beamlit/models/workspace.py,sha256=l__bIpbA4oJvxXo7UbEoCcqkvu9MiNt5aXXpZ3bgwHg,4309
 beamlit/models/workspace_labels.py,sha256=WbnUY6eCTkUNdY7hhhSF-KQCl8fWFfkCf7hzCTiNp4A,1246
 beamlit/models/workspace_user.py,sha256=70CcifQWYbeWG7TDui4pblTzUe5sVK0AS19vNCzKE8g,3423
-beamlit/serve/app.py,sha256=DXWxQoMeuA5FYvBMyLrP94OEWQbwLf4GZk3I9fkwSPA,3523
+beamlit/serve/app.py,sha256=gYQvUK_S7g0Em-idND8HrVDqgg5LlIemheSGlX2Jj8U,3638
 beamlit/serve/middlewares/__init__.py,sha256=1dVmnOmhAQWvWktqHkKSIX-YoF6fmMU8xkUQuhg_rJU,148
 beamlit/serve/middlewares/accesslog.py,sha256=Mu4T4_9OvHybjA0ApzZFpgi2C8f3X1NbUk-76v634XM,631
 beamlit/serve/middlewares/processtime.py,sha256=lDAaIasZ4bwvN-HKHvZpaD9r-yrkVNZYx4abvbjbrCg,411
-beamlit-0.0.34rc53.dist-info/METADATA,sha256=mYmSQ4b1y6e0X4Ead4ZQOE4Bk0akR7ot4Q-7NOCzC9I,2405
-beamlit-0.0.34rc53.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-beamlit-0.0.34rc53.dist-info/RECORD,,
+beamlit-0.0.34rc55.dist-info/METADATA,sha256=4yvNNr_yX2lRYsd14PFw8dB6ykRdp1BIBe0lKOeckM4,2344
+beamlit-0.0.34rc55.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+beamlit-0.0.34rc55.dist-info/RECORD,,