kimhyungsik/ax_hub_mcp_tool
0
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add trace-id and request-id header logging to tool controller

Browse Source
This commit is contained in:
jade
2026-07-21 13:18:38 +09:00
parent b9966bbbda
commit 580edd98a6
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dap-gateway/src/main/java/io/shinhanlife/dap/mcg/service/ExecuteService.java
View File

@@ -232,6 +232,10 @@ public class ExecuteService {
}
String executeApiUrl = targetUrl + "/mcp/" + metadata.getName();
Map<String, String> headers = new java.util.HashMap<>();
headers.put("trace-id", java.util.UUID.randomUUID().toString());
headers.put("request-id", context.requestId());
ObjectNode pageArguments = paginationValidator.normalize(arguments);
LargeToolResponseService.Collector collector = largeResponses.newCollector(metadata.getName(), context.requestId());
@@ -244,7 +248,7 @@ public class ExecuteService {
JsonNode data = null;
try {
data = toolInvoker.invoke(pagePayload, executeApiUrl);
data = toolInvoker.invoke(pagePayload, executeApiUrl, headers);
} catch (org.springframework.web.client.RestClientResponseException e) {
// HTTP 4xx, 5xx 에러는 연결 오류가 아니라 비즈니스 로직 오류이거나 검증 실패이므로 원본 에러를 그대로 반환
throw new ToolExecutionException(FailureType.SERVER_ERROR, "Tool Pod HTTP 에러 (" + e.getStatusCode() + "): " + e.getResponseBodyAsString());
@@ -253,7 +257,7 @@ public class ExecuteService {
String fallbackUrl = executeApiUrl.replaceAll("http://tool-[a-zA-Z0-9-]+", "http://localhost");
log.warn(" [ExecuteService] 호스트를 찾을 수 없어 localhost로 재시도합니다: {}", fallbackUrl);
try {
data = toolInvoker.invoke(pagePayload, fallbackUrl);
data = toolInvoker.invoke(pagePayload, fallbackUrl, headers);
} catch (Exception ex) {
throw new ToolExecutionException(FailureType.SERVER_ERROR, "Tool Pod 호출 실패 (localhost 재시도 포함): " + ex.getMessage());
}

15
dap-gateway/src/main/java/io/shinhanlife/dap/mcg/transport/HttpToolInvoker.java
View File

@@ -40,14 +40,17 @@ public class HttpToolInvoker implements ToolInvoker {
}
@Override
public JsonNode invoke(Map<String, Object> payload, String targetUrl) {
public JsonNode invoke(Map<String, Object> payload, String targetUrl, Map<String, String> headers) {
try {
Object httpResult = restClient.post()
RestClient.RequestBodySpec requestSpec = restClient.post()
.uri(targetUrl)
.contentType(MediaType.APPLICATION_JSON)
// TODO: Use actual tenant's key
.header("X-Trace-Id", UUID.randomUUID().toString())
.body(payload)
.contentType(MediaType.APPLICATION_JSON);
if (headers != null) {
headers.forEach(requestSpec::header);
}
Object httpResult = requestSpec.body(payload)
.retrieve()
.body(Object.class);

2
dap-gateway/src/main/java/io/shinhanlife/dap/mcg/transport/ToolInvoker.java
View File

@@ -22,5 +22,5 @@ import java.util.Map;
* Tool 서버 호출 transport의 최소 공통 인터페이스입니다.
*/
public interface ToolInvoker {
JsonNode invoke(Map<String, Object> payload, String targetUrl);
JsonNode invoke(Map<String, Object> payload, String targetUrl, Map<String, String> headers);
}