fix: close PR224 semantic convention gaps

Author: sipercai

instrumentation-loongsuite/loongsuite-instrumentation-agentscope/src/opentelemetry/instrumentation/agentscope/_v2_middleware.py

@@ -259,6 +259,7 @@ async def on_acting(
         handler.start_react_step(react_invocation, context=get_current())
         invocation = ExecuteToolInvocation(
             tool_name=getattr(tool_call, "name", "unknown_tool"),
+            tool_type="function",
             tool_call_id=getattr(tool_call, "id", None),
             tool_call_arguments=_loads_json(getattr(tool_call, "input", None)),
             provider="agentscope",

instrumentation-loongsuite/loongsuite-instrumentation-agentscope/tests/test_v2_instrumentation.py

@@ -240,6 +240,7 @@ async def tool_handler(**kwargs):
         span_exporter.get_finished_spans(), "execute_tool"
     )[0]
     assert tool_span.attributes["gen_ai.tool.name"] == "lookup_weather"
+    assert tool_span.attributes["gen_ai.tool.type"] == "function"
 
 
 async def test_v2_tool_result_content_capture(
@@ -333,6 +334,9 @@ async def tool_handler(**kwargs):
         "calculate_total",
         "write_summary",
     }
+    assert {span.attributes["gen_ai.tool.type"] for span in tool_spans} == {
+        "function"
+    }
     react_span_ids = {span.context.span_id for span in react_spans}
     assert {span.parent.span_id for span in tool_spans} == react_span_ids
 

instrumentation-loongsuite/loongsuite-instrumentation-google-adk/src/opentelemetry/instrumentation/google_adk/internal/_plugin.py

@@ -60,6 +60,12 @@
 )
 
 
+def _non_empty_string(value: Any) -> Optional[str]:
+    if isinstance(value, str) and value.strip():
+        return value
+    return None
+
+
 class GoogleAdkObservabilityPlugin(BasePlugin):
     """
     OpenTelemetry ADK Observability Plugin.
@@ -119,7 +125,6 @@ async def before_run_callback(
             invocation = InvokeAgentInvocation(
                 provider="google_adk",
                 agent_name=invocation_context.app_name,
-                agent_id=invocation_context.app_name,
             )
 
             # Set conversation_id if available
@@ -276,12 +281,12 @@ async def before_agent_callback(
             invocation = InvokeAgentInvocation(
                 provider="google_adk",
                 agent_name=agent.name,
-                agent_id=agent.name,
             )
 
             # Set agent attributes
-            if hasattr(agent, "id") and agent.id:
-                invocation.agent_id = agent.id
+            agent_id = _non_empty_string(getattr(agent, "id", None))
+            if agent_id:
+                invocation.agent_id = agent_id
 
             if hasattr(agent, "description") and agent.description:
                 invocation.agent_description = agent.description

instrumentation-loongsuite/loongsuite-instrumentation-google-adk/tests/test_plugin_integration.py

@@ -412,6 +412,38 @@ async def test_agent_span_attributes_semantic_conventions(self):
             "gen_ai.agent.description" in attributes
             or "agent.description" in attributes
         ), "Should have agent description attribute"
+        assert "gen_ai.agent.id" not in attributes
+
+    @pytest.mark.asyncio
+    async def test_agent_span_uses_explicit_agent_id(self):
+        """Test that Agent spans use real agent.id when ADK exposes one."""
+        self.instrumentor.instrument(
+            tracer_provider=self.tracer_provider,
+            meter_provider=self.meter_provider,
+        )
+
+        plugin = self.instrumentor._plugin
+
+        mock_agent = Mock()
+        mock_agent.name = "weather_agent"
+        mock_agent.id = "agent_123"
+        mock_agent.description = "Agent for weather queries"
+        mock_agent.sub_agents = []
+
+        mock_callback_context = create_mock_callback_context(
+            "session_789", "user_999"
+        )
+
+        await plugin.before_agent_callback(
+            agent=mock_agent, callback_context=mock_callback_context
+        )
+        await plugin.after_agent_callback(
+            agent=mock_agent, callback_context=mock_callback_context
+        )
+
+        spans = self.span_exporter.get_finished_spans()
+        assert len(spans) == 1
+        assert spans[0].attributes["gen_ai.agent.id"] == "agent_123"
 
     @pytest.mark.asyncio
     async def test_tool_span_attributes_semantic_conventions(self):
@@ -534,6 +566,7 @@ async def test_runner_span_attributes(self):
         assert attributes.get("gen_ai.span.kind") == "AGENT"
         # Note: runner.app_name is namespaced with google_adk prefix
         assert attributes.get("google_adk.runner.app_name") == "test_app"
+        assert "gen_ai.agent.id" not in attributes
 
     @pytest.mark.asyncio
     async def test_runner_span_finishes_on_root_final_event(self):

instrumentation-loongsuite/loongsuite-instrumentation-hermes-agent/src/opentelemetry/instrumentation/hermes_agent/helpers.py

@@ -580,7 +580,6 @@ def create_agent_invocation(
     invocation = InvokeAgentInvocation(
         provider=_HERMES_AGENT_SYSTEM,
         agent_name="Hermes",
-        agent_id="Hermes",
         conversation_id=getattr(instance, "session_id", None),
         request_model=getattr(instance, "model", None),
         input_messages=[

instrumentation-loongsuite/loongsuite-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/internal/_tracer.py

@@ -451,7 +451,6 @@ def _start_agent(self, run: Run) -> None:
         invocation = InvokeAgentInvocation(
             provider="langchain",
             agent_name=agent_name,
-            agent_id=agent_name or None,
             input_messages=input_messages,
         )
         self._handler.start_invoke_agent(invocation, context=parent_ctx)

instrumentation-loongsuite/loongsuite-instrumentation-minisweagent/src/opentelemetry/instrumentation/minisweagent/internal/agent_wrappers.py

@@ -115,7 +115,6 @@ def __call__(
         inv = InvokeAgentInvocation(
             provider="minisweagent",
             agent_name=agent_name,
-            agent_id=agent_name,
         )
         inv.request_model = _request_model_from_agent(instance)
         inv.attributes.setdefault("gen_ai.framework", "minisweagent")

instrumentation-loongsuite/loongsuite-instrumentation-qwen-agent/src/opentelemetry/instrumentation/qwen_agent/utils.py

@@ -613,7 +613,6 @@ def _create_agent_invocation(
     invocation = InvokeAgentInvocation(
         provider=provider_name,
         agent_name=agent_name,
-        agent_id=agent_name,
         agent_description=agent_description,
         request_model=request_model,
         input_messages=input_messages,

instrumentation-loongsuite/loongsuite-instrumentation-vita/src/opentelemetry/instrumentation/vita/patch.py

@@ -300,7 +300,6 @@ def wrap_generate_next_message(
         invocation = InvokeAgentInvocation(
             provider="vitabench",
             agent_name=agent_name,
-            agent_id=agent_name,
             request_model=model,
         )
 

instrumentation-loongsuite/loongsuite-instrumentation-widesearch/src/opentelemetry/instrumentation/widesearch/utils.py

@@ -88,7 +88,6 @@ def _create_agent_invocation(
     invocation = InvokeAgentInvocation(
         provider="widesearch",
         agent_name=agent_name,
-        agent_id=agent_name,
         agent_description=instructions[:200] if instructions else "",
         request_model=request_model,
         input_messages=[