chore: remove delivery event concept#653
Merged
Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
- Rename interface methods: InsertManyDeliveryEvent -> InsertMany, ListDeliveryEvent -> ListDelivery, RetrieveDeliveryEvent -> RetrieveDelivery - Rename request types: ListDeliveryEventRequest -> ListDeliveryRequest, etc. - Add DeliveryRecord type for query results with Event and Delivery - Update memlogstore, pglogstore, chlogstore implementations - Update all API handlers and tests to use new interface - Remove DeliveryEventID field from Delivery struct Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Add DeliveryTask struct with IdempotencyKey() and RetryID() methods - Update deliverymq to publish/consume DeliveryTask instead of DeliveryEvent - Update publishmq to create and enqueue DeliveryTask - Update RetryTask to convert to DeliveryTask - Update API handlers, eventtracer, alert, emetrics to use DeliveryTask - Fix Delivery fields (TenantID, Attempt, Manual) not being set before logging - Add :manual suffix to idempotency key for manual retries Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Update chlogstore/README.md method names and SQL examples - Update pglogstore/README.md method names - Update tracer_test.go comment to reference DeliveryTask Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Preserves Event-Delivery pairing through the insert flow, eliminating the need for eventMap reconstruction in ClickHouse implementation. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
alexluong
force-pushed
the
model-delivery-event
branch
from
04c3ebd to
9277a3f
Compare
* refactor: add event fetching to retry scheduler Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: align mock eventGetter with logstore behavior Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor: remove logStore from messagehandler Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * chore: remove dead eventGetter code from messagehandler tests Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * test: verify manual retry publishes full event data Extends TestRetryDelivery to verify that the manual retry API publishes a DeliveryTask with complete event data to deliveryMQ. This ensures the deliverymq handler receives full event data for manual retries, consistent with the scheduled retry flow which fetches event data in the retry scheduler. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * test: add failing tests for retry race condition Add unit and e2e tests verifying that retries are not lost when the retry scheduler queries logstore before the event has been persisted. Test scenario: 1. Initial delivery fails, retry is scheduled 2. Retry scheduler queries logstore for event data 3. Event is not yet persisted (logmq batching delay) 4. Retry should remain in queue and be reprocessed later Tests added: - TestRetryScheduler_RaceCondition_EventNotYetPersisted (unit test) - TestE2E_Regression_RetryRaceCondition (e2e test) Also adds: - RetryVisibilityTimeoutSeconds config option - WithRetryVisibilityTimeout scheduler option - mockDelayedEventGetter for simulating delayed persistence Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: return error when event not found in logstore during retry Return error instead of nil so the retry message stays in queue and will be reprocessed after the visibility timeout. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * test: improve flaky tests * chore: dev yaml * chore: `make test` skip cmd/e2e by default --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Update test files to use the new Attempt naming: - logstore/drivertest/*.go: AttemptFactory, ListAttempt, RetrieveAttempt - deliverymq/*_test.go: AttemptStatus*, entry.Attempt - apirouter/*_test.go: AttemptFactory, /attempts API paths - logmq/batchprocessor_test.go: AttemptFactory, Attempt struct fields All unit tests pass (1665 tests). Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Revert attempt_metadata → delivery_metadata in OpenAPI (matches Go code) - Fix config: delivery_prefix → attempt_prefix, example att → atm - Fix variable names: deliveryID → attemptID, attErr → atmErr - Fix test names: TestListDeliveries → TestListAttempts, etc. - Update doc links for renamed API endpoints - Update comments and test descriptions Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Remove comments that simply restate what the next line of code does, such as "// Create client" before NewClient() or "// Check if exists" before .Exists(). Preserves all meaningful comments including godoc, section headers, WHY explanations, and unit clarifications. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
refactor: rename delivery -> attempt
alexbouchardd
requested changes
Jan 28, 2026
alexbouchardd
approved these changes
Jan 30, 2026
3 tasks
alexluong
added a commit
that referenced
this pull request
Mar 18, 2026
EventDelivered() was accidentally dropped in the DeliveryEvent → DeliveryTask refactor (PR #653). The old code derived delivery success/failure from the model, but DeliveryTask no longer carries result data. Add RecordDeliveryResult on DeliverSpan so doHandle can signal the outcome, and emit the metric in End(). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
6 tasks
alexluong
added a commit
that referenced
this pull request
Mar 18, 2026
* fix: restore delivered_events metric recording EventDelivered() was accidentally dropped in the DeliveryEvent → DeliveryTask refactor (PR #653). The old code derived delivery success/failure from the model, but DeliveryTask no longer carries result data. Add RecordDeliveryResult on DeliverSpan so doHandle can signal the outcome, and emit the metric in End(). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: document why emetrics.New() error is ignored Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: grafana dashboard status label and otel collector config Dashboard queried status="ok" but the code emits status="success" for delivered_events metric. Also update otel-collector telemetry config for newer collector versions (address → readers). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Remove DeliveryEvent concept
This PR replaces the monolithic
DeliveryEventtype with purpose-specific types that better represent the different stages of event delivery.New Types
DeliveryTask- Message type for delivery processing queues. Flows frompublishmq→deliverymqand from retry →deliverymq. Contains theEvent,DestinationID,Attempt, andManualflag. ProvidesIdempotencyKey()for deduplication.RetryTask- Message type for scheduling retries. Contains only the metadata needed to re-fetch the event and re-attempt delivery (EventID,TenantID,DestinationID,Attempt). Converts toDeliveryTaskwhen the retry fires.LogEntry- Message type for the log queue. Contains bothEventandDeliveryfor persistence to the logstore.DeliveryRecord- Query result type returned by logstore. ContainsDeliverywith optionalEventpopulation for API responses.Logstore Interface Changes
InsertManyDeliveryEvent→InsertMany(events, deliveries)ListDeliveryEvent→ListDelivery(returnsDeliveryRecord)RetrieveDeliveryEvent→RetrieveDelivery(returnsDeliveryRecord)Other Changes
delivery_event_idcolumn from database schema/delivery-eventsAPI endpointsevent_id:destination_idformat (with:manualsuffix for manual retries)