Skip to content

fix(mcp): pass down mcp name to logger #1078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 19, 2025
Merged

fix(mcp): pass down mcp name to logger #1078

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions internal/llm/agent/mcp-tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ func doGetMCPTools(ctx context.Context, permissions permission.Service, cfg *con
}

func createAndInitializeClient(ctx context.Context, name string, m config.MCPConfig) (*client.Client, error) {
c, err := createMcpClient(m)
c, err := createMcpClient(name, m)
if err != nil {
updateMCPState(name, MCPStateError, err, nil, 0)
slog.Error("error creating mcp client", "error", err, "name", name)
Expand All @@ -353,7 +353,7 @@ func createAndInitializeClient(ctx context.Context, name string, m config.MCPCon
return c, nil
}

func createMcpClient(m config.MCPConfig) (*client.Client, error) {
func createMcpClient(name string, m config.MCPConfig) (*client.Client, error) {
switch m.Type {
case config.MCPStdio:
if strings.TrimSpace(m.Command) == "" {
Expand All @@ -363,7 +363,7 @@ func createMcpClient(m config.MCPConfig) (*client.Client, error) {
m.Command,
m.ResolvedEnv(),
m.Args,
transport.WithCommandLogger(mcpLogger{}),
transport.WithCommandLogger(mcpLogger{name: name}),
)
case config.MCPHttp:
if strings.TrimSpace(m.URL) == "" {
Expand All @@ -372,7 +372,7 @@ func createMcpClient(m config.MCPConfig) (*client.Client, error) {
return client.NewStreamableHttpClient(
m.URL,
transport.WithHTTPHeaders(m.ResolvedHeaders()),
transport.WithHTTPLogger(mcpLogger{}),
transport.WithHTTPLogger(mcpLogger{name: name}),
)
case config.MCPSse:
if strings.TrimSpace(m.URL) == "" {
Expand All @@ -381,18 +381,23 @@ func createMcpClient(m config.MCPConfig) (*client.Client, error) {
return client.NewSSEMCPClient(
m.URL,
client.WithHeaders(m.ResolvedHeaders()),
transport.WithSSELogger(mcpLogger{}),
transport.WithSSELogger(mcpLogger{name: name}),
)
default:
return nil, fmt.Errorf("unsupported mcp type: %s", m.Type)
}
}

// for MCP's clients.
type mcpLogger struct{}
type mcpLogger struct{ name string }

func (l mcpLogger) Errorf(format string, v ...any) { slog.Error(fmt.Sprintf(format, v...)) }
func (l mcpLogger) Infof(format string, v ...any) { slog.Info(fmt.Sprintf(format, v...)) }
func (l mcpLogger) Errorf(format string, v ...any) {
slog.Error(fmt.Sprintf(format, v...), "name", l.name)
}

func (l mcpLogger) Infof(format string, v ...any) {
slog.Info(fmt.Sprintf(format, v...), "name", l.name)
}

func mcpTimeout(m config.MCPConfig) time.Duration {
return time.Duration(cmp.Or(m.Timeout, 15)) * time.Second
Expand Down
Loading