fix(adapters): drop duplicate webhook deliveries at ingest #1987
+414
−3
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| import { DeliveryDeduplicator } from './delivery-dedup'; | ||
|
|
||
| /** Deterministic clock: tests advance time explicitly instead of sleeping. */ | ||
| function createClock(start = 0) { | ||
| let now = start; | ||
| return { | ||
| now: () => now, | ||
| advance: (ms: number) => { | ||
| now += ms; | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| describe('DeliveryDeduplicator', () => { | ||
| test('first sighting of a key is not a duplicate', () => { | ||
| const dedup = new DeliveryDeduplicator(); | ||
| expect(dedup.seen('comment:owner/repo#42:100:2026-06-12T00:00:00Z')).toBe(false); | ||
| }); | ||
|
|
||
| test('repeat sighting within TTL is a duplicate', () => { | ||
| const dedup = new DeliveryDeduplicator(); | ||
| const key = 'comment:owner/repo#42:100:2026-06-12T00:00:00Z'; | ||
| expect(dedup.seen(key)).toBe(false); | ||
| expect(dedup.seen(key)).toBe(true); | ||
| expect(dedup.seen(key)).toBe(true); | ||
| }); | ||
|
|
||
| test('different keys do not collide', () => { | ||
| const dedup = new DeliveryDeduplicator(); | ||
| expect(dedup.seen('comment:owner/repo#42:100:t1')).toBe(false); | ||
| expect(dedup.seen('comment:owner/repo#42:101:t1')).toBe(false); | ||
| expect(dedup.seen('comment:owner/repo#43:100:t1')).toBe(false); | ||
| }); | ||
|
|
||
| test('same comment with new updated_at is not a duplicate (edit re-trigger)', () => { | ||
| const dedup = new DeliveryDeduplicator(); | ||
| expect(dedup.seen('comment:owner/repo#42:100:2026-06-12T00:00:00Z')).toBe(false); | ||
| expect(dedup.seen('comment:owner/repo#42:100:2026-06-12T00:05:00Z')).toBe(false); | ||
| }); | ||
|
|
||
| test('key expires after TTL and may run again', () => { | ||
| const clock = createClock(); | ||
| const dedup = new DeliveryDeduplicator(20, 10_000, clock.now); | ||
| const key = 'delivery:guid-1'; | ||
| expect(dedup.seen(key)).toBe(false); | ||
| expect(dedup.seen(key)).toBe(true); | ||
|
|
||
| clock.advance(30); | ||
|
|
||
| expect(dedup.seen(key)).toBe(false); | ||
| expect(dedup.seen(key)).toBe(true); | ||
| }); | ||
|
|
||
| test('key just inside the TTL window is still a duplicate', () => { | ||
| const clock = createClock(); | ||
| const dedup = new DeliveryDeduplicator(20, 10_000, clock.now); | ||
| expect(dedup.seen('k')).toBe(false); | ||
|
|
||
| clock.advance(19); | ||
|
|
||
| expect(dedup.seen('k')).toBe(true); | ||
| }); | ||
|
|
||
| test('expired entries are pruned on insert', () => { | ||
| const clock = createClock(); | ||
| const dedup = new DeliveryDeduplicator(20, 10_000, clock.now); | ||
| dedup.seen('a'); | ||
| dedup.seen('b'); | ||
| expect(dedup.size).toBe(2); | ||
|
|
||
| clock.advance(30); | ||
|
|
||
| dedup.seen('c'); | ||
| expect(dedup.size).toBe(1); // a and b expired and pruned | ||
| }); | ||
|
|
||
| test('evicts oldest entries past max size', () => { | ||
| const dedup = new DeliveryDeduplicator(60_000, 3); | ||
| dedup.seen('a'); | ||
| dedup.seen('b'); | ||
| dedup.seen('c'); | ||
| dedup.seen('d'); // evicts a | ||
|
|
||
| expect(dedup.size).toBe(3); | ||
| expect(dedup.seen('a')).toBe(false); // evicted, so first-seen again | ||
| expect(dedup.seen('d')).toBe(true); // still tracked | ||
| }); | ||
|
|
||
| test('re-seeing a key after expiry refreshes its eviction position', () => { | ||
| const clock = createClock(); | ||
| const dedup = new DeliveryDeduplicator(20, 10, clock.now); | ||
| dedup.seen('a'); | ||
| clock.advance(30); | ||
| dedup.seen('b'); | ||
| dedup.seen('a'); // expired -> refreshed, moves behind b | ||
|
|
||
| expect(dedup.seen('a')).toBe(true); | ||
| expect(dedup.seen('b')).toBe(true); | ||
| expect(dedup.size).toBe(2); | ||
| }); | ||
| }); |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🩺 Stability & Availability | 🟠 Major | ⚡ Quick win
Dedup tests depend on unmocked downstream Octokit failures.
Line 521-Line 526 swallows expected errors from an unmocked webhook path, which makes these tests depend on external call behavior instead of only dedup logic. Mock the minimal Octokit methods in
createDedupAdapter()and makedeliver()await success deterministically.Suggested fix
function createDedupAdapter(): GitHubAdapter { const adapter = new GitHubAdapter( { kind: 'pat', token: 'fake-token-for-testing' }, 'fake-webhook-secret', mockLockManager, 'archon' ); // `@ts-expect-error` - accessing private method for testing adapter.verifySignature = mock(() => true); + // `@ts-expect-error` - accessing private property for testing + adapter.octokit = { + rest: { + repos: { + get: mock(async () => ({ data: { default_branch: 'main' } })), + }, + issues: { + listComments: mock(async () => ({ data: [] })), + createComment: mock(async () => ({ data: { id: 1 } })), + }, + }, + }; return adapter; } async function deliver(adapter: GitHubAdapter, payload: string, deliveryId?: string) { - try { - await adapter.handleWebhook(payload, 'mock-signature', deliveryId); - } catch { - // Expected - Octokit API not mocked for the downstream message path. - } + await adapter.handleWebhook(payload, 'mock-signature', deliveryId); }As per coding guidelines, “Keep tests deterministic — no flaky timing or network dependence without guardrails” and “mock external dependencies (database, AI SDKs, platform APIs).”
🤖 Prompt for AI Agents
Source: Coding guidelines