Merge branch 'main' into LANGPLAT-642/django.refactor.traced.response

Author: brettlangdon

ddtrace/llmobs/_utils.py

@@ -180,7 +180,7 @@ def _get_ml_app(span: Span) -> Optional[str]:
         if ml_app is not None:
             return ml_app
         llmobs_parent = _get_nearest_llmobs_ancestor(llmobs_parent)
-    return ml_app or span.context._meta.get(PROPAGATED_ML_APP_KEY) or config._llmobs_ml_app
+    return ml_app or span.context._meta.get(PROPAGATED_ML_APP_KEY) or config._llmobs_ml_app or config.service
 
 
 def _get_session_id(span: Span) -> Optional[str]:

releasenotes/notes/llmobs-ml-app-sensible-default-502cd05ee2af8485.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    LLM Observability: ``ml_app`` is now optional, defaulting to ``service``. while it is still recommended to set ``ml_app``, enabling LLM Observability will no longer throw if one is not provided or propagated from an upstream service.

tests/llmobs/conftest.py

@@ -288,6 +288,14 @@ def llmobs_no_ml_app(tracer):
         llmobs_service.disable()
 
 
+@pytest.fixture
+def llmobs_empty_ml_app(tracer):
+    with override_global_config(dict(_llmobs_ml_app="")):
+        llmobs_service.enable(_tracer=tracer)
+        yield llmobs_service
+        llmobs_service.disable()
+
+
 @pytest.fixture
 def llmobs_events(llmobs, llmobs_span_writer):
     return llmobs_span_writer.events

tests/llmobs/test_llmobs_service.py

@@ -220,10 +220,18 @@ def test_service_enable_does_not_override_global_patch_config(mock_tracer_patch,
         llmobs_service.disable()
 
 
-def test_start_span_with_no_ml_app_throws(llmobs_no_ml_app):
-    with pytest.raises(ValueError):
-        with llmobs_no_ml_app.task():
-            pass
+def test_start_span_with_no_ml_app_defaults_to_service_name(llmobs_no_ml_app):
+    with llmobs_no_ml_app.task() as span:
+        pass
+
+    assert span._get_ctx_item(ML_APP) == "tests.llmobs"
+
+
+def test_start_span_empty_ml_app_defaults_to_service_name(llmobs_empty_ml_app):
+    with llmobs_empty_ml_app.task() as span:
+        pass
+
+    assert span._get_ctx_item(ML_APP) == "tests.llmobs"
 
 
 def test_start_span_without_ml_app_does_noop():