fixed span name

Author: wrisa

instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/callback_handler.py

@@ -56,18 +56,17 @@ def on_chat_model_start(
         metadata: Optional[Dict[str, Any]] = None,
         **kwargs: Any,
     ) -> None:
-        name = serialized.get("name") or kwargs.get("name") or "ChatLLM"
+        invocation_params = kwargs.get("invocation_params")
+        request_model = invocation_params.get("model_name") if invocation_params else None
         span = self.span_manager.create_llm_span(
             run_id=run_id,
             parent_run_id=parent_run_id,
-            name=name,
+            request_model = request_model,
         )
+        name = serialized.get("name") or kwargs.get("name") or "ChatLLM"
+        span.set_attribute(GenAI.GEN_AI_SYSTEM, name)
 
-        invocation_params = kwargs.get("invocation_params")
         if invocation_params is not None:
-            request_model = invocation_params.get("model_name")
-            if request_model is not None:
-                span.set_attribute(GenAI.GEN_AI_REQUEST_MODEL, request_model)
             top_p = invocation_params.get("top_p")
             if top_p is not None:
                 span.set_attribute(GenAI.GEN_AI_REQUEST_TOP_P, top_p)

instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/span_manager.py

@@ -71,19 +71,19 @@ def create_llm_span(
         self,
         run_id: UUID,
         parent_run_id: Optional[UUID],
-        name: str,
+        request_model: str,
     ) -> Span:
         span = self.create_span(
             run_id=run_id,
             parent_run_id=parent_run_id,
-            span_name=f"{name}.{GenAI.GenAiOperationNameValues.CHAT.value}",
+            span_name=f"{GenAI.GenAiOperationNameValues.CHAT.value} {request_model}",
             kind=SpanKind.CLIENT,
         )
         span.set_attribute(
             GenAI.GEN_AI_OPERATION_NAME,
             GenAI.GenAiOperationNameValues.CHAT.value,
         )
-        span.set_attribute(GenAI.GEN_AI_SYSTEM, name)
+        span.set_attribute(GenAI.GEN_AI_REQUEST_MODEL, request_model)
 
         return span
 

instrumentation-genai/opentelemetry-instrumentation-langchain/tests/test_llm_call.py

@@ -44,7 +44,7 @@ def test_langchain_call(
 def assert_openai_completion_attributes(
     span: ReadableSpan, response: Optional
 ):
-    assert span.name == "ChatOpenAI.chat"
+    assert span.name == "chat gpt-3.5-turbo"
     assert span.attributes[gen_ai_attributes.GEN_AI_OPERATION_NAME] == "chat"
     assert span.attributes[gen_ai_attributes.GEN_AI_SYSTEM] == "ChatOpenAI"
     assert (