Skip to content

fix(agentgateway): log correlation-id on mcp tool call failure #196

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

Open
Lothnic wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(agentgateway): log correlation-id on mcp tool call failure #196

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eadcade
fix(agentgateway): log correlation-id on mcp tool call failure
Lothnic Jul 2, 2026
92e5c66
Using `logger.exception(...)` to preserve the correlation-id message …
Lothnic Jul 2, 2026
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
58 changes: 37 additions & 21 deletions src/sap_cloud_sdk/agentgateway/_customer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,26 +551,42 @@ async def call_mcp_tool_customer(
Tool execution result as string.
"""
logger.info("Calling tool '%s' on server '%s'", tool.name, tool.server_name)
correlation_id: str | None = None

async with httpx.AsyncClient(
headers={
"Authorization": f"Bearer {auth_token}",
"x-correlation-id": str(uuid.uuid4()),
},
timeout=timeout,
) as http_client:
async with streamable_http_client(tool.url, http_client=http_client) as (
read,
write,
_,
):
async with ClientSession(read, write) as session:
await session.initialize()
result = await session.call_tool(tool.name, kwargs)
async def _capture_correlation_id(response: httpx.Response) -> None:
nonlocal correlation_id
cid = response.headers.get("x-correlation-id")
Comment on lines +554 to +558
if cid:
correlation_id = cid

if not result.content:
logger.warning("Tool '%s' returned empty content", tool.name)
return ""

first = result.content[0]
return str(getattr(first, "text", ""))
try:
async with httpx.AsyncClient(
headers={
"Authorization": f"Bearer {auth_token}",
"x-correlation-id": str(uuid.uuid4()),
},
timeout=timeout,
event_hooks={"response": [_capture_correlation_id]},
) as http_client:
async with streamable_http_client(tool.url, http_client=http_client) as (
read,
write,
_,
):
async with ClientSession(read, write) as session:
await session.initialize()
result = await session.call_tool(tool.name, kwargs)

if not result.content:
logger.warning("Tool '%s' returned empty content", tool.name)
return ""

first = result.content[0]
return str(getattr(first, "text", ""))
except Exception:
logger.error(
"MCP tool call failed for '%s' (x-correlation-id: %s)",
tool.name,
correlation_id or "unknown",
)
raise
Comment thread
Lothnic marked this conversation as resolved.
57 changes: 37 additions & 20 deletions src/sap_cloud_sdk/agentgateway/_lob.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,26 +383,43 @@ async def call_mcp_tool_lob(
Returns:
Tool execution result as string.
"""
async with httpx.AsyncClient(
headers={
"Authorization": f"Bearer {user_auth_token}",
"x-correlation-id": str(uuid.uuid4()),
},
timeout=timeout,
) as http_client:
async with streamable_http_client(tool.url, http_client=http_client) as (
read,
write,
_,
):
async with ClientSession(read, write) as session:
await session.initialize()
result = await session.call_tool(tool.name, kwargs)
if not result.content:
logger.warning("Tool '%s' returned empty content", tool.name)
return ""
first = result.content[0]
return str(getattr(first, "text", ""))
correlation_id: str | None = None

async def _capture_correlation_id(response: httpx.Response) -> None:
nonlocal correlation_id
cid = response.headers.get("x-correlation-id")
if cid:
correlation_id = cid

try:
async with httpx.AsyncClient(
headers={
"Authorization": f"Bearer {user_auth_token}",
"x-correlation-id": str(uuid.uuid4()),
},
Comment on lines +386 to +399
timeout=timeout,
event_hooks={"response": [_capture_correlation_id]},
) as http_client:
async with streamable_http_client(tool.url, http_client=http_client) as (
read,
write,
_,
):
async with ClientSession(read, write) as session:
await session.initialize()
result = await session.call_tool(tool.name, kwargs)
if not result.content:
logger.warning("Tool '%s' returned empty content", tool.name)
return ""
first = result.content[0]
return str(getattr(first, "text", ""))
except Exception:
logger.error(
"MCP tool call failed for '%s' (x-correlation-id: %s)",
tool.name,
correlation_id or "unknown",
)
raise
Comment on lines +416 to +422


async def _fetch_agent_card(
Expand Down