Prerender2Fallback: Add pipelineId to PreloadingAttempt

This CL adds `pipelineId` to `PreloadingAttmept`.

UI change follows in the next CL.

Bug: 364509578
Change-Id: I2536dc7bc7cfe8c4a8159735e5ac2fc78f05f526
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6068789
Auto-Submit: Ken Okada <[email protected]>
Commit-Queue: Danil Somsikov <[email protected]>
Commit-Queue: Ken Okada <[email protected]>
Reviewed-by: Danil Somsikov <[email protected]>

Author: kenoss

front_end/core/sdk/PreloadingModel.test.ts

@@ -59,6 +59,7 @@ describeWithMockConnection('PreloadingModel', () => {
         action: Protocol.Preload.SpeculationAction.Prefetch,
         url: 'https://example.com/subresource.js',
       },
+      pipelineId: 'pipelineId:1',
       status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
       requestId: 'requestId:1',
     });
@@ -92,6 +93,7 @@ describeWithMockConnection('PreloadingModel', () => {
             action: Protocol.Preload.SpeculationAction.Prefetch,
             url: 'https://example.com/subresource.js' as Platform.DevToolsPath.UrlString,
           },
+          pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
           status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
           prefetchStatus: null,
           requestId: 'requestId:1' as Protocol.Network.RequestId,
@@ -146,6 +148,7 @@ describeWithMockConnection('PreloadingModel', () => {
         action: Protocol.Preload.SpeculationAction.Prerender,
         url: 'https://example.com/page.html',
       },
+      pipelineId: 'pipelineId:2',
       status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
     });
 
@@ -196,6 +199,7 @@ describeWithMockConnection('PreloadingModel', () => {
             action: Protocol.Preload.SpeculationAction.Prefetch,
             url: 'https://example.com/subresource.js' as Platform.DevToolsPath.UrlString,
           },
+          pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
           status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
           prefetchStatus: null,
           requestId: 'requestId:1' as Protocol.Network.RequestId,
@@ -212,6 +216,7 @@ describeWithMockConnection('PreloadingModel', () => {
             action: Protocol.Preload.SpeculationAction.Prerender,
             url: 'https://example.com/page.html' as Platform.DevToolsPath.UrlString,
           },
+          pipelineId: 'pipelineId:2' as Protocol.Preload.PreloadPipelineId,
           status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
           prerenderStatus: null,
           disallowedMojoInterface: null,
@@ -245,6 +250,7 @@ describeWithMockConnection('PreloadingModel', () => {
         action: Protocol.Preload.SpeculationAction.Prefetch,
         url: 'https://example.com/subresource.js',
       },
+      pipelineId: 'pipelineId:1',
       status: SDK.PreloadingModel.PreloadingStatus.FAILURE,
       prefetchStatus: Protocol.Preload.PrefetchStatus.PrefetchEvictedAfterCandidateRemoved,
       requestId: 'requestId:1',
@@ -279,6 +285,7 @@ describeWithMockConnection('PreloadingModel', () => {
             action: Protocol.Preload.SpeculationAction.Prerender,
             url: 'https://example.com/page.html' as Platform.DevToolsPath.UrlString,
           },
+          pipelineId: 'pipelineId:2' as Protocol.Preload.PreloadPipelineId,
           status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
           prerenderStatus: null,
           disallowedMojoInterface: null,
@@ -339,6 +346,7 @@ describeWithMockConnection('PreloadingModel', () => {
             action: Protocol.Preload.SpeculationAction.Prefetch,
             url: 'https://example.com/subresource.js' as Platform.DevToolsPath.UrlString,
           },
+          pipelineId: null,
           status: SDK.PreloadingModel.PreloadingStatus.NOT_TRIGGERED,
           prefetchStatus: null,
           // Invalid request id
@@ -396,6 +404,7 @@ describeWithMockConnection('PreloadingModel', () => {
         action: Protocol.Preload.SpeculationAction.Prefetch,
         url: 'https://example.com/subresource1.js',
       },
+      pipelineId: 'pipelineId:1',
       status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
     });
 
@@ -438,6 +447,7 @@ describeWithMockConnection('PreloadingModel', () => {
         action: Protocol.Preload.SpeculationAction.Prefetch,
         url: 'https://example.com/subresource2.js',
       },
+      pipelineId: 'pipelineId:1',
       status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
       requestId: 'requestId:1',
     });
@@ -471,6 +481,7 @@ describeWithMockConnection('PreloadingModel', () => {
             action: Protocol.Preload.SpeculationAction.Prefetch,
             url: 'https://example.com/subresource2.js' as Platform.DevToolsPath.UrlString,
           },
+          pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
           status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
           prefetchStatus: null,
           requestId: 'requestId:1' as Protocol.Network.RequestId,
@@ -554,6 +565,7 @@ describeWithMockConnection('PreloadingModel', () => {
         action: Protocol.Preload.SpeculationAction.Prefetch,
         url: 'https://example.com/subresource12.js',
       },
+      pipelineId: 'pipelineId:1',
       status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
       requestId: 'requestId:1',
     });
@@ -563,6 +575,7 @@ describeWithMockConnection('PreloadingModel', () => {
         action: Protocol.Preload.SpeculationAction.Prefetch,
         url: 'https://example.com/subresource2.js',
       },
+      pipelineId: 'pipelineId:2',
       status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
       requestId: 'requestId:2',
     });
@@ -577,6 +590,7 @@ describeWithMockConnection('PreloadingModel', () => {
             action: Protocol.Preload.SpeculationAction.Prefetch,
             url: 'https://example.com/subresource12.js' as Platform.DevToolsPath.UrlString,
           },
+          pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
           status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
           prefetchStatus: null,
           requestId: 'requestId:1' as Protocol.Network.RequestId,
@@ -593,6 +607,7 @@ describeWithMockConnection('PreloadingModel', () => {
             action: Protocol.Preload.SpeculationAction.Prefetch,
             url: 'https://example.com/subresource2.js' as Platform.DevToolsPath.UrlString,
           },
+          pipelineId: 'pipelineId:2' as Protocol.Preload.PreloadPipelineId,
           status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
           prefetchStatus: null,
           requestId: 'requestId:2' as Protocol.Network.RequestId,
@@ -612,6 +627,7 @@ describeWithMockConnection('PreloadingModel', () => {
             action: Protocol.Preload.SpeculationAction.Prefetch,
             url: 'https://example.com/subresource12.js' as Platform.DevToolsPath.UrlString,
           },
+          pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
           status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
           prefetchStatus: null,
           requestId: 'requestId:1' as Protocol.Network.RequestId,
@@ -631,6 +647,7 @@ describeWithMockConnection('PreloadingModel', () => {
             action: Protocol.Preload.SpeculationAction.Prefetch,
             url: 'https://example.com/subresource12.js' as Platform.DevToolsPath.UrlString,
           },
+          pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
           status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
           prefetchStatus: null,
           requestId: 'requestId:1' as Protocol.Network.RequestId,
@@ -647,6 +664,7 @@ describeWithMockConnection('PreloadingModel', () => {
             action: Protocol.Preload.SpeculationAction.Prefetch,
             url: 'https://example.com/subresource2.js' as Platform.DevToolsPath.UrlString,
           },
+          pipelineId: 'pipelineId:2' as Protocol.Preload.PreloadPipelineId,
           status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
           prefetchStatus: null,
           requestId: 'requestId:2' as Protocol.Network.RequestId,

front_end/core/sdk/PreloadingModel.ts

@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import type * as Common from '../common/common.js';
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
-
-import {assertNotNullOrUndefined} from '../platform/platform.js';
 import * as Protocol from '../../generated/protocol.js';
-import {SDKModel} from './SDKModel.js';
-import {Capability, type Target} from './Target.js';
-import {TargetManager} from './TargetManager.js';
+import type * as Common from '../common/common.js';
+import {assertNotNullOrUndefined} from '../platform/platform.js';
+
 import {
   Events as ResourceTreeModelEvents,
   PrimaryPageChangeType,
-  ResourceTreeModel,
   type ResourceTreeFrame,
+  ResourceTreeModel,
 } from './ResourceTreeModel.js';
+import {SDKModel} from './SDKModel.js';
+import {Capability, type Target} from './Target.js';
+import {TargetManager} from './TargetManager.js';
 
 export interface WithId<I, V> {
   id: I;
@@ -258,6 +258,7 @@ export class PreloadingModel extends SDKModel<EventTypes> {
     const attempt: PrefetchAttemptInternal = {
       action: Protocol.Preload.SpeculationAction.Prefetch,
       key: event.key,
+      pipelineId: event.pipelineId,
       status: convertPreloadingStatus(event.status),
       prefetchStatus: event.prefetchStatus || null,
       requestId: event.requestId,
@@ -272,6 +273,7 @@ export class PreloadingModel extends SDKModel<EventTypes> {
     const attempt: PrerenderAttemptInternal = {
       action: Protocol.Preload.SpeculationAction.Prerender,
       key: event.key,
+      pipelineId: event.pipelineId,
       status: convertPreloadingStatus(event.status),
       prerenderStatus: event.prerenderStatus || null,
       disallowedMojoInterface: event.disallowedMojoInterface || null,
@@ -429,6 +431,7 @@ export type PreloadingAttempt = PrefetchAttempt|PrerenderAttempt;
 export interface PrefetchAttempt {
   action: Protocol.Preload.SpeculationAction.Prefetch;
   key: Protocol.Preload.PreloadingAttemptKey;
+  pipelineId: Protocol.Preload.PreloadPipelineId|null;
   status: PreloadingStatus;
   prefetchStatus: Protocol.Preload.PrefetchStatus|null;
   requestId: Protocol.Network.RequestId;
@@ -439,6 +442,7 @@ export interface PrefetchAttempt {
 export interface PrerenderAttempt {
   action: Protocol.Preload.SpeculationAction.Prerender;
   key: Protocol.Preload.PreloadingAttemptKey;
+  pipelineId: Protocol.Preload.PreloadPipelineId|null;
   status: PreloadingStatus;
   prerenderStatus: Protocol.Preload.PrerenderFinalStatus|null;
   disallowedMojoInterface: string|null;
@@ -452,6 +456,7 @@ export type PreloadingAttemptInternal = PrefetchAttemptInternal|PrerenderAttempt
 export interface PrefetchAttemptInternal {
   action: Protocol.Preload.SpeculationAction.Prefetch;
   key: Protocol.Preload.PreloadingAttemptKey;
+  pipelineId: Protocol.Preload.PreloadPipelineId|null;
   status: PreloadingStatus;
   prefetchStatus: Protocol.Preload.PrefetchStatus|null;
   requestId: Protocol.Network.RequestId;
@@ -460,6 +465,7 @@ export interface PrefetchAttemptInternal {
 export interface PrerenderAttemptInternal {
   action: Protocol.Preload.SpeculationAction.Prerender;
   key: Protocol.Preload.PreloadingAttemptKey;
+  pipelineId: Protocol.Preload.PreloadPipelineId|null;
   status: PreloadingStatus;
   prerenderStatus: Protocol.Preload.PrerenderFinalStatus|null;
   disallowedMojoInterface: string|null;
@@ -524,7 +530,7 @@ class PreloadingAttemptRegistry {
     return this.enrich(attempt, sources.getById(id));
   }
 
-  // Returs preloading attempts that triggered by the rule set with `ruleSetId`.
+  // Returns preloading attempts that triggered by the rule set with `ruleSetId`.
   // `ruleSetId === null` means "do not filter".
   //
   // Returns reference. Don't save returned values.
@@ -560,6 +566,7 @@ class PreloadingAttemptRegistry {
           attempt = {
             action: Protocol.Preload.SpeculationAction.Prefetch,
             key,
+            pipelineId: null,
             status: PreloadingStatus.NOT_TRIGGERED,
             prefetchStatus: null,
             // Fill invalid request id.
@@ -570,6 +577,7 @@ class PreloadingAttemptRegistry {
           attempt = {
             action: Protocol.Preload.SpeculationAction.Prerender,
             key,
+            pipelineId: null,
             status: PreloadingStatus.NOT_TRIGGERED,
             prerenderStatus: null,
             disallowedMojoInterface: null,

front_end/panels/application/preloading/PreloadingView.test.ts

@@ -201,12 +201,12 @@ class NavigationEmulator {
     const prerenderUrl = 'https://example.com' + json['prerender'][0]['urls'][0];
 
     this.prerenderStatusUpdatedEvent = {
-      pipelineId: 'test-pipeline-id' as Protocol.Preload.PreloadPipelineId,
       key: {
         loaderId: this.loaderId,
         action: Protocol.Preload.SpeculationAction.Prerender,
         url: prerenderUrl,
       },
+      pipelineId: `pipelineId:0.${this.seq}` as Protocol.Preload.PreloadPipelineId,
       status: Protocol.Preload.PreloadingStatus.Running,
     };
     dispatchEvent(this.primaryTarget, 'Preload.prerenderStatusUpdated', this.prerenderStatusUpdatedEvent);

front_end/panels/application/preloading/components/PreloadingDetailsReportView.test.ts

@@ -60,6 +60,7 @@ describeWithEnvironment('PreloadingDetailsReportView', () => {
           url,
           targetHint: undefined,
         },
+        pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
         status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
         prerenderStatus: null,
         disallowedMojoInterface: null,
@@ -112,6 +113,7 @@ describeWithEnvironment('PreloadingDetailsReportView', () => {
           url,
           targetHint: undefined,
         },
+        pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
         status: SDK.PreloadingModel.PreloadingStatus.FAILURE,
         prerenderStatus: Protocol.Preload.PrerenderFinalStatus.MojoBinderPolicy,
         disallowedMojoInterface: 'device.mojom.GamepadMonitor',
@@ -172,6 +174,7 @@ describeWithEnvironment('PreloadingDetailsReportView', () => {
           url,
           targetHint: undefined,
         },
+        pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
         status: SDK.PreloadingModel.PreloadingStatus.FAILURE,
         prefetchStatus: Protocol.Preload.PrefetchStatus.PrefetchFailedNon2XX,
         requestId: 'requestId:1' as Protocol.Network.RequestId,
@@ -232,6 +235,7 @@ describeWithEnvironment('PreloadingDetailsReportView', () => {
           url,
           targetHint: undefined,
         },
+        pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
         status: SDK.PreloadingModel.PreloadingStatus.READY,
         prefetchStatus: null,
         requestId: 'requestId:1' as Protocol.Network.RequestId,

front_end/panels/application/preloading/components/PreloadingGrid.test.ts

@@ -43,6 +43,7 @@ describeWithEnvironment('PreloadingGrid', () => {
                 action: Protocol.Preload.SpeculationAction.Prefetch,
                 url: 'https://example.com/prefetched.html' as Platform.DevToolsPath.UrlString,
               },
+              pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
               status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
               prefetchStatus: null,
               requestId: 'requestId:1' as Protocol.Network.RequestId,
@@ -87,6 +88,7 @@ describeWithEnvironment('PreloadingGrid', () => {
                 action: Protocol.Preload.SpeculationAction.Prefetch,
                 url: 'https://cross-origin.example.com/prefetched.html' as Platform.DevToolsPath.UrlString,
               },
+              pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
               status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
               prefetchStatus: null,
               requestId: 'requestId:1' as Protocol.Network.RequestId,
@@ -131,6 +133,7 @@ describeWithEnvironment('PreloadingGrid', () => {
                 action: Protocol.Preload.SpeculationAction.Prefetch,
                 url: 'https://example.com/prefetched.html' as Platform.DevToolsPath.UrlString,
               },
+              pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
               status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
               prefetchStatus: null,
               requestId: 'requestId:1' as Protocol.Network.RequestId,
@@ -177,6 +180,7 @@ describeWithEnvironment('PreloadingGrid', () => {
                   action: Protocol.Preload.SpeculationAction.Prefetch,
                   url: 'https://example.com/rule-set-missing.html' as Platform.DevToolsPath.UrlString,
                 },
+                pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
                 status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
                 prefetchStatus: null,
                 requestId: 'requestId:1' as Protocol.Network.RequestId,
@@ -194,6 +198,7 @@ describeWithEnvironment('PreloadingGrid', () => {
                   action: Protocol.Preload.SpeculationAction.Prefetch,
                   url: 'https://example.com/multiple-rule-sets.html' as Platform.DevToolsPath.UrlString,
                 },
+                pipelineId: 'pipelineId:2' as Protocol.Preload.PreloadPipelineId,
                 status: SDK.PreloadingModel.PreloadingStatus.RUNNING,
                 prefetchStatus: null,
                 requestId: 'requestId:2' as Protocol.Network.RequestId,
@@ -255,6 +260,7 @@ describeWithEnvironment('PreloadingGrid', () => {
                 action: Protocol.Preload.SpeculationAction.Prerender,
                 url: 'https://example.com/prerendered.html' as Platform.DevToolsPath.UrlString,
               },
+              pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
               status: SDK.PreloadingModel.PreloadingStatus.FAILURE,
               prerenderStatus: Protocol.Preload.PrerenderFinalStatus.MojoBinderPolicy,
               disallowedMojoInterface: 'device.mojom.GamepadMonitor',

front_end/panels/application/preloading/components/PreloadingMismatchedHeadersGrid.test.ts

@@ -35,6 +35,7 @@ async function testPreloadingMismatchedHeadersGrid(
       action: Protocol.Preload.SpeculationAction.Prerender,
       url: 'https://example.com/prerendered.html' as Platform.DevToolsPath.UrlString,
     },
+    pipelineId: 'pipelineId:1' as Protocol.Preload.PreloadPipelineId,
     status: SDK.PreloadingModel.PreloadingStatus.FAILURE,
     prerenderStatus: Protocol.Preload.PrerenderFinalStatus.ActivationNavigationParameterMismatch,
     disallowedMojoInterface: null,