From 7747125099922371ce50a87f90e014e1fb2e0396 Mon Sep 17 00:00:00 2001 From: lml <1297555865@qq.com> Date: Thu, 5 Nov 2026 15:46:23 +0800 Subject: [PATCH] =?UTF-8?q?fix(lingxing):=20=E4=BF=9D=E7=95=99=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=20request=5Fid=20=E5=B9=B6=E5=9C=A8=E5=AE=A1=E8=AE=A1?= =?UTF-8?q?=E4=B8=AD=E8=A1=A5=20platformCode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ChannelException 新增 platformRequestId,与本地链路 requestId 分开 - LingxingEnvelope 解析响应顶层 request_id(兼容 requestId)并写入异常 - CallRecord 分别记录平台 request_id 与业务码 platformCode - 失败日志补 platformCode,并对平台文案做换行清洗与截断 - LingxingCallObserverTest 断言 3001008 与平台 request_id 不被本地 ID 覆盖 验证:mvn -q -pl core,lingxing -am -Dtest='LingxingCallObserverTest,LingxingEnvelopeTest' -DfailIfNoTests=false test --- .../main/java/common/ecommerce/audit/CallRecord.java | 17 ++++++++++++++++- .../common/ecommerce/audit/Slf4jCallObserver.java | 19 +++++++++++++++---- .../java/common/ecommerce/error/ChannelException.java | 19 +++++++++++++++++++ .../ecommerce/lingxing/http/LingxingEnvelope.java | 6 ++++++ .../lingxing/adapter/LingxingCallObserverTest.java | 4 +++- 5 files changed, 59 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/common/ecommerce/audit/CallRecord.java b/core/src/main/java/common/ecommerce/audit/CallRecord.java index 77fdd44..7357257 100644 --- a/core/src/main/java/common/ecommerce/audit/CallRecord.java +++ b/core/src/main/java/common/ecommerce/audit/CallRecord.java @@ -38,6 +38,7 @@ public final class CallRecord { private final String errorMessage; private final Boolean retryable; private final String platformRequestId; + private final String platformCode; private CallRecord(Builder b) { this.occurredAt = Objects.requireNonNull(b.occurredAt, "occurredAt"); @@ -56,6 +57,7 @@ public final class CallRecord { this.errorMessage = b.errorMessage; this.retryable = b.retryable; this.platformRequestId = b.platformRequestId; + this.platformCode = b.platformCode; } public static Builder builder() { @@ -162,6 +164,16 @@ public final class CallRecord { return platformRequestId; } + /** + * 平台业务码 / HTTP 状态码;仅当失败异常是 {@code ChannelException} 时有值。 + * + *

领星场景下就是 {@code 3001008}、{@code 2001003} 这类业务码, + * 审计表可以直接按它聚合,不用 LIKE 匹配 message。

+ */ + public String platformCode() { + return platformCode; + } + public boolean failed() { return outcome == CallOutcome.FAILURE; } @@ -180,6 +192,7 @@ public final class CallRecord { + " params=" + params + (failed() ? " error=" + errorType + ": " + errorMessage + " retryable=" + retryable + + " platformCode=" + platformCode + " platformRequestId=" + platformRequestId : "") + '}'; @@ -202,6 +215,7 @@ public final class CallRecord { private String errorMessage; private Boolean retryable; private String platformRequestId; + private String platformCode; public Builder occurredAt(Instant occurredAt) { this.occurredAt = occurredAt; @@ -265,7 +279,8 @@ public final class CallRecord { if (error instanceof ChannelException) { ChannelException channelError = (ChannelException) error; this.retryable = channelError.retryable(); - this.platformRequestId = channelError.requestId(); + this.platformRequestId = channelError.platformRequestId(); + this.platformCode = channelError.platformCode(); } } return this; diff --git a/core/src/main/java/common/ecommerce/audit/Slf4jCallObserver.java b/core/src/main/java/common/ecommerce/audit/Slf4jCallObserver.java index 712bb66..a0a0596 100644 --- a/core/src/main/java/common/ecommerce/audit/Slf4jCallObserver.java +++ b/core/src/main/java/common/ecommerce/audit/Slf4jCallObserver.java @@ -80,14 +80,14 @@ public final class Slf4jCallObserver implements CallObserver { public void onCall(CallRecord record) { if (record.failed()) { LOG.warn("sdk-call-failed at={} op={} provider={} platform={} omsStoreId={} storeId={} " - + "requestId={} cost={}ms result={} params={} retryable={} platformRequestId={} " - + "error={}: {}", + + "requestId={} cost={}ms result={} params={} retryable={} platformCode={} " + + "platformRequestId={} error={}: {}", at(record.occurredAt()), record.operation(), record.provider(), record.platform(), record.omsStoreId(), record.externalStoreId(), record.requestId(), record.durationMillis(), record.resultCount(), record.params(), - record.retryable(), record.platformRequestId(), - record.errorType(), record.errorMessage()); + record.retryable(), record.platformCode(), record.platformRequestId(), + record.errorType(), safe(record.errorMessage())); } else { LOG.info("sdk-call at={} op={} provider={} platform={} omsStoreId={} storeId={} " + "requestId={} cost={}ms result={} params={}", @@ -101,4 +101,15 @@ public final class Slf4jCallObserver implements CallObserver { private String at(Instant instant) { return format(instant); } + + /** + * 平台文案不可控,去掉换行/控制字符并截断,避免一条日志被拆成多行。 + */ + private static String safe(String value) { + if (value == null) { + return null; + } + String oneLine = value.replaceAll("\\p{Cntrl}", " ").trim(); + return oneLine.length() <= 512 ? oneLine : oneLine.substring(0, 512) + "..."; + } } diff --git a/core/src/main/java/common/ecommerce/error/ChannelException.java b/core/src/main/java/common/ecommerce/error/ChannelException.java index 289a570..3ac630d 100644 --- a/core/src/main/java/common/ecommerce/error/ChannelException.java +++ b/core/src/main/java/common/ecommerce/error/ChannelException.java @@ -16,6 +16,7 @@ public class ChannelException extends RuntimeException { private final String operation; private final String requestId; private final String platformCode; + private final String platformRequestId; private final boolean retryable; private final String rawResponse; @@ -27,6 +28,7 @@ public class ChannelException extends RuntimeException { this.operation = b.operation; this.requestId = b.requestId; this.platformCode = b.platformCode; + this.platformRequestId = b.platformRequestId; this.retryable = b.retryable; this.rawResponse = b.rawResponse; } @@ -59,6 +61,16 @@ public class ChannelException extends RuntimeException { return platformCode; } + /** + * 平台返回的 request_id(如领星响应体顶层 {@code request_id})。 + * + *

与 {@link #requestId()} 区分:后者是我方链路 ID,用来串本地日志; + * 前者是平台侧工单号,用来找平台日志。

+ */ + public String platformRequestId() { + return platformRequestId; + } + public boolean retryable() { return retryable; } @@ -76,6 +88,7 @@ public class ChannelException extends RuntimeException { protected String operation; protected String requestId; protected String platformCode; + protected String platformRequestId; protected boolean retryable; protected String rawResponse; @@ -114,6 +127,12 @@ public class ChannelException extends RuntimeException { return this; } + /** 平台返回的 request_id;与本地链路 ID {@link #requestId(String)} 分开。 */ + public Builder platformRequestId(String platformRequestId) { + this.platformRequestId = platformRequestId; + return this; + } + public Builder retryable(boolean retryable) { this.retryable = retryable; return this; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java index 7a4f7ba..ef8680f 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java @@ -56,6 +56,11 @@ public final class LingxingEnvelope { if (message == null) { message = json.stringAt(body, "msg"); } + // 平台侧工单号:领星顶层字段是 request_id,兼容驼峰写法 + String platformRequestId = json.stringAt(body, "request_id"); + if (platformRequestId == null) { + platformRequestId = json.stringAt(body, "requestId"); + } ChannelException.Builder b = ChannelException.builder() .message("lingxing code=" + code + " msg=" + message + " on " + operation) @@ -63,6 +68,7 @@ public final class LingxingEnvelope { .provider(LingxingConstants.ADAPTER_ID) .omsStoreId(omsStoreId) .requestId(requestId) + .platformRequestId(platformRequestId) .platformCode(code) .rawResponse(body); diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java index 6b84496..eb79bf5 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java @@ -65,7 +65,7 @@ class LingxingCallObserverTest { + "}"; private static final String RATE_LIMITED_JSON = - "{\"code\":3001008,\"message\":\"请求过于频繁\"}"; + "{\"code\":3001008,\"message\":\"请求过于频繁\",\"request_id\":\"lx-req-1\"}"; /** 收集回调记录,避免依赖 SLF4J 绑定。 */ private static final class CollectingObserver implements CallObserver { @@ -159,6 +159,8 @@ class LingxingCallObserverTest { assertEquals(CallOutcome.FAILURE, record.outcome()); assertTrue(record.errorType().contains("RateLimitException"), record.errorType()); assertTrue(record.errorMessage().contains("3001008"), record.errorMessage()); + assertEquals("3001008", record.platformCode()); + assertEquals("lx-req-1", record.platformRequestId(), "平台 request_id 不能被本地链路 ID 覆盖"); } @Test