From 532389ddc4c830b70930ca876d2333973a024c0f Mon Sep 17 00:00:00 2001
From: Emilio Garcia <i.am.emilio@gmail.com>
Date: Thu, 13 Nov 2025 16:00:20 -0500
Subject: [PATCH] fix(telemetry): move out of core + fix name for safety

---
 src/llama_stack/core/routers/safety.py            | 1 -
 src/llama_stack/{core => }/telemetry/__init__.py  | 0
 src/llama_stack/{core => }/telemetry/constants.py | 2 +-
 src/llama_stack/{core => }/telemetry/helpers.py   | 4 ++--
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename src/llama_stack/{core => }/telemetry/__init__.py (100%)
 rename src/llama_stack/{core => }/telemetry/constants.py (95%)
 rename src/llama_stack/{core => }/telemetry/helpers.py (95%)

diff --git a/src/llama_stack/core/routers/safety.py b/src/llama_stack/core/routers/safety.py
index cbf5215a1..7f15bc4b9 100644
--- a/src/llama_stack/core/routers/safety.py
+++ b/src/llama_stack/core/routers/safety.py
@@ -7,7 +7,6 @@
 from typing import Any
 
 from llama_stack.core.datatypes import SafetyConfig
-from llama_stack.core.telemetry.helpers import safety_request_span_attributes, safety_span_name
 from llama_stack.log import get_logger
 from llama_stack_api import ModerationObject, OpenAIMessageParam, RoutingTable, RunShieldResponse, Safety, Shield
 
diff --git a/src/llama_stack/core/telemetry/__init__.py b/src/llama_stack/telemetry/__init__.py
similarity index 100%
rename from src/llama_stack/core/telemetry/__init__.py
rename to src/llama_stack/telemetry/__init__.py
diff --git a/src/llama_stack/core/telemetry/constants.py b/src/llama_stack/telemetry/constants.py
similarity index 95%
rename from src/llama_stack/core/telemetry/constants.py
rename to src/llama_stack/telemetry/constants.py
index 6e3ee8d07..1ed086b64 100644
--- a/src/llama_stack/core/telemetry/constants.py
+++ b/src/llama_stack/telemetry/constants.py
@@ -7,7 +7,7 @@
 llama_stack_prefix = "llama_stack"
 
 # Safety Attributes
-SAFETY_SPAN_NAME = "safety.run_shield"
+RUN_SHIELD_OPERATION_NAME = "run_shield"
 
 SAFETY_REQUEST_PREFIX = f"{llama_stack_prefix}.safety.request"
 SAFETY_REQUEST_SHIELD_ID_ATTRIBUTE = f"{SAFETY_REQUEST_PREFIX}.shield_id"
diff --git a/src/llama_stack/core/telemetry/helpers.py b/src/llama_stack/telemetry/helpers.py
similarity index 95%
rename from src/llama_stack/core/telemetry/helpers.py
rename to src/llama_stack/telemetry/helpers.py
index 5956d7591..29aadf4a3 100644
--- a/src/llama_stack/core/telemetry/helpers.py
+++ b/src/llama_stack/telemetry/helpers.py
@@ -12,17 +12,17 @@ from llama_stack.apis.inference import Message
 from llama_stack.apis.safety import RunShieldResponse
 
 from .constants import (
+    RUN_SHIELD_OPERATION_NAME,
     SAFETY_REQUEST_MESSAGES_ATTRIBUTE,
     SAFETY_REQUEST_SHIELD_ID_ATTRIBUTE,
     SAFETY_RESPONSE_METADATA_ATTRIBUTE,
     SAFETY_RESPONSE_USER_MESSAGE_ATTRIBUTE,
     SAFETY_RESPONSE_VIOLATION_LEVEL_ATTRIBUTE,
-    SAFETY_SPAN_NAME,
 )
 
 
 def safety_span_name(shield_id: str) -> str:
-    return f"{SAFETY_SPAN_NAME} {shield_id}"
+    return f"{RUN_SHIELD_OPERATION_NAME} {shield_id}"
 
 
 # TODO: Consider using Wrapt to automatically instrument code