From 8ff6277db444ec5afa05e3b4ed3124391466eeb5 Mon Sep 17 00:00:00 2001
From: Georgii Lobko <globko@amazon.de>
Date: Tue, 2 Jun 2026 11:41:41 +0200
Subject: [PATCH] chore: AppLayout EBs metrics

---
 .../__tests__/widget-areas-error-boundaries.test.tsx     | 7 +++++++
 .../visual-refresh-toolbar/drawer/global-ai-drawer.tsx   | 9 ++++++---
 .../drawer/global-bottom-drawer.tsx                      | 2 +-
 .../visual-refresh-toolbar/drawer/global-drawer.tsx      | 2 +-
 src/app-layout/visual-refresh-toolbar/index.tsx          | 2 +-
 src/app-layout/visual-refresh-toolbar/state/index.tsx    | 2 +-
 .../visual-refresh-toolbar/toolbar/drawer-triggers.tsx   | 6 +++---
 src/app-layout/visual-refresh-toolbar/toolbar/index.tsx  | 6 +++---
 .../widget-areas/after-main-slot.tsx                     | 4 ++--
 .../widget-areas/before-main-slot.tsx                    | 4 ++--
 .../widget-areas/bottom-content-slot.tsx                 | 2 +-
 .../widget-areas/top-content-slot.tsx                    | 2 +-
 src/error-boundary/interfaces.ts                         | 1 +
 src/error-boundary/internal.tsx                          | 7 ++++++-
 14 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/app-layout/__tests__/widget-areas-error-boundaries.test.tsx b/src/app-layout/__tests__/widget-areas-error-boundaries.test.tsx
index dd798f2936..bd49c950dd 100644
--- a/src/app-layout/__tests__/widget-areas-error-boundaries.test.tsx
+++ b/src/app-layout/__tests__/widget-areas-error-boundaries.test.tsx
@@ -5,6 +5,7 @@ import { render } from '@testing-library/react';
 
 import AppLayout from '../../../lib/components/app-layout';
 import ErrorBoundary from '../../../lib/components/error-boundary';
+import { metrics } from '../../../lib/components/internal/metrics';
 import awsuiPlugins from '../../../lib/components/internal/plugins';
 import { DrawerConfig } from '../../../lib/components/internal/plugins/controllers/drawers';
 import * as awsuiWidgetPlugins from '../../../lib/components/internal/plugins/widget';
@@ -35,8 +36,10 @@ function renderComponent(jsx: React.ReactElement) {
   };
 }
 
+let sendPanoramaMetricSpy: jest.SpyInstance;
 beforeEach(() => {
   jest.resetAllMocks();
+  sendPanoramaMetricSpy = jest.spyOn(metrics, 'sendOpsMetricObject').mockImplementation(() => {});
 });
 
 describe('AppLayout error boundaries: errors in different areas does not crash the entire app layout', () => {
@@ -66,6 +69,10 @@ describe('AppLayout error boundaries: errors in different areas does not crash t
             expect(onError).toHaveBeenCalled();
           }
           expect(consoleSpy).toHaveBeenCalled();
+          expect(sendPanoramaMetricSpy).toHaveBeenCalledWith('awsui-app-layout-error-boundary-fired', {
+            appLayoutPart: expect.any(String),
+            errorMessage: expect.any(String),
+          });
         };
 
         test('left drawer content', () => {
diff --git a/src/app-layout/visual-refresh-toolbar/drawer/global-ai-drawer.tsx b/src/app-layout/visual-refresh-toolbar/drawer/global-ai-drawer.tsx
index 27b9221e3d..2155695cb1 100644
--- a/src/app-layout/visual-refresh-toolbar/drawer/global-ai-drawer.tsx
+++ b/src/app-layout/visual-refresh-toolbar/drawer/global-ai-drawer.tsx
@@ -131,7 +131,7 @@ export function AppLayoutGlobalAiDrawerImplementation({
   }
 
   return (
-    <AppLayoutBuiltInErrorBoundary>
+    <AppLayoutBuiltInErrorBoundary appLayoutPart="left-drawer">
       <Transition nodeRef={drawerRef} in={show} appear={show} mountOnEnter={true} timeout={250}>
         {drawerTransitionState => {
           return (
@@ -192,7 +192,10 @@ export function AppLayoutGlobalAiDrawerImplementation({
                       <div className={styles['drawer-content']}>
                         <header className={styles['drawer-content-header']}>
                           <div className={styles['drawer-content-header-content']}>
-                            <AppLayoutBuiltInErrorBoundary renderFallback={() => <div />}>
+                            <AppLayoutBuiltInErrorBoundary
+                              renderFallback={() => <div />}
+                              appLayoutPart="left-drawer-header"
+                            >
                               {activeAiDrawer?.header ?? <div />}
                             </AppLayoutBuiltInErrorBoundary>
                             <div className={styles['drawer-actions']}>
@@ -248,7 +251,7 @@ export function AppLayoutGlobalAiDrawerImplementation({
                             </div>
                           )}
                         </header>
-                        <AppLayoutBuiltInErrorBoundary>
+                        <AppLayoutBuiltInErrorBoundary appLayoutPart="left-drawer-content">
                           <div className={styles['drawer-content-content']}>{activeAiDrawer?.content}</div>
                         </AppLayoutBuiltInErrorBoundary>
                       </div>
diff --git a/src/app-layout/visual-refresh-toolbar/drawer/global-bottom-drawer.tsx b/src/app-layout/visual-refresh-toolbar/drawer/global-bottom-drawer.tsx
index 318229db1f..5faa6c3642 100644
--- a/src/app-layout/visual-refresh-toolbar/drawer/global-bottom-drawer.tsx
+++ b/src/app-layout/visual-refresh-toolbar/drawer/global-bottom-drawer.tsx
@@ -189,7 +189,7 @@ function AppLayoutGlobalBottomDrawerImplementation({
   }, [reportBottomDrawerSize, size]);
 
   return (
-    <AppLayoutBuiltInErrorBoundary>
+    <AppLayoutBuiltInErrorBoundary appLayoutPart="bottom-drawer">
       <Transition
         nodeRef={drawerRef}
         in={show || isExpanded}
diff --git a/src/app-layout/visual-refresh-toolbar/drawer/global-drawer.tsx b/src/app-layout/visual-refresh-toolbar/drawer/global-drawer.tsx
index a14f4861db..9ed12fffe3 100644
--- a/src/app-layout/visual-refresh-toolbar/drawer/global-drawer.tsx
+++ b/src/app-layout/visual-refresh-toolbar/drawer/global-drawer.tsx
@@ -110,7 +110,7 @@ function AppLayoutGlobalDrawerImplementation({
   }
 
   return (
-    <AppLayoutBuiltInErrorBoundary>
+    <AppLayoutBuiltInErrorBoundary appLayoutPart="global-drawer">
       <Transition nodeRef={drawerRef} in={show || isExpanded} appear={show || isExpanded} timeout={0}>
         {state => {
           return (
diff --git a/src/app-layout/visual-refresh-toolbar/index.tsx b/src/app-layout/visual-refresh-toolbar/index.tsx
index 834dafe972..af827b85f9 100644
--- a/src/app-layout/visual-refresh-toolbar/index.tsx
+++ b/src/app-layout/visual-refresh-toolbar/index.tsx
@@ -105,7 +105,7 @@ function AppLayoutVisualRefreshToolbarWithI18n({
           <AppLayoutVisibilityContext.Provider value={appLayoutState.isIntersecting}>
             {/* Rendering a hidden copy of breadcrumbs to trigger their deduplication */}
             {(embeddedViewMode || !toolbarProps) && appLayoutPropsWithI18n.breadcrumbs ? (
-              <AppLayoutBuiltInErrorBoundary>
+              <AppLayoutBuiltInErrorBoundary appLayoutPart="screenreader-only-breadcrumbs">
                 <ScreenreaderOnly>{appLayoutPropsWithI18n.breadcrumbs}</ScreenreaderOnly>
               </AppLayoutBuiltInErrorBoundary>
             ) : null}
diff --git a/src/app-layout/visual-refresh-toolbar/state/index.tsx b/src/app-layout/visual-refresh-toolbar/state/index.tsx
index d3968819c6..3ce1047714 100644
--- a/src/app-layout/visual-refresh-toolbar/state/index.tsx
+++ b/src/app-layout/visual-refresh-toolbar/state/index.tsx
@@ -58,7 +58,7 @@ export const AppLayoutStateProviderInternal = ({ appLayoutProps, stateManager, f
 
 export const AppLayoutStateProvider = (props: AppLayoutStateProps) => {
   return (
-    <AppLayoutBuiltInErrorBoundary>
+    <AppLayoutBuiltInErrorBoundary appLayoutPart="app-layout-state">
       <AppLayoutStateProviderInternal {...props} />
     </AppLayoutBuiltInErrorBoundary>
   );
diff --git a/src/app-layout/visual-refresh-toolbar/toolbar/drawer-triggers.tsx b/src/app-layout/visual-refresh-toolbar/toolbar/drawer-triggers.tsx
index 1f5fc8b05f..ef6c403447 100644
--- a/src/app-layout/visual-refresh-toolbar/toolbar/drawer-triggers.tsx
+++ b/src/app-layout/visual-refresh-toolbar/toolbar/drawer-triggers.tsx
@@ -189,7 +189,7 @@ export function DrawerTriggers({
           const selected = !expandedDrawerId && item.id === activeDrawerId;
           const isFeatureNotificationsDrawer = featureNotificationsProps?.drawer?.id === item.id;
           return (
-            <AppLayoutBuiltInErrorBoundary key={item.id}>
+            <AppLayoutBuiltInErrorBoundary key={item.id} appLayoutPart="toolbar-trigger-drawer">
               <TriggerButton
                 ariaLabel={item.ariaLabels?.triggerButton}
                 ariaExpanded={selected}
@@ -243,7 +243,7 @@ export function DrawerTriggers({
           }
 
           return (
-            <AppLayoutBuiltInErrorBoundary key={item.id}>
+            <AppLayoutBuiltInErrorBoundary key={item.id} appLayoutPart="toolbar-trigger-drawer">
               <TriggerButton
                 ariaLabel={item.ariaLabels?.triggerButton}
                 ariaExpanded={selected}
@@ -282,7 +282,7 @@ export function DrawerTriggers({
           );
         })}
         {overflowItems.length > 0 && (
-          <AppLayoutBuiltInErrorBoundary>
+          <AppLayoutBuiltInErrorBoundary appLayoutPart="toolbar-trigger-overflow-menu">
             <OverflowMenu
               items={overflowItems.map(item => {
                 const isBottom = item?.position === 'bottom';
diff --git a/src/app-layout/visual-refresh-toolbar/toolbar/index.tsx b/src/app-layout/visual-refresh-toolbar/toolbar/index.tsx
index b7df9fe324..80cc1e79a2 100644
--- a/src/app-layout/visual-refresh-toolbar/toolbar/index.tsx
+++ b/src/app-layout/visual-refresh-toolbar/toolbar/index.tsx
@@ -203,7 +203,7 @@ export function AppLayoutToolbarImplementation({
       <ToolbarContainer hasAiDrawer={!!activeAiDrawerId}>
         {hasNavigation && (
           <nav {...navLandmarkAttributes} className={clsx(styles['universal-toolbar-nav'])}>
-            <AppLayoutBuiltInErrorBoundary>
+            <AppLayoutBuiltInErrorBoundary appLayoutPart="toolbar-trigger-nav">
               <TriggerButton
                 ariaLabel={ariaLabels?.navigationToggle ?? undefined}
                 ariaExpanded={!drawerExpandedMode && navigationOpen}
@@ -226,7 +226,7 @@ export function AppLayoutToolbarImplementation({
           </nav>
         )}
         {(breadcrumbs || discoveredBreadcrumbs) && (
-          <AppLayoutBuiltInErrorBoundary>
+          <AppLayoutBuiltInErrorBoundary appLayoutPart="breadcrumbs">
             <ToolbarBreadcrumbsSection
               ownBreadcrumbs={appLayoutInternals.breadcrumbs}
               discoveredBreadcrumbs={appLayoutInternals.discoveredBreadcrumbs}
@@ -239,7 +239,7 @@ export function AppLayoutToolbarImplementation({
           bottomDrawers?.length ||
           (hasSplitPanel && splitPanelToggleProps?.displayed)) && (
           <div className={clsx(styles['universal-toolbar-drawers'])}>
-            <AppLayoutBuiltInErrorBoundary>
+            <AppLayoutBuiltInErrorBoundary appLayoutPart="toolbar-triggers">
               <DrawerTriggers
                 ariaLabels={ariaLabels}
                 activeDrawerId={activeDrawerId ?? null}
diff --git a/src/app-layout/visual-refresh-toolbar/widget-areas/after-main-slot.tsx b/src/app-layout/visual-refresh-toolbar/widget-areas/after-main-slot.tsx
index 53faeeb1fd..9cdf90dbf0 100644
--- a/src/app-layout/visual-refresh-toolbar/widget-areas/after-main-slot.tsx
+++ b/src/app-layout/visual-refresh-toolbar/widget-areas/after-main-slot.tsx
@@ -64,7 +64,7 @@ export const AfterMainSlotImplementationInternal = ({ appLayoutState, appLayoutP
           </AppLayoutSplitPanelSide>
         </div>
       )}
-      <AppLayoutBuiltInErrorBoundary>
+      <AppLayoutBuiltInErrorBoundary appLayoutPart="tools">
         <div
           className={clsx(
             styles.tools,
@@ -93,7 +93,7 @@ export const AfterMainSlotImplementationInternal = ({ appLayoutState, appLayoutP
 };
 
 export const AfterMainSlotImplementation = (props: SkeletonPartProps) => (
-  <AppLayoutBuiltInErrorBoundary>
+  <AppLayoutBuiltInErrorBoundary appLayoutPart="after-main-slot">
     <AfterMainSlotImplementationInternal {...props} />
   </AppLayoutBuiltInErrorBoundary>
 );
diff --git a/src/app-layout/visual-refresh-toolbar/widget-areas/before-main-slot.tsx b/src/app-layout/visual-refresh-toolbar/widget-areas/before-main-slot.tsx
index e18d304b3d..fd05eec54e 100644
--- a/src/app-layout/visual-refresh-toolbar/widget-areas/before-main-slot.tsx
+++ b/src/app-layout/visual-refresh-toolbar/widget-areas/before-main-slot.tsx
@@ -123,7 +123,7 @@ export const BeforeMainSlotImplementationInternal = ({
             (drawerExpandedMode || drawerExpandedModeInChildLayout) && styles.hidden
           )}
         >
-          <AppLayoutBuiltInErrorBoundary>
+          <AppLayoutBuiltInErrorBoundary appLayoutPart="nav">
             <AppLayoutNavigation
               appLayoutInternals={appLayoutState.appLayoutInternals}
               bottomDrawerReportedSize={bottomDrawerReportedSize}
@@ -136,7 +136,7 @@ export const BeforeMainSlotImplementationInternal = ({
 };
 
 export const BeforeMainSlotImplementation = (props: SkeletonPartProps) => (
-  <AppLayoutBuiltInErrorBoundary>
+  <AppLayoutBuiltInErrorBoundary appLayoutPart="before-main-slot">
     <BeforeMainSlotImplementationInternal {...props} />
   </AppLayoutBuiltInErrorBoundary>
 );
diff --git a/src/app-layout/visual-refresh-toolbar/widget-areas/bottom-content-slot.tsx b/src/app-layout/visual-refresh-toolbar/widget-areas/bottom-content-slot.tsx
index 990f2082c1..f4bdb7484a 100644
--- a/src/app-layout/visual-refresh-toolbar/widget-areas/bottom-content-slot.tsx
+++ b/src/app-layout/visual-refresh-toolbar/widget-areas/bottom-content-slot.tsx
@@ -42,7 +42,7 @@ export const BottomContentSlotImplementationInternal = ({ appLayoutState, appLay
 
 export const BottomContentSlotImplementation = (props: SkeletonPartProps) => {
   return (
-    <AppLayoutBuiltInErrorBoundary>
+    <AppLayoutBuiltInErrorBoundary appLayoutPart="bottom-content-slot">
       <BottomContentSlotImplementationInternal {...props} />
     </AppLayoutBuiltInErrorBoundary>
   );
diff --git a/src/app-layout/visual-refresh-toolbar/widget-areas/top-content-slot.tsx b/src/app-layout/visual-refresh-toolbar/widget-areas/top-content-slot.tsx
index ed2ac9bb70..b86c60c67d 100644
--- a/src/app-layout/visual-refresh-toolbar/widget-areas/top-content-slot.tsx
+++ b/src/app-layout/visual-refresh-toolbar/widget-areas/top-content-slot.tsx
@@ -36,7 +36,7 @@ export const TopContentSlotImplementationInternal = ({ appLayoutProps, appLayout
 };
 
 export const TopContentSlotImplementation = (props: SkeletonPartProps) => (
-  <AppLayoutBuiltInErrorBoundary>
+  <AppLayoutBuiltInErrorBoundary appLayoutPart="top-content-slot">
     <TopContentSlotImplementationInternal {...props} />
   </AppLayoutBuiltInErrorBoundary>
 );
diff --git a/src/error-boundary/interfaces.ts b/src/error-boundary/interfaces.ts
index 32ed18166a..320f291751 100644
--- a/src/error-boundary/interfaces.ts
+++ b/src/error-boundary/interfaces.ts
@@ -112,4 +112,5 @@ export interface BuiltInErrorBoundaryProps {
 
 export interface AppLayoutBuiltInErrorBoundaryProps extends BuiltInErrorBoundaryProps {
   renderFallback?: ErrorBoundaryProps['renderFallback'];
+  appLayoutPart?: string;
 }
diff --git a/src/error-boundary/internal.tsx b/src/error-boundary/internal.tsx
index 04492f8b51..b629723ae6 100644
--- a/src/error-boundary/internal.tsx
+++ b/src/error-boundary/internal.tsx
@@ -6,6 +6,7 @@ import React, { Component, createContext, useContext, useState } from 'react';
 import { useMergeRefs } from '@cloudscape-design/component-toolkit/internal';
 
 import { InternalBaseComponentProps } from '../internal/hooks/use-base-component';
+import { metrics } from '../internal/metrics';
 import { SomeRequired } from '../internal/types';
 import { ErrorBoundaryFallback } from './fallback';
 import { AppLayoutBuiltInErrorBoundaryProps, BuiltInErrorBoundaryProps, ErrorBoundaryProps } from './interfaces';
@@ -92,6 +93,7 @@ export function AppLayoutBuiltInErrorBoundary({
   suppressNested = false,
   children,
   renderFallback = () => <></>,
+  appLayoutPart,
 }: AppLayoutBuiltInErrorBoundaryProps) {
   const context = useContext(ErrorBoundariesContext);
   const thisSuppressed = context.suppressed === true || context.suppressed === RootSuppressed;
@@ -104,7 +106,10 @@ export function AppLayoutBuiltInErrorBoundary({
       className={styles['app-layout-part-fallback']}
       onError={error => {
         context?.onError?.(error);
-        // TODO Implement cloudscape error reporting
+        metrics.sendOpsMetricObject('awsui-app-layout-error-boundary-fired', {
+          errorMessage: error?.error?.message ?? '',
+          appLayoutPart: appLayoutPart ?? '',
+        });
       }}
     >
       <ErrorBoundariesContext.Provider value={{ ...context, suppressed: nextSuppressed, renderFallback }}>