Skip to content

MSD: Send unknown error to logstash #107233

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.

Sign up for GitHub

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 3 commits into from
Nov 21, 2025
Merged

MSD: Send unknown error to logstash #107233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea4a5e5
Send unknown error to logstash
taipeicoder Nov 20, 2025
ba5bb37
Add backport
taipeicoder Nov 20, 2025
4a48baa
Use defaultOnCatch
taipeicoder Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions client/dashboard/.eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ module.exports = {
// Allowed: calypso/lib/explat
// Allowed: calypso/lib/interval/use-interval (temporary)
// Allowed: calypso/lib/load-dev-helpers
// Allowed: calypso/lib/logstash
// Allowed: calypso/lib/wp
'!calypso/lib',
'calypso/lib/*',
'!calypso/lib/explat',
'!calypso/lib/interval',
'!calypso/lib/load-dev-helpers',
'!calypso/lib/logstash',
'!calypso/lib/wp',
// Allowed: calypso/assets/icons
// Allowed: calypso/assets/images
Expand Down
8 changes: 2 additions & 6 deletions client/dashboard/app/500/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Notice } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import Notice from '../../components/notice';
import { PageHeader } from '../../components/page-header';
import PageLayout from '../../components/page-layout';
import RouterLinkButton from '../../components/router-link-button';
Expand All @@ -18,11 +18,7 @@ function UnknownError( { error }: { error: Error } ) {
}
/>
}
notices={
<Notice status="error" isDismissible={ false }>
{ error.message }
</Notice>
}
notices={ <Notice variant="error">{ error.message }</Notice> }
></PageLayout>
);
}
Expand Down
16 changes: 16 additions & 0 deletions client/dashboard/app/router/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import calypsoConfig from '@automattic/calypso-config';
import { Router, createRoute, redirect } from '@tanstack/react-router';
import { logToLogstash } from 'calypso/lib/logstash';
import NotFound from '../404';
import UnknownError from '../500';
import { createDomainsRoutes } from './domains';
Expand All @@ -8,6 +10,7 @@ import { createPluginsRoutes } from './plugins';
import { rootRoute } from './root';
import { createSitesRoutes } from './sites';
import type { AppConfig } from '../context';
import type { ErrorInfo } from 'react';

interface RouteContext {
config?: AppConfig;
Expand Down Expand Up @@ -61,6 +64,19 @@ export const getRouter = ( config: AppConfig ) => {
},
defaultErrorComponent: UnknownError,
defaultNotFoundComponent: NotFound,
defaultOnCatch: ( error: Error, errorInfo: ErrorInfo ) => {
logToLogstash( {
feature: 'calypso_client',
message: 'Unknown error',
severity: calypsoConfig( 'env_id' ) === 'production' ? 'error' : 'debug',
tags: [ 'dashboard' ],
properties: {
env: calypsoConfig( 'env_id' ),
message: error.message,
stack: errorInfo.componentStack,
},
} );
},
defaultPreload: 'intent',
defaultPreloadStaleTime: 0,
// Calling document.startViewTransition() ourselves is really tricky,
Expand Down
17 changes: 17 additions & 0 deletions client/sites/v2/components/500.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { __ } from '@wordpress/i18n';
import Notice from 'calypso/dashboard/components/notice';
import { PageHeader } from 'calypso/dashboard/components/page-header';
import PageLayout from 'calypso/dashboard/components/page-layout';

function UnknownError( { error }: { error: Error } ) {
return (
<PageLayout
header={
<PageHeader title={ __( '500 Error' ) } description={ __( 'Something wrong happened.' ) } />
}
notices={ <Notice variant="error">{ error.message }</Notice> }
></PageLayout>
);
}

export default UnknownError;
18 changes: 18 additions & 0 deletions client/sites/v2/utils/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,34 @@
import calypsoConfig from '@automattic/calypso-config';
import pagejs from '@automattic/calypso-router';
import { createMemoryHistory } from '@tanstack/react-router';
import { logToLogstash } from 'calypso/lib/logstash';
import UnknownError from '../components/500';
import type { AnyRoute, AnyRouter } from '@tanstack/react-router';
import type { AppConfig } from 'calypso/dashboard/app/context';
import type { ErrorInfo } from 'react';

export function getRouterOptions( config: AppConfig ) {
return {
basepath: config.basePath,
context: {
config,
},
defaultOnCatch: ( error: Error, errorInfo: ErrorInfo ) => {
logToLogstash( {
feature: 'calypso_client',
message: 'Unknown error (backport)',
severity: calypsoConfig( 'env_id' ) === 'production' ? 'error' : 'debug',
tags: [ 'dashboard' ],
properties: {
env: calypsoConfig( 'env_id' ),
message: error.message,
stack: errorInfo.componentStack,
},
} );
},
defaultPreload: 'intent' as const,
defaultPreloadStaleTime: 0,
defaultErrorComponent: UnknownError,
defaultNotFoundComponent: () => null,
defaultViewTransition: true,

Expand Down