Skip to content

Commit 8265d4e

Browse files
authored
chore(telemetry): code cleanup (#3897)
# What does this PR do? Clean up telemetry code since the telemetry API has been remove. - moved telemetry files out of providers to core - removed from Api ## Test Plan ❯ OTEL_SERVICE_NAME=llama_stack OTEL_EXPORTER_OTLP_ENDPOINT=http://localhost:4318 uv run llama stack run starter ❯ curl http://localhost:8321/v1/chat/completions \ -H "Content-Type: application/json" \ -d '{ "model": "openai/gpt-4o-mini", "messages": [ { "role": "user", "content": "Hello!" } ] }' -> verify traces in Grafana CI
1 parent 9916cb3 commit 8265d4e

File tree

37 files changed

+148
-227
lines changed

37 files changed

+148
-227
lines changed

llama_stack/apis/conversations/conversations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
OpenAIResponseOutputMessageWebSearchToolCall,
2222
)
2323
from llama_stack.apis.version import LLAMA_STACK_API_V1
24-
from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol
24+
from llama_stack.core.telemetry.trace_protocol import trace_protocol
2525
from llama_stack.schema_utils import json_schema_type, register_schema, webmethod
2626

2727
Metadata = dict[str, str]

llama_stack/apis/datatypes.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ class Api(Enum, metaclass=DynamicApiMeta):
117117
post_training = "post_training"
118118
tool_runtime = "tool_runtime"
119119

120-
telemetry = "telemetry"
121-
122120
models = "models"
123121
shields = "shields"
124122
vector_stores = "vector_stores" # only used for routing table

llama_stack/apis/files/files.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from llama_stack.apis.common.responses import Order
1414
from llama_stack.apis.version import LLAMA_STACK_API_V1
15-
from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol
15+
from llama_stack.core.telemetry.trace_protocol import trace_protocol
1616
from llama_stack.schema_utils import json_schema_type, webmethod
1717

1818

llama_stack/apis/inference/inference.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
from llama_stack.apis.models import Model
2424
from llama_stack.apis.telemetry import MetricResponseMixin
2525
from llama_stack.apis.version import LLAMA_STACK_API_V1, LLAMA_STACK_API_V1ALPHA
26+
from llama_stack.core.telemetry.trace_protocol import trace_protocol
2627
from llama_stack.models.llama.datatypes import (
2728
BuiltinTool,
2829
StopReason,
2930
ToolCall,
3031
ToolDefinition,
3132
ToolPromptFormat,
3233
)
33-
from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol
3434
from llama_stack.schema_utils import json_schema_type, register_schema, webmethod
3535

3636
register_schema(ToolCall)

llama_stack/apis/models/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
from llama_stack.apis.resource import Resource, ResourceType
1313
from llama_stack.apis.version import LLAMA_STACK_API_V1
14-
from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol
14+
from llama_stack.core.telemetry.trace_protocol import trace_protocol
1515
from llama_stack.schema_utils import json_schema_type, webmethod
1616

1717

llama_stack/apis/prompts/prompts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from pydantic import BaseModel, Field, field_validator, model_validator
1212

1313
from llama_stack.apis.version import LLAMA_STACK_API_V1
14-
from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol
14+
from llama_stack.core.telemetry.trace_protocol import trace_protocol
1515
from llama_stack.schema_utils import json_schema_type, webmethod
1616

1717

llama_stack/apis/safety/safety.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from llama_stack.apis.inference import OpenAIMessageParam
1313
from llama_stack.apis.shields import Shield
1414
from llama_stack.apis.version import LLAMA_STACK_API_V1
15-
from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol
15+
from llama_stack.core.telemetry.trace_protocol import trace_protocol
1616
from llama_stack.schema_utils import json_schema_type, webmethod
1717

1818

llama_stack/apis/shields/shields.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
from llama_stack.apis.resource import Resource, ResourceType
1212
from llama_stack.apis.version import LLAMA_STACK_API_V1
13-
from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol
13+
from llama_stack.core.telemetry.trace_protocol import trace_protocol
1414
from llama_stack.schema_utils import json_schema_type, webmethod
1515

1616

llama_stack/apis/tools/rag_tool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from llama_stack.apis.common.content_types import URL, InterleavedContent
1414
from llama_stack.apis.version import LLAMA_STACK_API_V1
15-
from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol
15+
from llama_stack.core.telemetry.trace_protocol import trace_protocol
1616
from llama_stack.schema_utils import json_schema_type, register_schema, webmethod
1717

1818

llama_stack/apis/tools/tools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from llama_stack.apis.common.content_types import URL, InterleavedContent
1414
from llama_stack.apis.resource import Resource, ResourceType
1515
from llama_stack.apis.version import LLAMA_STACK_API_V1
16-
from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol
16+
from llama_stack.core.telemetry.trace_protocol import trace_protocol
1717
from llama_stack.schema_utils import json_schema_type, webmethod
1818

1919
from .rag_tool import RAGToolRuntime

0 commit comments

Comments
 (0)