fix(web-vitals): Check for valid entry in updatedCLS (#3816)

* fix: Check for valid entry in updatedCLS * fix: Make sure sessionEntries is a non-empty array
getsentry · Jul 19, 2021 · f8a4d60 · f8a4d60
1 parent d79b6a7
commit f8a4d60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/tracing/src/browser/web-vitals/getCLS.ts b/packages/tracing/src/browser/web-vitals/getCLS.ts
@@ -39,7 +39,7 @@ export const getCLS = (onReport: ReportHandler, reportAllChanges?: boolean): voi
   let report: ReturnType<typeof bindReporter>;
 
   const entryHandler = (entry: LayoutShift): void => {
-    if (!entry.hadRecentInput) {
+    if (entry && !entry.hadRecentInput) {
       (metric.value as number) += entry.value;
       metric.entries.push(entry);
       if (report) {

diff --git a/packages/tracing/src/browser/web-vitals/getUpdatedCLS.ts b/packages/tracing/src/browser/web-vitals/getUpdatedCLS.ts
@@ -43,7 +43,8 @@ export const getUpdatedCLS = (onReport: ReportHandler, reportAllChanges?: boolea
 
   const entryHandler = (entry: LayoutShift): void => {
     // Only count layout shifts without recent user input.
-    if (!entry.hadRecentInput) {
+    // TODO: Figure out why entry can be undefined
+    if (entry && !entry.hadRecentInput) {
       const firstSessionEntry = sessionEntries[0];
       const lastSessionEntry = sessionEntries[sessionEntries.length - 1];
 
@@ -52,6 +53,7 @@ export const getUpdatedCLS = (onReport: ReportHandler, reportAllChanges?: boolea
       // entry in the current session. Otherwise, start a new session.
       if (
         sessionValue &&
+        sessionEntries.length !== 0 &&
         entry.startTime - lastSessionEntry.startTime < 1000 &&
         entry.startTime - firstSessionEntry.startTime < 5000
       ) {