Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce tracing with OpenTelemetry #1281

Merged
merged 6 commits into from
Jul 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions mlserver/grpc/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from ..handlers import DataPlane, ModelRepositoryHandlers
from ..settings import Settings
from ..tracing import get_tracer_provider

from .servicers import InferenceServicer
from .model_repository import ModelRepositoryServicer
Expand All @@ -12,6 +13,8 @@
from .interceptors import LoggingInterceptor, PromServerInterceptor
from .logging import logger

from opentelemetry.instrumentation.grpc import aio_server_interceptor, filters

# Workers used for non-AsyncIO workloads (which aren't any in our case)
DefaultGrpcWorkers = 5

Expand Down Expand Up @@ -46,6 +49,25 @@ def _create_server(self):
PromServerInterceptor(enable_handling_time_histogram=True)
)

if self._settings.tracing_server:
tracer_provider = get_tracer_provider(self._settings)
excluded_urls = filters.negate(
filters.any_of(
filters.full_method_name(
"/inference.GRPCInferenceService/ServerLive"
),
filters.full_method_name(
"/inference.GRPCInferenceService/ServerReady"
),
)
)

interceptors.append(
aio_server_interceptor(
tracer_provider=tracer_provider, filter_=excluded_urls
)
)

self._server = aio.server(
ThreadPoolExecutor(max_workers=DefaultGrpcWorkers),
interceptors=tuple(interceptors),
Expand Down
19 changes: 19 additions & 0 deletions mlserver/rest/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
from fastapi.routing import APIRoute as FastAPIRoute
from fastapi.middleware.cors import CORSMiddleware
from fastapi.middleware.gzip import GZipMiddleware
from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor

from starlette_exporter import PrometheusMiddleware

from .endpoints import Endpoints, ModelRepositoryEndpoints
Expand All @@ -13,6 +15,7 @@

from ..settings import Settings
from ..handlers import DataPlane, ModelRepositoryHandlers
from ..tracing import get_tracer_provider


class APIRoute(FastAPIRoute):
Expand Down Expand Up @@ -145,6 +148,22 @@ def create_app(
docs_url=None,
redoc_url=None,
)

if settings.tracing_server:
tracer_provider = get_tracer_provider(settings)
excluded_urls = ",".join(
[
"/v2/health/live",
"/v2/health/ready",
]
)

FastAPIInstrumentor.instrument_app(
app,
tracer_provider=tracer_provider,
excluded_urls=excluded_urls,
)

app.router.route_class = APIRoute
app.add_middleware(GZipMiddleware)
if settings.cors_settings is not None:
Expand Down
6 changes: 5 additions & 1 deletion mlserver/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,16 @@ class Config:
logging_settings: Optional[Union[str, Dict]] = None
"""Path to logging config file or dictionary configuration."""

# Kakfa Server settings
# Kafka Server settings
kafka_enabled: bool = False
kafka_servers: str = "localhost:9092"
kafka_topic_input: str = "mlserver-input"
kafka_topic_output: str = "mlserver-output"

# OpenTelemetry Tracing settings
tracing_server: Optional[str] = None
"""Server name used to export OpenTelemetry tracing to collector service."""

# Custom server settings
_custom_rest_server_settings: Optional[dict] = None
_custom_metrics_server_settings: Optional[dict] = None
Expand Down
39 changes: 39 additions & 0 deletions mlserver/tracing.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
from typing import Optional

from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
from opentelemetry.sdk.resources import Resource, SERVICE_NAME, SERVICE_VERSION
from opentelemetry.sdk.trace import TracerProvider
from opentelemetry.sdk.trace.export import BatchSpanProcessor, SpanExporter

from mlserver.settings import Settings


_TRACER_PROVIDER: Optional[TracerProvider] = None


def _create_resource(settings: Settings) -> Resource:
return Resource(
attributes={
SERVICE_NAME: settings.server_name,
SERVICE_VERSION: settings.server_version,
}
)


def _create_span_exporter(settings: Settings) -> SpanExporter:
return OTLPSpanExporter(insecure=True, endpoint=settings.tracing_server)


def get_tracer_provider(settings: Settings) -> TracerProvider:
global _TRACER_PROVIDER
if _TRACER_PROVIDER is not None:
return _TRACER_PROVIDER

resource = _create_resource(settings)
tracer_provider = TracerProvider(resource=resource)
span_exporter = _create_span_exporter(settings)
span_processor = BatchSpanProcessor(span_exporter)
tracer_provider.add_span_processor(span_processor)

_TRACER_PROVIDER = tracer_provider
return _TRACER_PROVIDER
Loading