aidial-sdk 0.45.0.dev1__tar.gz → 0.46.0__tar.gz

{aidial_sdk-0.45.0.dev1 → aidial_sdk-0.46.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aidial-sdk
-Version: 0.45.0.dev1
+Version: 0.46.0
 Summary: Framework to create applications and model adapters for AI DIAL
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -19,14 +19,14 @@ Requires-Dist: fastapi (>=0.51,<1.0)
 Requires-Dist: httpx (>=0.25.0,<1.0) ; extra == "httpx"
 Requires-Dist: opentelemetry-api (>=1.22.0,<2.0) ; extra == "telemetry"
 Requires-Dist: opentelemetry-exporter-otlp-proto-grpc (>=1.22.0,<2.0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-exporter-prometheus (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-aiohttp-client (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-fastapi (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-httpx (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-logging (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-requests (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-system-metrics (>=0.43b0) ; extra == "telemetry"
-Requires-Dist: opentelemetry-instrumentation-urllib (>=0.43b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-exporter-prometheus (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-aiohttp-client (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-fastapi (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-httpx (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-logging (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-requests (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-system-metrics (>=0.64b0) ; extra == "telemetry"
+Requires-Dist: opentelemetry-instrumentation-urllib (>=0.64b0) ; extra == "telemetry"
 Requires-Dist: opentelemetry-sdk (>=1.22.0,<2.0) ; extra == "telemetry"
 Requires-Dist: prometheus-client (>=0.17.1,<1.0) ; extra == "telemetry"
 Requires-Dist: pydantic (>=1.10.17,<3)

{aidial_sdk-0.45.0.dev1 → aidial_sdk-0.46.0}/aidial_sdk/telemetry/init.py

@@ -18,7 +18,7 @@ from opentelemetry.instrumentation.system_metrics import (
 )
 from opentelemetry.instrumentation.urllib import URLLibInstrumentor
 from opentelemetry.metrics import set_meter_provider
-from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
+from opentelemetry.sdk._logs import LoggerProvider
 from opentelemetry.sdk._logs.export import (
     BatchLogRecordProcessor,
     ConsoleLogRecordExporter,
@@ -37,6 +37,8 @@ from prometheus_client import start_http_server
 from aidial_sdk.telemetry.types import TelemetryConfig
 from aidial_sdk.utils._logging import remove_stream_handlers
 
+_log = logging.getLogger(__name__)
+
 
 def init_telemetry(app: FastAPI | None, config: TelemetryConfig):
     resource = Resource.create(
@@ -84,13 +86,6 @@ def init_telemetry(app: FastAPI | None, config: TelemetryConfig):
         except ImportError:
             pass
 
-        set_logging_format = config.tracing.logging
-        if set_logging_format:
-            # Remove any competing handlers to avoid duplicate logging
-            remove_stream_handlers(logging.getLogger(), sys.stderr)
-
-        LoggingInstrumentor().instrument(set_logging_format=set_logging_format)
-
     if config.logs is not None:
         # Adding a handler to the root logger which exports the logs to OTLP or to the console as JSON.
         provider = LoggerProvider(resource=resource)
@@ -118,7 +113,24 @@ def init_telemetry(app: FastAPI | None, config: TelemetryConfig):
             )
 
         set_logger_provider(provider)
-        root.addHandler(LoggingHandler())
+
+    if config.tracing is not None or config.logs is not None:
+        # OTel's text format writes to stderr, which `console_export` takes over.
+        set_logging_format = (
+            config.tracing is not None
+            and config.tracing.logging
+            and not (config.logs is not None and config.logs.console_export)
+        )
+
+        if set_logging_format:
+            # Remove any competing handlers to avoid duplicate logging
+            remove_stream_handlers(logging.getLogger(), sys.stderr)
+
+        LoggingInstrumentor().instrument(
+            set_logging_format=set_logging_format,
+            inject_trace_context=config.tracing is not None,
+            enable_log_auto_instrumentation=config.logs is not None,
+        )
 
     if config.metrics is not None:
         metric_readers = []
@@ -142,4 +154,20 @@ def init_telemetry(app: FastAPI | None, config: TelemetryConfig):
 
     if app and (config.tracing is not None or config.metrics is not None):
         # FastAPI instrumentor reports both metrics and traces
+        excl = config.tracing.excluded_asgi_spans if config.tracing else []
+        _instrument_fastapi_app(app, excl)
+
+
+def _instrument_fastapi_app(app: FastAPI, exclude_spans: list[str]) -> None:
+    if not exclude_spans:
+        FastAPIInstrumentor.instrument_app(app)
+        return
+
+    try:
+        FastAPIInstrumentor.instrument_app(app, exclude_spans=exclude_spans)  # type: ignore
+    except TypeError:
+        _log.warning(
+            "OTEL_PYTHON_FASTAPI_EXCLUDE_SPANS is ignored: it requires "
+            "opentelemetry-instrumentation-fastapi>=0.48b0."
+        )
         FastAPIInstrumentor.instrument_app(app)

{aidial_sdk-0.45.0.dev1 → aidial_sdk-0.46.0}/aidial_sdk/telemetry/types.py

@@ -16,6 +16,9 @@ OTEL_EXPORTER_PROMETHEUS_PORT = int(
 OTEL_PYTHON_LOG_CORRELATION = (
     os.getenv("OTEL_PYTHON_LOG_CORRELATION", "false").lower() == "true"
 )
+OTEL_PYTHON_FASTAPI_EXCLUDE_SPANS = env_var_list(
+    "OTEL_PYTHON_FASTAPI_EXCLUDE_SPANS"
+)
 
 
 class LogsConfig(BaseModel):
@@ -30,6 +33,7 @@ class LogsConfig(BaseModel):
 class TracingConfig(BaseModel):
     otlp_export: bool = "otlp" in OTEL_TRACES_EXPORTER
     logging: bool = OTEL_PYTHON_LOG_CORRELATION
+    excluded_asgi_spans: list[str] = OTEL_PYTHON_FASTAPI_EXCLUDE_SPANS
 
 
 class MetricsConfig(BaseModel):

{aidial_sdk-0.45.0.dev1 → aidial_sdk-0.46.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aidial-sdk"
-version = "0.45.0.dev1"
+version = "0.46.0"
 description = "Framework to create applications and model adapters for AI DIAL"
 authors = [{ name = "EPAM RAIL", email = "SpecialEPM-DIALDevTeam@epam.com" }]
 license = "Apache-2.0"
@@ -23,14 +23,14 @@ telemetry = [
     "opentelemetry-sdk (>=1.22.0,<2.0)",
     "opentelemetry-api (>=1.22.0,<2.0)",
     "opentelemetry-exporter-otlp-proto-grpc (>=1.22.0,<2.0)",
-    "opentelemetry-instrumentation-aiohttp-client (>=0.43b0)",
-    "opentelemetry-instrumentation-fastapi (>=0.43b0)",
-    "opentelemetry-instrumentation-httpx (>=0.43b0)",
-    "opentelemetry-instrumentation-logging (>=0.43b0)",
-    "opentelemetry-instrumentation-requests (>=0.43b0)",
-    "opentelemetry-instrumentation-system-metrics (>=0.43b0)",
-    "opentelemetry-instrumentation-urllib (>=0.43b0)",
-    "opentelemetry-exporter-prometheus (>=0.43b0)",
+    "opentelemetry-instrumentation-aiohttp-client (>=0.64b0)",
+    "opentelemetry-instrumentation-fastapi (>=0.64b0)",
+    "opentelemetry-instrumentation-httpx (>=0.64b0)",
+    "opentelemetry-instrumentation-logging (>=0.64b0)",
+    "opentelemetry-instrumentation-requests (>=0.64b0)",
+    "opentelemetry-instrumentation-system-metrics (>=0.64b0)",
+    "opentelemetry-instrumentation-urllib (>=0.64b0)",
+    "opentelemetry-exporter-prometheus (>=0.64b0)",
     "prometheus-client (>=0.17.1,<1.0)",
 ]
 httpx = ["httpx (>=0.25.0,<1.0)"]
@@ -42,11 +42,11 @@ nox = "^2023.4.22"
 pillow = "^12.3.0"
 httpx = "^0.25.0"
 respx = "^0.21.1"
-aiohttp = "^3.14.3"
+aiohttp = "^3.14.4"
 aiointercept = "^0.1.7"
 requests = "^2.33"
 responses = "^0.25.3"
-httpx2 = "^2.12.0"         # required for Starlette.TestClient
+httpx2 = "^2.12.0"        # required for Starlette.TestClient
 openai = "^2.46.0"        # third-party logger for log-takeover tests
 
 [tool.poetry.group.lint.dependencies]