Repository navigation
test: stabilize channel affinity cache keys - #8009
Conversation
Replace wall-clock identifiers with an atomic sequence and test names so repeated Windows runs cannot share usage-cache entries. Verification: latest main baseline failed with cumulative counts; patched affinity tests passed -count=20; full service suite and go vet passed. Signed-off-by: sstar16 <3221386464@qq.com>
|
No actionable comments were generated in the recent review.
|
| Layer / File(s) | Summary |
|---|---|
Generate unique test keys service/channel_affinity_usage_cache_test.go |
The test file adds an atomic-counter helper that returns the same generated value for a rule name and key fingerprint. The Claude-mode, mixed-mode, and unsupported-mode tests use the helper. Their assertions remain unchanged. |
Priority:
Estimated code review effort: 2 (Simple) | ~5 minutes
Change: Other
Suggested reviewers: seefs001
Merge Risk: 
Minimal · up to 91409
-
No merge-blocking risk was identified.
Pre-merge checks: 
4 · 
1
-
Failed checks: 1 warning Passed checks: 4 passed -
Finishing Touches
-
🧪 Generate unit tests (beta)
-
- Create a new PR
-
- Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
A rabbit checks each test key twice
One counter keeps the names precise
No ticking clock is needed here
The cache tests run with keys made clear
Then hops away with carrots near
Comment @coderabbitai help to get the list of available commands.
Select nine upstream fixes from QuantumNous/new-api main at 49271d2. Preserve OIDC, root-managed integration clients, bounded diagnostics, canonical mem-ai routes, and existing dependencies. Do not include pricing, schema, frontend, or deployment changes. Keep the AWS safeguards regression without importing unrelated thinking-binding tests from three-way context. Add canceled-context stream coverage alongside the upstream non-stream regression. Upstream sources: bc795cc fix:修复stop为非字符串和[]string的协议转换问题 (QuantumNous#7935) 4d962e4 fix(relaykit): preserve tool argument numbers in Claude responses (QuantumNous#7996) 0165fef fix(relaykit): preserve Gemini text alongside tool calls (QuantumNous#7998) 34003e9 test: stabilize channel affinity cache keys (QuantumNous#8009) 01da3a5 perf(relay): stop recompiling param override regexes on every request (QuantumNous#8061) ad56112 fix(relay): apply GPT-6 chat parameter rules to gpt-6.1-sol and gpt-6.1-terra (QuantumNous#8064) 3f926c3 fix(metrics): count completed streams after context cancellation (QuantumNous#7638) 5478811 fix: count completed non-stream relays after context cancellation (QuantumNous#7844) 49271d2 fix(aws): preserve safeguards in Bedrock Invoke requests (QuantumNous#8071) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Replace wall-clock identifiers with an atomic sequence and test names so repeated Windows runs cannot share usage-cache entries. Verification: latest main baseline failed with cumulative counts; patched affinity tests passed -count=20; full service suite and go vet passed. (cherry picked from commit 34003e9) Signed-off-by: sstar16 <3221386464@qq.com> Co-authored-by: sstar16 <152675481+sstar16@users.noreply.github.com>
The upstream test file held one own change: a unique cache name per run, so repeated runs cannot add counters together. Upstream solved the same problem in v1.0.0-rc.48 (QuantumNous#8009), so that file is now restored byte for byte to the tag. Our case lives on in service/hw_channel_affinity_test.go as a direct test of the contract: a fresh name starts at zero, two names stay independent, and the name helper never repeats. Verification: go test ./service/ -run TestHwChannelAffinity -count=2, go vet ./service/, node .hw/toets-haaklijst.mjs origin/main HEAD. Co-authored-by: Claude <noreply@anthropic.com>
Sync 75 upstream commit(s) via merge (fork history preserved). Upstream commits: - 7061447 fix(auth): 校验 Redis 鉴权缓存完整性 (QuantumNous#8200) - ba5f736 fix(gemini): bill embeddings from upstream usageMetadata (QuantumNous#8182) - 94b5216 feat(vertex): add per-channel v1beta1 endpoint switch (QuantumNous#8179) - 83b18fe feat(channel): return created IDs with input mappings (QuantumNous#8164) - 52c1730 feat(gemini): add Argon fields and reasoning mappings (QuantumNous#8177) - 9b473a3 fix(twofa): restart the failure count after a lockout expires (QuantumNous#8172) - 45746ee feat(relay): add opt-in HTTP/2 health checks (QuantumNous#8059) - c046559 feat(plugins): bill gemini omni by the tokens vertex reports (QuantumNous#8153) - 651d5a2 fix(xai): preserve token details in stream usage conversion (QuantumNous#6420) - 70e6af6 perf: read and edit request JSON and base64 with moego (QuantumNous#8148) - d0abbf6 feat(plugins): generate video with Gemini Omni on Vertex AI channels (QuantumNous#8142) - ea343c4 fix(plugins): charge relayed streams even when the reserve or task insert fails (QuantumNous#8121) - fe57cba fix(plugins): prefer Kling's returned price (list_price) for Kling 4.0 cash billing (QuantumNous#8125) - 1424ffd fix(plugins): load plugins that declare their own /{key} address (QuantumNous#8119) - 8b253de fix(plugins): keep Kling 4.0 durations in range and map every video size (QuantumNous#8118) - c59f6fd feat(plugins): serve task plugins at the vendors' own paths and answer as the vendors do (QuantumNous#8117) - 37d23dc fix(profile): honor global sidebar visibility (QuantumNous#7429) - 7743627 fix(deps): upgrade DOMPurify to 3.4.17 (QuantumNous#8116) - 883eeb8 feat(plugins): warn about task models a plugin cannot charge - 1e8c707 chore(deps): bump @codemirror/language from 6.12.4 to 6.13.1 in /web (QuantumNous#8102) - 6e78cb3 chore(deps): bump marked from 18.0.6 to 18.1.2 in /web (QuantumNous#8103) - 9fc70bb chore(deps-dev): bump @tanstack/react-query-devtools in /web (QuantumNous#8104) - cef7820 chore(deps-dev): bump knip from 6.27.0 to 6.43.0 in /web (QuantumNous#8105) - 1695171 chore(deps): bump tailwind-merge from 3.6.0 to 3.7.0 in /web (QuantumNous#8106) - 7fa815e chore(deps-dev): bump fast-uri from 3.1.7 to 3.1.9 in /electron (QuantumNous#8007) - ee0f0ac chore(deps-dev): bump electron from 41.10.6 to 42.11.16 in /electron (QuantumNous#8008) - 837b814 chore(deps): bump undici in /electron (QuantumNous#8006) - 3150dfe chore(deps): bump github.com/go-jose/go-jose/v4 from 4.1.4 to 4.1.6 (QuantumNous#8112) - a3851c2 fix: save Turnstile keys before enabling (QuantumNous#7960) - 4193734 fix(logger): keep gin access and recovery logs on the current log file after rotation (QuantumNous#8098) - f366017 Merge commit from fork - 829f082 fix: unmount authenticated layout on sign-out to stop credential-less refetches (QuantumNous#8110) - 9eda50a Merge commit from fork - a2defd2 Merge commit from fork - e449cc7 feat: sample immediate task successes in model performance metrics (QuantumNous#8067) - fcc241c fix: start affinity fallback at the highest channel priority (QuantumNous#8078) - b08ee86 fix(cloudflare): preserve embedding response data (QuantumNous#8041) - 26c488c fix(relay): allow Azure channels to opt in to Responses WebSocket (QuantumNous#8047) (QuantumNous#8075) - 55515db fix(relay): terminate streams on exact bare done markers (QuantumNous#8074) - 49271d2 fix(aws): preserve safeguards in Bedrock Invoke requests (QuantumNous#8071) - 5478811 fix: count completed non-stream relays after context cancellation (QuantumNous#7844) - ad56112 fix(relay): apply GPT-6 chat parameter rules to gpt-6.1-sol and gpt-6.1-terra (QuantumNous#8064) - 01da3a5 perf(relay): stop recompiling param override regexes on every request (QuantumNous#8061) - 34003e9 test: stabilize channel affinity cache keys (QuantumNous#8009) - 0165fef fix(relaykit): preserve Gemini text alongside tool calls (QuantumNous#7998) - 4d962e4 fix(relaykit): preserve tool argument numbers in Claude responses (QuantumNous#7996) - f1569d1 fix(pricing): classify dynamic per-request billing correctly (QuantumNous#8010) - bc795cc fix:修复stop为非字符串和[]string的协议转换问题 (QuantumNous#7935) - 9823ebc fix(billing): bill cache_creation_input_tokens reported in prompt_tokens_details (QuantumNous#7909) - e835b1b chore(deps): bump axios from 1.18.1 to 1.20.0 in /web (QuantumNous#7835) - 5c8032d chore(deps): bump react-i18next from 17.0.10 to 17.1.0 in /web (QuantumNous#7981) - 0b667ca chore(deps): bump i18next from 26.3.6 to 26.5.3 in /web (QuantumNous#7979) - 4105bd0 chore(deps): bump input-otp from 1.4.2 to 1.5.0 in /web (QuantumNous#7980) - b6b85ca chore(deps): bump react-resizable-panels from 4.12.2 to 4.14.6 in /web (QuantumNous#7982) - 1dafb19 fix(gemini): preserve top-level imageConfig in chat conversion - 0034b24 fix(task): wait up to 72 hours before timing out tasks - a404460 chore(web): upgrade Bun to 1.4.4 and use bun check - 33c61a2 fix: prevent stale values when switching edit drawer records (QuantumNous#7989) - 30748c6 fix(logging): 隐藏访问日志中的查询凭据 (QuantumNous#7972) - 7fb6e57 fix(channels): preserve advanced custom body passthrough settings (QuantumNous#7971) - e9d4d63 feat(billing): bill OpenAI 12-hour prompt cache writes at their own price (QuantumNous#7965) - d0b840e fix(relay): keep the client's JSON Schema property order - d8e6561 feat(web): copy model names from usage log details - 8802113 feat(task): let ordinary channels compete on shared plugin endpoints - eb169e7 feat(pricing): adjust synced upstream prices by the site exchange rate - e2321a5 chore(web): sort locale keys - db80ac8 fix(task): let task plugins validate their own requests - dbe97be feat(task): pass client request headers to task plugin drivers - 556517f feat(task): accept multipart bodies on native plugin routes - 94cc3ff fix(billing): bill Claude cache writes that arrive without a 5m/1h split - 7e65967 fix(relay): stop cutting off slow clients during large stream events - 0c2af97 fix(relay): finish delivered Responses streams without false disconnect errors (QuantumNous#7956) - 7d8b912 fix: upgrade Go to 1.26.10 for CVE-2026-111943 (QuantumNous#7942) - 4d36f2c chore(deps-dev): bump vitest from 4.1.10 to 5.0.4 in /web (QuantumNous#7838) - eea05e0 chore(deps): bump github.com/klauspost/compress from 1.18.3 to 1.18.7 (QuantumNous#7931) Local tests not run (CI-only).
Replace wall-clock identifiers with an atomic sequence and test names so repeated Windows runs cannot share usage-cache entries. Verification: latest main baseline failed with cumulative counts; patched affinity tests passed -count=20; full service suite and go vet passed. Signed-off-by: sstar16 <3221386464@qq.com>
Agent
Links
User request
Out of scope — refuse
If the change matches any item below, tell the user this repository does not accept it and do not open a PR.
Coding Plan
Reverse-engineered channels
Third-party API wrappers
Codex channel-type changes, or compatibility from exposing Codex as a general-purpose API
Codex API-specific protocol or behavior treated as standard OpenAI API behavior
Pass-through-only forwarding (pass-through sends content as-is and does not go through new-api processing logic)
Third-party hosting sites, relay services, or API services
Usage, configuration, or integration (answer from docs and code instead)
Matched: no
If yes, what was told to the user (stop here; do not open a PR): 不适用。
Open gate — do not open unless all are satisfied
go buildor tests passed: yesKind
Issue facts
stats.Total跨测试累加,断言从预期的 1/2 变成 3、4 等累计值。9823ebc上均复现;单独运行用例可通过,组合/重复运行失败。time.Now().UnixNano()生成ruleName和keyFingerprint。相同值命中 TTL 600 秒的全局缓存,导致统计互相覆盖。仅将键改为确定性唯一值后问题消失,未修改生产代码。Change
在
service/channel_affinity_usage_cache_test.go中新增测试专用键生成器:以atomic.Int64序号和t.Name()生成唯一ruleName与keyFingerprint,替换time.Now().UnixNano()。不再依赖时钟粒度,也避免-count重复运行时复用同一个键。Research
Duplicate / prior art
UnixNano、channel_affinity_usage_cache_test、channel affinity flaky Windows。Docs and code
AGENTS.md的确定性测试与测试状态初始化要求,以及.agents/github/PR.md。buildChannelAffinityStatsContextForTest将ruleName/usingGroup/keyFingerprint组合为缓存键;observeChannelAffinityUsageCache在同一键上累计计数,因此测试键必须唯一。Alternatives considered
UnixNano();在 Windows 粗粒度时钟下会碰撞。t.Name();单个进程多次-count执行时仍会重复命中 TTL 内的旧缓存。t.Name()隔离测试,atomic 序号隔离每次调用,同时覆盖 Windows 和重复运行。Files
service/channel_affinity_usage_cache_test.goBehavior
Verification
go test -mod=readonly ./service -run '^TestObserveChannelAffinityUsageCacheByRelayFormat_' -count=20,在pr-affinity-baseline上重复出现expected int(1/2), actual int64(累计值)失败。pr-affinity-test上通过:ok github.com/QuantumNous/new-api/service 5.845s。go test -mod=readonly ./service -count=1通过(6.397s);go vet ./service通过。go test -mod=readonly ./service -timeout=180s -count=1通过(0.504s)。git diff --check通过;提交9140950仅含该测试文件的 12 行新增、7 行删除。-count=20重复执行。Risks
Scope check
Summary by CodeRabbit