re-add tool_name attr to tool.Call + toolCount attr in fetchTools trace

Author: pawbana

aibtrace/aibtrace.go

@@ -32,6 +32,7 @@ const (
 	MCPToolName   = "mcp_tool_name"
 	MCPServerName = "mcp_server_name"
 	MCPServerURL  = "mcp_server_url"
+	MCPToolCount  = "mcp_tool_count"
 
 	APIKeyID = "api_key_id"
 )

mcp/proxy_streamable_http.go

@@ -154,6 +154,7 @@ func (p *StreamableHTTPServerProxy) fetchTools(ctx context.Context) (_ map[strin
 			Logger:      p.logger,
 		}
 	}
+	span.SetAttributes(append(p.traceAttributes(), attribute.Int(aibtrace.MCPToolCount, len(out)))...)
 	return out, nil
 }
 

mcp/tool.go

@@ -50,6 +50,7 @@ func (t *Tool) Call(ctx context.Context, tracer trace.Tracer, input any) (_ *mcp
 
 	spanAttrs := append(
 		aibtrace.InterceptionAttributesFromContext(ctx),
+		attribute.String(aibtrace.MCPToolName, t.Name),
 		attribute.String(aibtrace.MCPServerName, t.ServerName),
 		attribute.String(aibtrace.MCPServerURL, t.ServerURL),
 	)

trace_integration_test.go

@@ -543,6 +543,8 @@ func TestNewServerProxyManagerTraces(t *testing.T) {
 		attribute.String(aibtrace.MCPServerName, serverName),
 	}
 	verifyTraces(t, sr, []expectTrace{{"StreamableHTTPServerProxy.Init", 1, codes.Unset}}, attrs)
+
+	attrs = append(attrs, attribute.Int(aibtrace.MCPToolCount, len(proxy.ListTools())))
 	verifyTraces(t, sr, []expectTrace{{"StreamableHTTPServerProxy.Init.fetchTools", 1, codes.Unset}}, attrs)
 }