Increment attempts before each attempt
#167
Merged
Conversation
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
There was a problem hiding this comment.
Pull Request Overview
This PR refactors EventManager and Data to support dependency injection of the event queue, moves the call to increment_attempt so it runs before each batch send attempt, and updates tests to use mocks instead of Patchwork redefines. It also adjusts the default attempt count for pageview events in BatchQueue and adds an integration test for retry logic.
- Inject
EventQueueintoEventManagerandData, replacing static calls - Call
increment_attemptat the start ofsend_saved_events_batch - Update PHPUnit tests to mock
EventQueueandEventManagerdirectly - Adjust default
attemptsfor"pageview"events inBatchQueue - Add an integration test verifying retry limits
Reviewed Changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| includes/EventManager.php | Added constructor injection, replaced static queue calls, moved increment_attempt earlier in batch send |
| includes/Data.php | Accepts injected EventManager instead of instantiating internally |
| includes/EventQueue/Queues/BatchQueue.php | Set pageview events to 0 initial attempts, updated comment |
| includes/HiiveConnection.php | Improved docblock types for connect parameters |
| tests/phpunit/includes/EventManagerTest.php | Refactored tests to use injected EventQueue mocks |
| tests/phpunit/includes/DataTest.php | Updated tests to inject EventManager mocks |
| tests/integration/EventManagerIntegrationTest.php | New integration test for batch retry behavior |
Comments suppressed due to low confidence (2)
includes/EventQueue/Queues/BatchQueue.php:89
- Add a unit test to verify that events with key
'pageview'initializeattemptsto 0 and are not sent synchronously, ensuring this conditional behavior is covered.
'pageview' === $event->key ? 0 : 1
includes/EventManager.php:52
- [nitpick] The property
$queueis ambiguous alongside$event_queue; consider renaming it to$pendingEventsor similar to clarify its purpose.
private $queue = array();
circlecube
approved these changes
May 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Proposed changes
Previously, if there was a failure sending the events, e.g. connection failure, 500, the call to
BatchQueue::increment_attempt()never ran.This PR moves that call to happen before sending the event is attempted.
Type of Change
Production
Development
Video
Checklist
Further comments