Skip to content

Commit 067ab29

Browse files
committed
Keep transport causes in internal logs
1 parent 6469f07 commit 067ab29

2 files changed

Lines changed: 15 additions & 3 deletions

File tree

‎src/lib/router.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,15 +1478,22 @@ function createRouter({
14781478
};
14791479
}
14801480

1481-
const savedLock = persistModelLock(provider, member.upstreamModel, result);
1481+
const transportCause = result.transportError ? result.error : null;
1482+
const publicError = result.transportError
1483+
? `Upstream connection failed after ${transportRetryAttempts} retries`
1484+
: result.error;
1485+
const savedLock = persistModelLock(provider, member.upstreamModel, {
1486+
...result,
1487+
error: publicError,
1488+
});
14821489
const failed = {
14831490
providerId: provider.id,
14841491
providerType: canonicalProviderType(provider.type),
14851492
providerName: provider.name,
14861493
accountAlias: provider.accountAlias || null,
14871494
model: member.upstreamModel,
14881495
status: result.status,
1489-
error: result.error,
1496+
error: publicError,
14901497
failureKind: result.failureKind,
14911498
retryable: true,
14921499
lockedUntil: savedLock?.until || null,
@@ -1497,6 +1504,7 @@ function createRouter({
14971504
event: oauthAttempt ? "account_failure" : "route_member_failure",
14981505
routeModel: modelId,
14991506
...failed,
1507+
...(transportCause ? { transportCause } : {}),
15001508
});
15011509
fallbackFrom = failed;
15021510
}

‎tests/router-fallback.test.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,10 @@ describe("same-provider OAuth account fallback", () => {
376376
],
377377
});
378378
const calls = [];
379+
const logger = captureLogger();
379380
const router = createRouter({
380381
store,
381-
logger: captureLogger(),
382+
logger,
382383
transportRetryDelayMs: 0,
383384
fetchImpl: async (_url, options) => {
384385
const token = authToken(options);
@@ -404,6 +405,9 @@ describe("same-provider OAuth account fallback", () => {
404405
assert.equal(result.openAiJson.choices[0].message.content, "fallback worked");
405406
assert.deepEqual(calls, ["chatgpt-token", "chatgpt-token", "chatgpt-token", "claude-token"]);
406407
assert.deepEqual(store.load().providers.find((provider) => provider.id === "prov_chatgpt").modelLocks, {});
408+
const failure = logger.entries.find((entry) => entry.meta?.event === "account_failure");
409+
assert.equal(failure.meta.error, "Upstream connection failed after 2 retries");
410+
assert.match(failure.meta.transportCause, /ECONNRESET/);
407411
});
408412

409413
it("does not turn context failures into cooldowns or a terminal 429", async () => {

0 commit comments

Comments
 (0)