-
Notifications
You must be signed in to change notification settings - Fork 339
Enhancement/12133 cron errors #12347
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
b318eca
Add cron health checks + shared cron-error log marker.
zutigrm 8db9c63
Add stale pending email-log detection.
zutigrm 518ec86
Run cron health check before returning email-reporting errors.
zutigrm 2edbb18
Track worker zero-send progress for cron error escalation.
zutigrm 3da26d2
Wire cron health checker into REST + worker services.
zutigrm f8b8eea
Add cron scheduler error title/body copy.
zutigrm dbdf36c
Add cron scheduler error notice component.
zutigrm 1c953af
Route cron_scheduler_error to dedicated notice.
zutigrm 8212fee
Test cron scheduler notice render copy.
zutigrm 3c4d322
Add cron scheduler error routing test.
zutigrm 86c2ff0
Add integration coverage for stale cron + zero-send behavior.
zutigrm 72d4620
Add stale pending log query tests.
zutigrm 59f12db
Assert health check runs before latest batch error lookup.
zutigrm 7e49b60
Assert health check runs before latest batch error lookup.
zutigrm 566fe44
Fix empty comment.
tofumatt 9ad8628
Update per CR feedback.
zutigrm c6b03d0
Merge remote-tracking branch 'origin/develop' into enhancement/12133-…
zutigrm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
57 changes: 57 additions & 0 deletions
57
assets/js/components/email-reporting/notices/errors/CronSchedulerErrorNotice.js
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,57 @@ | ||
| /** | ||
| * CronSchedulerErrorNotice component. | ||
| * | ||
| * Site Kit by Google, Copyright 2026 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| /** | ||
| * WordPress dependencies | ||
| */ | ||
| import { __ } from '@wordpress/i18n'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import Notice from '@/js/components/Notice'; | ||
| import { TYPES } from '@/js/components/Notice/constants'; | ||
| import useNotificationEvents from '@/js/googlesitekit/notifications/hooks/useNotificationEvents'; | ||
| import withIntersectionObserver from '@/js/util/withIntersectionObserver'; | ||
|
|
||
| export const EMAIL_REPORTING_CRON_SCHEDULER_ERROR_NOTICE = | ||
| 'email_reporting_cron_scheduler_error_notice'; | ||
|
|
||
| const NoticeWithIntersectionObserver = withIntersectionObserver( Notice ); | ||
|
|
||
| export default function CronSchedulerErrorNotice() { | ||
| const trackEvents = useNotificationEvents( | ||
| EMAIL_REPORTING_CRON_SCHEDULER_ERROR_NOTICE | ||
| ); | ||
|
|
||
| return ( | ||
| <NoticeWithIntersectionObserver | ||
| className="googlesitekit-email-reporting__admin-settings-notice" | ||
| type={ TYPES.ERROR } | ||
| title={ __( | ||
| 'Email reports are failing to send', | ||
| 'google-site-kit' | ||
| ) } | ||
| description={ __( | ||
| "We were unable to deliver your report, likely due to a WP-Cron configuration error in your WordPress site's system settings. To fix this, contact your administrator or get help. Report delivery will automatically resume once the issue is resolved.", | ||
tofumatt marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| 'google-site-kit' | ||
| ) } | ||
| onInView={ trackEvents.view } | ||
| /> | ||
| ); | ||
| } | ||
38 changes: 38 additions & 0 deletions
38
assets/js/components/email-reporting/notices/errors/CronSchedulerErrorNotice.test.js
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,38 @@ | ||
| /** | ||
| * CronSchedulerErrorNotice component tests. | ||
| * | ||
| * Site Kit by Google, Copyright 2026 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import CronSchedulerErrorNotice from './CronSchedulerErrorNotice'; | ||
| import { render } from '../../../../../../tests/js/test-utils'; | ||
|
|
||
| describe( 'CronSchedulerErrorNotice', () => { | ||
| it( 'renders expected title and description', () => { | ||
| const { getByText } = render( <CronSchedulerErrorNotice /> ); | ||
|
|
||
| expect( | ||
| getByText( 'Email reports are failing to send' ) | ||
| ).toBeInTheDocument(); | ||
| expect( | ||
| getByText( | ||
| "We were unable to deliver your report, likely due to a WP-Cron configuration error in your WordPress site's system settings. To fix this, contact your administrator or get help. Report delivery will automatically resume once the issue is resolved." | ||
tofumatt marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ) | ||
| ).toBeInTheDocument(); | ||
| } ); | ||
| } ); | ||
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
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.
Uh oh!
There was an error while loading. Please reload this page.