fmt

Author: Yun-Kim

ddtrace/llmobs/_llmobs.py

@@ -13,6 +13,9 @@
 from ddtrace import config
 from ddtrace import patch
 from ddtrace._trace.context import Context
+from ddtrace.constants import ERROR_MSG
+from ddtrace.constants import ERROR_STACK
+from ddtrace.constants import ERROR_TYPE
 from ddtrace.ext import SpanTypes
 from ddtrace.internal import atexit
 from ddtrace.internal import core
@@ -27,6 +30,7 @@
 from ddtrace.internal.telemetry.constants import TELEMETRY_APM_PRODUCT
 from ddtrace.internal.utils.formats import asbool
 from ddtrace.internal.utils.formats import parse_tags_str
+from ddtrace.llmobs import _constants as constants
 from ddtrace.llmobs._constants import ANNOTATIONS_CONTEXT_ID
 from ddtrace.llmobs._constants import INPUT_DOCUMENTS
 from ddtrace.llmobs._constants import INPUT_MESSAGES
@@ -63,11 +67,6 @@
 from ddtrace.llmobs.utils import Messages
 from ddtrace.propagation.http import HTTPPropagator
 
-from ..constants import ERROR_MSG
-from ..constants import ERROR_STACK
-from ..constants import ERROR_TYPE
-from . import _constants as constants
-
 
 log = get_logger(__name__)
 
@@ -121,7 +120,6 @@ def _on_span_finish(self, span):
     def _submit_llmobs_span(self, span: Span) -> None:
         """Generate and submit an LLMObs span event to be sent to LLMObs."""
         span_event = None
-        is_llm_span = span._get_ctx_item(SPAN_KIND) == "llm"
         is_ragas_integration_span = False
         try:
             span_event, is_ragas_integration_span = self._llmobs_span_event(span)
@@ -131,7 +129,7 @@ def _submit_llmobs_span(self, span: Span) -> None:
                 "Error generating LLMObs span event for span %s, likely due to malformed span", span, exc_info=True
             )
         finally:
-            if not span_event or not is_llm_span or is_ragas_integration_span:
+            if not span_event or is_ragas_integration_span:
                 return
             if self._evaluator_runner:
                 self._evaluator_runner.enqueue(span_event, span)

ddtrace/llmobs/_utils.py

@@ -135,10 +135,12 @@ def _get_ml_app(span: Span) -> str:
     ml_app = span._get_ctx_item(ML_APP)
     if ml_app:
         return ml_app
-    # TODO: go up the span tree to find the nearest LLMObs span with an ml_app
-    nearest_llmobs_ancestor = _get_nearest_llmobs_ancestor(span)
-    if nearest_llmobs_ancestor:
-        ml_app = nearest_llmobs_ancestor._get_ctx_item(ML_APP)
+    llmobs_parent = _get_nearest_llmobs_ancestor(span)
+    while llmobs_parent:
+        ml_app = llmobs_parent._get_ctx_item(ML_APP)
+        if ml_app is not None:
+            return ml_app
+        llmobs_parent = _get_nearest_llmobs_ancestor(llmobs_parent)
     return ml_app or config._llmobs_ml_app or "unknown-ml-app"
 
 
@@ -150,10 +152,12 @@ def _get_session_id(span: Span) -> Optional[str]:
     session_id = span._get_ctx_item(SESSION_ID)
     if session_id:
         return session_id
-    # TODO: go up the span tree to find the nearest LLMObs span with session
-    nearest_llmobs_ancestor = _get_nearest_llmobs_ancestor(span)
-    if nearest_llmobs_ancestor:
-        session_id = nearest_llmobs_ancestor._get_ctx_item(SESSION_ID)
+    llmobs_parent = _get_nearest_llmobs_ancestor(span)
+    while llmobs_parent:
+        session_id = llmobs_parent._get_ctx_item(SESSION_ID)
+        if session_id is not None:
+            return session_id
+        llmobs_parent = _get_nearest_llmobs_ancestor(llmobs_parent)
     return session_id
 
 

tests/llmobs/test_llmobs_service.py

@@ -1948,4 +1948,3 @@ def test_service_enable_does_not_start_evaluator_runner():
         assert llmobs_service._instance._llmobs_span_writer.status.value == "running"
         assert llmobs_service._instance._evaluator_runner.status.value == "stopped"
         llmobs_service.disable()
-