mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-03 09:53:45 +00:00
fix(telemetry): remove dependency on old telemetry config (#3830)
Some checks failed
SqlStore Integration Tests / test-postgres (3.13) (push) Failing after 0s
SqlStore Integration Tests / test-postgres (3.12) (push) Failing after 0s
Integration Auth Tests / test-matrix (oauth2_token) (push) Failing after 2s
Test External Providers Installed via Module / test-external-providers-from-module (venv) (push) Has been skipped
Test Llama Stack Build / generate-matrix (push) Successful in 8s
Test Llama Stack Build / build-custom-container-distribution (push) Failing after 10s
Integration Tests (Replay) / Integration Tests (, , , client=, ) (push) Failing after 12s
Test Llama Stack Build / build-single-provider (push) Failing after 11s
Python Package Build Test / build (3.12) (push) Failing after 10s
Test External API and Providers / test-external (venv) (push) Failing after 11s
Python Package Build Test / build (3.13) (push) Failing after 13s
Unit Tests / unit-tests (3.13) (push) Failing after 14s
Test Llama Stack Build / build (push) Failing after 12s
Unit Tests / unit-tests (3.12) (push) Failing after 21s
Test Llama Stack Build / build-ubi9-container-distribution (push) Failing after 57s
Vector IO Integration Tests / test-matrix (push) Failing after 1m13s
API Conformance Tests / check-schema-compatibility (push) Successful in 1m22s
UI Tests / ui-tests (22) (push) Successful in 1m33s
Pre-commit / pre-commit (push) Successful in 1m55s
Some checks failed
SqlStore Integration Tests / test-postgres (3.13) (push) Failing after 0s
SqlStore Integration Tests / test-postgres (3.12) (push) Failing after 0s
Integration Auth Tests / test-matrix (oauth2_token) (push) Failing after 2s
Test External Providers Installed via Module / test-external-providers-from-module (venv) (push) Has been skipped
Test Llama Stack Build / generate-matrix (push) Successful in 8s
Test Llama Stack Build / build-custom-container-distribution (push) Failing after 10s
Integration Tests (Replay) / Integration Tests (, , , client=, ) (push) Failing after 12s
Test Llama Stack Build / build-single-provider (push) Failing after 11s
Python Package Build Test / build (3.12) (push) Failing after 10s
Test External API and Providers / test-external (venv) (push) Failing after 11s
Python Package Build Test / build (3.13) (push) Failing after 13s
Unit Tests / unit-tests (3.13) (push) Failing after 14s
Test Llama Stack Build / build (push) Failing after 12s
Unit Tests / unit-tests (3.12) (push) Failing after 21s
Test Llama Stack Build / build-ubi9-container-distribution (push) Failing after 57s
Vector IO Integration Tests / test-matrix (push) Failing after 1m13s
API Conformance Tests / check-schema-compatibility (push) Successful in 1m22s
UI Tests / ui-tests (22) (push) Successful in 1m33s
Pre-commit / pre-commit (push) Successful in 1m55s
# What does this PR do? old telemetry config was removed in #3815 ## Test Plan ❯ OTEL_SERVICE_NAME=aloha OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4318 uv run llama stack run starter <img width="1888" height="605" alt="image" src="https://github.com/user-attachments/assets/dd5cc9f0-213a-4dc6-9385-f61a3a13b4c3" />
This commit is contained in:
parent
07ff15d917
commit
b3099d40e2
2 changed files with 25 additions and 36 deletions
|
|
@ -177,6 +177,18 @@ class DistributionSpec(BaseModel):
|
||||||
|
|
||||||
|
|
||||||
class TelemetryConfig(BaseModel):
|
class TelemetryConfig(BaseModel):
|
||||||
|
"""
|
||||||
|
Configuration for telemetry.
|
||||||
|
|
||||||
|
Llama Stack uses OpenTelemetry for telemetry. Please refer to https://opentelemetry.io/docs/languages/sdk-configuration/
|
||||||
|
for env variables to configure the OpenTelemetry SDK.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
```bash
|
||||||
|
OTEL_SERVICE_NAME=llama-stack OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4318 uv run llama stack run starter
|
||||||
|
```
|
||||||
|
"""
|
||||||
|
|
||||||
enabled: bool = Field(default=False, description="enable or disable telemetry")
|
enabled: bool = Field(default=False, description="enable or disable telemetry")
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,10 +12,8 @@ from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExp
|
||||||
from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
|
from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
|
||||||
from opentelemetry.sdk.metrics import MeterProvider
|
from opentelemetry.sdk.metrics import MeterProvider
|
||||||
from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
|
from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
|
||||||
from opentelemetry.sdk.resources import Resource
|
|
||||||
from opentelemetry.sdk.trace import TracerProvider
|
from opentelemetry.sdk.trace import TracerProvider
|
||||||
from opentelemetry.sdk.trace.export import BatchSpanProcessor
|
from opentelemetry.sdk.trace.export import BatchSpanProcessor
|
||||||
from opentelemetry.semconv.resource import ResourceAttributes
|
|
||||||
from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
|
from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
|
||||||
|
|
||||||
from llama_stack.apis.telemetry import (
|
from llama_stack.apis.telemetry import (
|
||||||
|
|
@ -30,12 +28,9 @@ from llama_stack.apis.telemetry import (
|
||||||
)
|
)
|
||||||
from llama_stack.core.datatypes import Api
|
from llama_stack.core.datatypes import Api
|
||||||
from llama_stack.log import get_logger
|
from llama_stack.log import get_logger
|
||||||
from llama_stack.providers.inline.telemetry.meta_reference.console_span_processor import (
|
|
||||||
ConsoleSpanProcessor,
|
|
||||||
)
|
|
||||||
from llama_stack.providers.utils.telemetry.tracing import ROOT_SPAN_MARKERS
|
from llama_stack.providers.utils.telemetry.tracing import ROOT_SPAN_MARKERS
|
||||||
|
|
||||||
from .config import TelemetryConfig, TelemetrySink
|
from .config import TelemetryConfig
|
||||||
|
|
||||||
_GLOBAL_STORAGE: dict[str, dict[str | int, Any]] = {
|
_GLOBAL_STORAGE: dict[str, dict[str | int, Any]] = {
|
||||||
"active_spans": {},
|
"active_spans": {},
|
||||||
|
|
@ -55,17 +50,10 @@ def is_tracing_enabled(tracer):
|
||||||
|
|
||||||
|
|
||||||
class TelemetryAdapter(Telemetry):
|
class TelemetryAdapter(Telemetry):
|
||||||
def __init__(self, config: TelemetryConfig, deps: dict[Api, Any]) -> None:
|
def __init__(self, _config: TelemetryConfig, deps: dict[Api, Any]) -> None:
|
||||||
self.config = config
|
|
||||||
self.datasetio_api = deps.get(Api.datasetio)
|
self.datasetio_api = deps.get(Api.datasetio)
|
||||||
self.meter = None
|
self.meter = None
|
||||||
|
|
||||||
resource = Resource.create(
|
|
||||||
{
|
|
||||||
ResourceAttributes.SERVICE_NAME: self.config.service_name,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
global _TRACER_PROVIDER
|
global _TRACER_PROVIDER
|
||||||
# Initialize the correct span processor based on the provider state.
|
# Initialize the correct span processor based on the provider state.
|
||||||
# This is needed since once the span processor is set, it cannot be unset.
|
# This is needed since once the span processor is set, it cannot be unset.
|
||||||
|
|
@ -73,35 +61,24 @@ class TelemetryAdapter(Telemetry):
|
||||||
# Since the library client can be recreated multiple times in a notebook,
|
# Since the library client can be recreated multiple times in a notebook,
|
||||||
# the kernel will hold on to the span processor and cause duplicate spans to be written.
|
# the kernel will hold on to the span processor and cause duplicate spans to be written.
|
||||||
if _TRACER_PROVIDER is None:
|
if _TRACER_PROVIDER is None:
|
||||||
provider = TracerProvider(resource=resource)
|
provider = TracerProvider()
|
||||||
trace.set_tracer_provider(provider)
|
trace.set_tracer_provider(provider)
|
||||||
_TRACER_PROVIDER = provider
|
_TRACER_PROVIDER = provider
|
||||||
|
|
||||||
# Use single OTLP endpoint for all telemetry signals
|
# Use single OTLP endpoint for all telemetry signals
|
||||||
if TelemetrySink.OTEL_TRACE in self.config.sinks or TelemetrySink.OTEL_METRIC in self.config.sinks:
|
|
||||||
if self.config.otel_exporter_otlp_endpoint is None:
|
|
||||||
raise ValueError(
|
|
||||||
"otel_exporter_otlp_endpoint is required when OTEL_TRACE or OTEL_METRIC is enabled"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Let OpenTelemetry SDK handle endpoint construction automatically
|
# Let OpenTelemetry SDK handle endpoint construction automatically
|
||||||
# The SDK will read OTEL_EXPORTER_OTLP_ENDPOINT and construct appropriate URLs
|
# The SDK will read OTEL_EXPORTER_OTLP_ENDPOINT and construct appropriate URLs
|
||||||
# https://opentelemetry.io/docs/languages/sdk-configuration/otlp-exporter
|
# https://opentelemetry.io/docs/languages/sdk-configuration/otlp-exporter
|
||||||
if TelemetrySink.OTEL_TRACE in self.config.sinks:
|
span_exporter = OTLPSpanExporter()
|
||||||
span_exporter = OTLPSpanExporter()
|
span_processor = BatchSpanProcessor(span_exporter)
|
||||||
span_processor = BatchSpanProcessor(span_exporter)
|
trace.get_tracer_provider().add_span_processor(span_processor)
|
||||||
trace.get_tracer_provider().add_span_processor(span_processor)
|
|
||||||
|
|
||||||
if TelemetrySink.OTEL_METRIC in self.config.sinks:
|
metric_reader = PeriodicExportingMetricReader(OTLPMetricExporter())
|
||||||
metric_reader = PeriodicExportingMetricReader(OTLPMetricExporter())
|
metric_provider = MeterProvider(metric_readers=[metric_reader])
|
||||||
metric_provider = MeterProvider(resource=resource, metric_readers=[metric_reader])
|
metrics.set_meter_provider(metric_provider)
|
||||||
metrics.set_meter_provider(metric_provider)
|
|
||||||
|
|
||||||
if TelemetrySink.CONSOLE in self.config.sinks:
|
self.meter = metrics.get_meter(__name__)
|
||||||
trace.get_tracer_provider().add_span_processor(ConsoleSpanProcessor(print_attributes=True))
|
|
||||||
|
|
||||||
if TelemetrySink.OTEL_METRIC in self.config.sinks:
|
|
||||||
self.meter = metrics.get_meter(__name__)
|
|
||||||
|
|
||||||
self._lock = _global_lock
|
self._lock = _global_lock
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue