Merge remote-tracking branch 'origin/main' into rtt-estimate-origin-c…

…oarse

cli/test/smokehouse/__snapshots__/report-assert-test.js.snap

@@ -3,7 +3,7 @@
 exports[`getAssertionReport works (multiple failing) 1`] = `
 "X difference at cumulative-layout-shift audit.details.items.length
               expected: []
-                 found: [{\\"cumulativeLayoutShiftMainFrame\\":0.13570762803819444,\\"totalCumulativeLayoutShift\\":0.13570762803819444}]
+                 found: [{\\"cumulativeLayoutShiftMainFrame\\":0.13570762803819444}]
 
 
   X difference at cumulative-layout-shift audit.details.blah
@@ -24,8 +24,7 @@ exports[`getAssertionReport works (multiple failing) 1`] = `
           \\"type\\": \\"debugdata\\",
           \\"items\\": [
             {
-              \\"cumulativeLayoutShiftMainFrame\\": 0.13570762803819444,
-              \\"totalCumulativeLayoutShift\\": 0.13570762803819444
+              \\"cumulativeLayoutShiftMainFrame\\": 0.13570762803819444
             }
           ]
         }
@@ -35,7 +34,7 @@ exports[`getAssertionReport works (multiple failing) 1`] = `
 exports[`getAssertionReport works (trivial failing) 1`] = `
 "X difference at cumulative-layout-shift audit.details.items.length
               expected: []
-                 found: [{\\"cumulativeLayoutShiftMainFrame\\":0.13570762803819444,\\"totalCumulativeLayoutShift\\":0.13570762803819444}]
+                 found: [{\\"cumulativeLayoutShiftMainFrame\\":0.13570762803819444}]
 
           found result:
       {
@@ -51,8 +50,7 @@ exports[`getAssertionReport works (trivial failing) 1`] = `
           \\"type\\": \\"debugdata\\",
           \\"items\\": [
             {
-              \\"cumulativeLayoutShiftMainFrame\\": 0.13570762803819444,
-              \\"totalCumulativeLayoutShift\\": 0.13570762803819444
+              \\"cumulativeLayoutShiftMainFrame\\": 0.13570762803819444
             }
           ]
         }

cli/test/smokehouse/test-definitions/dobetterweb.js

@@ -574,6 +574,20 @@ const expectations = {
           },
         },
       },
+      'network-rtt': {
+        details: {
+          items: [
+            {origin: 'http://localhost:10200', rtt: '>0'},
+          ],
+        },
+      },
+      'network-server-latency': {
+        details: {
+          items: [
+            {origin: 'http://localhost:10200', serverResponseTime: '>0'},
+          ],
+        },
+      },
       'metrics': {
         // Flaky in DevTools
         _excludeRunner: 'devtools',
@@ -585,7 +599,7 @@ const expectations = {
       },
       'largest-contentful-paint-element': {
         score: null,
-        displayValue: '1 element found',
+        displayValue: /\d+\xa0ms/,
         details: {
           items: [
             {

cli/test/smokehouse/test-definitions/perf-frame-metrics.js

@@ -78,7 +78,6 @@ const expectations = {
               largestContentfulPaintAllFrames: '<5000',
               cumulativeLayoutShift: '0.133 +/- 0.001',
               cumulativeLayoutShiftMainFrame: '0.001 +/- 0.0005',
-              totalCumulativeLayoutShift: '0.001 +/- 0.0005',
             },
             {
               lcpInvalidated: false,

cli/test/smokehouse/test-definitions/perf-trace-elements.js

@@ -144,7 +144,7 @@ const expectations = {
     audits: {
       'largest-contentful-paint-element': {
         score: null,
-        displayValue: '1 element found',
+        displayValue: /\d+\xa0ms/,
         details: {
           items: {
             0: {

core/audits/audit.js

@@ -348,12 +348,14 @@ class Audit {
   /**
    * @param {typeof Audit} audit
    * @param {string | LH.IcuMessage} errorMessage
+   * @param {string=} errorStack
    * @return {LH.RawIcu<LH.Audit.Result>}
    */
-  static generateErrorAuditResult(audit, errorMessage) {
+  static generateErrorAuditResult(audit, errorMessage, errorStack) {
     return Audit.generateAuditResult(audit, {
       score: null,
       errorMessage,
+      errorStack,
     });
   }
 
@@ -371,7 +373,7 @@ class Audit {
     let scoreDisplayMode = audit.meta.scoreDisplayMode || Audit.SCORING_MODES.BINARY;
 
     // But override if product contents require it.
-    if (product.errorMessage) {
+    if (product.errorMessage !== undefined) {
       // Error result.
       scoreDisplayMode = Audit.SCORING_MODES.ERROR;
     } else if (product.notApplicable) {
@@ -407,6 +409,7 @@ class Audit {
       displayValue: product.displayValue,
       explanation: product.explanation,
       errorMessage: product.errorMessage,
+      errorStack: product.errorStack,
       warnings: product.warnings,
 
       details: product.details,

core/audits/largest-contentful-paint-element.js

@@ -50,19 +50,44 @@ class LargestContentfulPaintElement extends Audit {
   }
 
   /**
-   * @param {LH.Artifacts} artifacts
+   * @param {LH.Artifacts.MetricComputationDataInput} metricComputationData
    * @param {LH.Audit.Context} context
-   * @return {Promise<LH.Audit.Details.Table|undefined>}
+   * @return {Promise<number|undefined>}
    */
-  static async makePhaseTable(artifacts, context) {
-    const trace = artifacts.traces[Audit.DEFAULT_PASS];
-    const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
-    const gatherContext = artifacts.GatherContext;
-    const metricComputationData = {trace, devtoolsLog, gatherContext,
-      settings: context.settings, URL: artifacts.URL};
+  static async getOptionalLCPMetric(metricComputationData, context) {
+    try {
+      const {timing: metricLcp} =
+        await LargestContentfulPaint.request(metricComputationData, context);
+      return metricLcp;
+    } catch {}
+  }
+
+  /**
+   * @param {LH.Artifacts} artifacts
+   * @return {LH.Audit.Details.Table|undefined}
+   */
+  static makeElementTable(artifacts) {
+    const lcpElement = artifacts.TraceElements
+      .find(element => element.traceEventType === 'largest-contentful-paint');
+    if (!lcpElement) return;
+
+    /** @type {LH.Audit.Details.Table['headings']} */
+    const headings = [
+      {key: 'node', valueType: 'node', label: str_(i18n.UIStrings.columnElement)},
+    ];
 
-    const {timing: metricLcp} =
-      await LargestContentfulPaint.request(metricComputationData, context);
+    const lcpElementDetails = [{node: Audit.makeNodeItem(lcpElement.node)}];
+
+    return Audit.makeTableDetails(headings, lcpElementDetails);
+  }
+
+  /**
+   * @param {number} metricLcp
+   * @param {LH.Artifacts.MetricComputationDataInput} metricComputationData
+   * @param {LH.Audit.Context} context
+   * @return {Promise<LH.Audit.Details.Table>}
+   */
+  static async makePhaseTable(metricLcp, metricComputationData, context) {
     const {ttfb, loadStart, loadEnd} = await LCPBreakdown.request(metricComputationData, context);
 
     let loadDelay = 0;
@@ -102,36 +127,29 @@ class LargestContentfulPaintElement extends Audit {
    * @return {Promise<LH.Audit.Product>}
    */
   static async audit(artifacts, context) {
-    const lcpElement = artifacts.TraceElements
-      .find(element => element.traceEventType === 'largest-contentful-paint');
-    const lcpElementDetails = [];
-    if (lcpElement) {
-      lcpElementDetails.push({
-        node: Audit.makeNodeItem(lcpElement.node),
-      });
-    }
-
-    /** @type {LH.Audit.Details.Table['headings']} */
-    const headings = [
-      {key: 'node', valueType: 'node', label: str_(i18n.UIStrings.columnElement)},
-    ];
+    const trace = artifacts.traces[Audit.DEFAULT_PASS];
+    const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
+    const gatherContext = artifacts.GatherContext;
+    const metricComputationData = {trace, devtoolsLog, gatherContext,
+      settings: context.settings, URL: artifacts.URL};
 
-    const elementTable = Audit.makeTableDetails(headings, lcpElementDetails);
+    const elementTable = this.makeElementTable(artifacts);
+    if (!elementTable) return {score: null, notApplicable: true};
 
     const items = [elementTable];
-    if (elementTable.items.length) {
-      const phaseTable = await this.makePhaseTable(artifacts, context);
-      if (phaseTable) items.push(phaseTable);
+    let displayValue;
+
+    const metricLcp = await this.getOptionalLCPMetric(metricComputationData, context);
+    if (metricLcp) {
+      displayValue = str_(i18n.UIStrings.ms, {timeInMs: metricLcp});
+      const phaseTable = await this.makePhaseTable(metricLcp, metricComputationData, context);
+      items.push(phaseTable);
     }
 
     const details = Audit.makeListDetails(items);
 
-    const displayValue = str_(i18n.UIStrings.displayValueElementsFound,
-      {nodeCount: lcpElementDetails.length});
-
     return {
       score: 1,
-      notApplicable: lcpElementDetails.length === 0,
       displayValue,
       details,
     };

core/audits/metrics.js

@@ -11,10 +11,8 @@ import {TimingSummary} from '../computed/metrics/timing-summary.js';
 const DECIMAL_METRIC_KEYS = new Set([
   'cumulativeLayoutShift',
   'cumulativeLayoutShiftMainFrame',
-  'totalCumulativeLayoutShift',
   'observedCumulativeLayoutShift',
   'observedCumulativeLayoutShiftMainFrame',
-  'observedTotalCumulativeLayoutShift',
 ]);
 
 class Metrics extends Audit {

core/audits/network-requests.js

@@ -8,6 +8,7 @@ import {Audit} from './audit.js';
 import UrlUtils from '../lib/url-utils.js';
 import {NetworkRecords} from '../computed/network-records.js';
 import {MainResource} from '../computed/main-resource.js';
+import {EntityClassification} from '../computed/entity-classification.js';
 
 class NetworkRequests extends Audit {
   /**
@@ -31,6 +32,8 @@ class NetworkRequests extends Audit {
   static async audit(artifacts, context) {
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
     const records = await NetworkRecords.request(devtoolsLog, context);
+    const classifiedEntities = await EntityClassification.request(
+      {URL: artifacts.URL, devtoolsLog}, context);
     const earliestRendererStartTime = records.reduce(
       (min, record) => Math.min(min, record.rendererStartTime),
       Infinity
@@ -61,6 +64,8 @@ class NetworkRequests extends Audit {
         ((record.frameId === mainFrameId) || undefined) :
         undefined;
 
+      const entity = classifiedEntities.entityByUrl.get(record.url);
+
       return {
         url: UrlUtils.elideDataURI(record.url),
         sessionTargetType: record.sessionTargetType,
@@ -77,6 +82,7 @@ class NetworkRequests extends Audit {
         priority: record.priority,
         isLinkPreload,
         experimentalFromMainFrame,
+        entity: entity?.name,
         lrEndTimeDeltaMs: endTimeDeltaMs, // Only exists on Lightrider runs
         lrTCPMs: TCPMs, // Only exists on Lightrider runs
         lrRequestMs: requestMs, // Only exists on Lightrider runs

core/audits/server-response-time.js

@@ -46,7 +46,7 @@ class ServerResponseTime extends Audit {
    */
   static calculateResponseTime(record) {
     const timing = record.timing;
-    return timing ? timing.receiveHeadersEnd - timing.sendEnd : 0;
+    return timing ? timing.receiveHeadersStart - timing.sendEnd : 0;
   }
 
   /**

core/computed/metrics/cumulative-layout-shift.js

@@ -101,19 +101,10 @@ class CumulativeLayoutShift {
     return maxScore;
   }
 
-  /**
-   * Sum all layout shift events from the entire trace.
-   * @param {Array<LayoutShiftEvent>} layoutShiftEvents
-   * @return {number}
-   */
-  static calculateTotalCumulativeLayoutShift(layoutShiftEvents) {
-    return layoutShiftEvents.reduce((sum, e) => sum += e.weightedScore, 0);
-  }
-
   /**
    * @param {LH.Trace} trace
    * @param {LH.Artifacts.ComputedContext} context
-   * @return {Promise<{cumulativeLayoutShift: number, cumulativeLayoutShiftMainFrame: number, totalCumulativeLayoutShift: number}>}
+   * @return {Promise<{cumulativeLayoutShift: number, cumulativeLayoutShiftMainFrame: number}>}
    */
   static async compute_(trace, context) {
     const processedTrace = await ProcessedTrace.request(trace, context);
@@ -122,14 +113,9 @@ class CumulativeLayoutShift {
         CumulativeLayoutShift.getLayoutShiftEvents(processedTrace);
     const mainFrameShiftEvents = allFrameShiftEvents.filter(e => e.isMainFrame);
 
-    // The original Cumulative Layout Shift metric, the sum of all main-frame shift events.
-    const totalCumulativeLayoutShift =
-        CumulativeLayoutShift.calculateTotalCumulativeLayoutShift(mainFrameShiftEvents);
-
     return {
       cumulativeLayoutShift: CumulativeLayoutShift.calculate(allFrameShiftEvents),
       cumulativeLayoutShiftMainFrame: CumulativeLayoutShift.calculate(mainFrameShiftEvents),
-      totalCumulativeLayoutShift,
     };
   }
 }

core/computed/metrics/time-to-first-byte.js

@@ -41,15 +41,17 @@ class TimeToFirstByte extends NavigationMetric {
    * @return {Promise<LH.Artifacts.Metric>}
    */
   static async computeObservedMetric(data, context) {
-    const {processedNavigation} = data;
-    const timeOriginTs = processedNavigation.timestamps.timeOrigin;
     const mainResource = await MainResource.request(data, context);
+    if (!mainResource.timing) {
+      throw new Error('missing timing for main resource');
+    }
 
-    // Technically TTFB is the start of the response headers not the end.
-    // That signal isn't available to us so we use header end time as a best guess.
-    const timestamp = mainResource.responseHeadersEndTime * 1000;
+    const {processedNavigation} = data;
+    const timeOriginTs = processedNavigation.timestamps.timeOrigin;
+    const timestampMs =
+      mainResource.timing.requestTime * 1000 + mainResource.timing.receiveHeadersStart;
+    const timestamp = timestampMs * 1000;
     const timing = (timestamp - timeOriginTs) / 1000;
-
     return {timing, timestamp};
   }
 }

core/computed/metrics/timing-summary.js

@@ -65,7 +65,6 @@ class TimingSummary {
     const {
       cumulativeLayoutShift,
       cumulativeLayoutShiftMainFrame,
-      totalCumulativeLayoutShift,
     } = cumulativeLayoutShiftValues || {};
 
     /** @type {LH.Artifacts.TimingSummary} */
@@ -89,7 +88,6 @@ class TimingSummary {
       maxPotentialFID: maxPotentialFID?.timing,
       cumulativeLayoutShift,
       cumulativeLayoutShiftMainFrame,
-      totalCumulativeLayoutShift,
 
       lcpLoadStart: lcpBreakdown?.loadStart,
       lcpLoadEnd: lcpBreakdown?.loadEnd,
@@ -123,7 +121,6 @@ class TimingSummary {
       observedDomContentLoadedTs: processedNavigation?.timestamps.domContentLoaded,
       observedCumulativeLayoutShift: cumulativeLayoutShift,
       observedCumulativeLayoutShiftMainFrame: cumulativeLayoutShiftMainFrame,
-      observedTotalCumulativeLayoutShift: totalCumulativeLayoutShift,
 
       // Include some visual metrics from speedline
       observedFirstVisualChange: speedline.first,

core/gather/driver/execution-context.js

@@ -125,14 +125,22 @@ class ExecutionContext {
 
     this._session.setNextProtocolTimeout(timeout);
     const response = await this._session.sendCommand('Runtime.evaluate', evaluationParams);
-    if (response.exceptionDetails) {
+
+    const ex = response.exceptionDetails;
+    if (ex) {
       // An error occurred before we could even create a Promise, should be *very* rare.
       // Also occurs when the expression is not valid JavaScript.
-      const errorMessage = response.exceptionDetails.exception ?
-        response.exceptionDetails.exception.description :
-        response.exceptionDetails.text;
-      return Promise.reject(new Error(`Evaluation exception: ${errorMessage}`));
+      const elidedExpression = expression.replace(/\s+/g, ' ').substring(0, 100);
+      const messageLines = [
+        'Runtime.evaluate exception',
+        `Expression: ${elidedExpression}\n---- (elided)`,
+        !ex.stackTrace ? `Parse error at: ${ex.lineNumber + 1}:${ex.columnNumber + 1}` : null,
+        ex.exception?.description || ex.text,
+      ].filter(Boolean);
+      const evaluationError = new Error(messageLines.join('\n'));
+      return Promise.reject(evaluationError);
     }
+
     // Protocol should always return a 'result' object, but it is sometimes undefined.  See #6026.
     if (response.result === undefined) {
       return Promise.reject(

core/gather/gatherers/inspector-issues.js

@@ -75,6 +75,8 @@ class InspectorIssues extends FRGatherer {
       quirksModeIssue: [],
       cookieIssue: [],
       sharedArrayBufferIssue: [],
+      stylesheetLoadingIssue: [],
+      federatedAuthUserInfoRequestIssue: [],
     };
     const keys = /** @type {Array<keyof LH.Artifacts['InspectorIssues']>} */(Object.keys(artifact));
     for (const key of keys) {