[RPP] Use parsedTrace everywhere to hold all derived data

Instead of passing around insights, metadata and syntheticEventsManager
separately, use the parsedTrace object. This CL makes pretty much
everything that acts on a trace go through this interface. The result
is more consistent code and fewer function arguments across much of the
performance and trace code.

Also renamed "parsedTraceFile" to "parsedTrace".

This CL should have no functional change.

Bug: 358583420
Change-Id: I7e87c86edf807bc81a4ec8db5cf260162864146f
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6936714
Reviewed-by: Paul Irish <[email protected]>
Commit-Queue: Connor Clark <[email protected]>

Author: Connor Clark

front_end/legacy_test_runner/performance_test_runner/TimelineTestRunner.js

@@ -119,7 +119,7 @@ PerformanceTestRunner.createTraceEngineDataFromEvents = async function(events) {
   await model.parse(events);
   // Model only has one trace, so we can hardcode 0 here to get the latest
   // result.
-  return model.handlerData(0);
+  return model.parsedTrace(0)?.data;
 };
 
 PerformanceTestRunner.createTimelineController = function() {

front_end/models/ai_assistance/agents/PerformanceAgent.test.ts

@@ -119,24 +119,26 @@ describeWithEnvironment('PerformanceAgent', () => {
 describeWithEnvironment('PerformanceAgent – call tree focus', () => {
   describe('getOrigin()', () => {
     it('calculates the origin of the selected node when it has a URL associated with it', async function() {
-      const {data} = await TraceLoader.traceEngine(this, 'web-dev-with-commit.json.gz');
+      const parsedTrace = await TraceLoader.traceEngine(this, 'web-dev-with-commit.json.gz');
       // An Evaluate Script event, picked because it has a URL of googletagmanager.com/...
-      const evalScriptEvent = allThreadEntriesInTrace(data).find(
-          event => event.name === Trace.Types.Events.Name.EVALUATE_SCRIPT && event.ts === 122411195649);
+      const evalScriptEvent =
+          allThreadEntriesInTrace(parsedTrace)
+              .find(event => event.name === Trace.Types.Events.Name.EVALUATE_SCRIPT && event.ts === 122411195649);
       assert.exists(evalScriptEvent);
-      const aiCallTree = TimelineUtils.AICallTree.AICallTree.fromEvent(evalScriptEvent, data);
+      const aiCallTree = TimelineUtils.AICallTree.AICallTree.fromEvent(evalScriptEvent, parsedTrace);
       assert.isOk(aiCallTree);
       const context = PerformanceTraceContext.fromCallTree(aiCallTree);
       assert.strictEqual(context.getOrigin(), 'https://www.googletagmanager.com');
     });
 
     it('returns a random but deterministic "origin" for nodes that have no URL associated', async function() {
-      const {data} = await TraceLoader.traceEngine(this, 'web-dev-with-commit.json.gz');
+      const parsedTrace = await TraceLoader.traceEngine(this, 'web-dev-with-commit.json.gz');
       // A random layout event with no URL associated
-      const layoutEvent = allThreadEntriesInTrace(data).find(
-          event => event.name === Trace.Types.Events.Name.LAYOUT && event.ts === 122411130078);
+      const layoutEvent =
+          allThreadEntriesInTrace(parsedTrace)
+              .find(event => event.name === Trace.Types.Events.Name.LAYOUT && event.ts === 122411130078);
       assert.exists(layoutEvent);
-      const aiCallTree = TimelineUtils.AICallTree.AICallTree.fromEvent(layoutEvent, data);
+      const aiCallTree = TimelineUtils.AICallTree.AICallTree.fromEvent(layoutEvent, parsedTrace);
       assert.isOk(aiCallTree);
       const context = PerformanceTraceContext.fromCallTree(aiCallTree);
       assert.strictEqual(context.getOrigin(), 'Layout_90829_259_122411130078');
@@ -145,11 +147,11 @@ describeWithEnvironment('PerformanceAgent – call tree focus', () => {
 
   describe('run', function() {
     it('generates an answer', async function() {
-      const {data} = await TraceLoader.traceEngine(this, 'web-dev-outermost-frames.json.gz');
+      const parsedTrace = await TraceLoader.traceEngine(this, 'web-dev-outermost-frames.json.gz');
       // A basic Layout.
-      const layoutEvt = allThreadEntriesInTrace(data).find(event => event.ts === 465457096322);
+      const layoutEvt = allThreadEntriesInTrace(parsedTrace).find(event => event.ts === 465457096322);
       assert.exists(layoutEvt);
-      const aiCallTree = TimelineUtils.AICallTree.AICallTree.fromEvent(layoutEvt, data);
+      const aiCallTree = TimelineUtils.AICallTree.AICallTree.fromEvent(layoutEvt, parsedTrace);
       assert.exists(aiCallTree);
 
       const agent = new PerformanceAgent(
@@ -264,30 +266,34 @@ const FAKE_INP_MODEL = {
   state: 'fail',
   frameId: '123',
 } as const;
-const FAKE_PARSED_TRACE = {
+const FAKE_HANDLER_DATA = {
   Meta: {traceBounds: {min: 0, max: 10}, mainFrameURL: 'https://www.example.com'},
 } as unknown as Trace.Handlers.Types.HandlerData;
 const FAKE_INSIGHTS = new Map([['', {model: {LCPBreakdown: FAKE_LCP_MODEL, INPBreakdown: FAKE_INP_MODEL}}]]) as
     unknown as Trace.Insights.Types.TraceInsightSets;
 const FAKE_METADATA = {} as unknown as Trace.Types.File.MetaData;
+const FAKE_PARSED_TRACE = {
+  data: FAKE_HANDLER_DATA,
+  insights: FAKE_INSIGHTS,
+  metadata: FAKE_METADATA,
+} as unknown as Trace.TraceModel.ParsedTrace;
 
 function createAgentForInsightConversation(opts: {aidaClient?: Host.AidaClient.AidaClient} = {}) {
   return new PerformanceAgent({aidaClient: opts.aidaClient ?? mockAidaClient()}, ConversationType.PERFORMANCE_INSIGHT);
 }
 
 describeWithEnvironment('PerformanceAgent – insight focus', () => {
   it('uses the min and max bounds of the trace as the origin', async function() {
-    const {data, insights, metadata} = await TraceLoader.traceEngine(this, 'lcp-images.json.gz');
-    assert.isOk(insights);
-    const [firstNav] = data.Meta.mainFrameNavigations;
-    const lcpBreakdown = getInsightOrError('LCPBreakdown', insights, firstNav);
-    const context = PerformanceTraceContext.fromInsight(data, insights, metadata, lcpBreakdown);
+    const parsedTrace = await TraceLoader.traceEngine(this, 'lcp-images.json.gz');
+    assert.isOk(parsedTrace.insights);
+    const [firstNav] = parsedTrace.data.Meta.mainFrameNavigations;
+    const lcpBreakdown = getInsightOrError('LCPBreakdown', parsedTrace.insights, firstNav);
+    const context = PerformanceTraceContext.fromInsight(parsedTrace, lcpBreakdown);
     assert.strictEqual(context.getOrigin(), 'trace-658799706428-658804825864');
   });
 
   it('outputs the right title for the selected insight', async () => {
-    const context =
-        PerformanceTraceContext.fromInsight(FAKE_PARSED_TRACE, FAKE_INSIGHTS, FAKE_METADATA, FAKE_LCP_MODEL);
+    const context = PerformanceTraceContext.fromInsight(FAKE_PARSED_TRACE, FAKE_LCP_MODEL);
     assert.strictEqual(context.getTitle(), 'Trace: www.example.com');
   });
 
@@ -338,9 +344,9 @@ code
 
   describe('handleContextDetails', () => {
     it('outputs the right context for the initial query from the user', async function() {
-      const {data, insights, metadata} = await TraceLoader.traceEngine(this, 'lcp-images.json.gz');
-      assert.isOk(insights);
-      const context = PerformanceTraceContext.fromInsight(data, insights, metadata, FAKE_LCP_MODEL);
+      const parsedTrace = await TraceLoader.traceEngine(this, 'lcp-images.json.gz');
+      assert.isOk(parsedTrace.insights);
+      const context = PerformanceTraceContext.fromInsight(parsedTrace, FAKE_LCP_MODEL);
       const agent = createAgentForInsightConversation({
         aidaClient: mockAidaClient([[{
           explanation: 'This is the answer',
@@ -389,8 +395,7 @@ code
         aidaClient: {} as Host.AidaClient.AidaClient,
       });
 
-      const context =
-          PerformanceTraceContext.fromInsight(FAKE_PARSED_TRACE, FAKE_INSIGHTS, FAKE_METADATA, FAKE_LCP_MODEL);
+      const context = PerformanceTraceContext.fromInsight(FAKE_PARSED_TRACE, FAKE_LCP_MODEL);
       const finalQuery = await agent.enhanceQuery('What is this?', context);
       const expected =
           `User clicked on the LCPBreakdown insight, and then asked a question.\n\n# User question for you to answer:\nWhat is this?`;
@@ -403,8 +408,7 @@ code
         aidaClient: {} as Host.AidaClient.AidaClient,
       });
 
-      const context =
-          PerformanceTraceContext.fromInsight(FAKE_PARSED_TRACE, FAKE_INSIGHTS, FAKE_METADATA, FAKE_LCP_MODEL);
+      const context = PerformanceTraceContext.fromInsight(FAKE_PARSED_TRACE, FAKE_LCP_MODEL);
 
       await agent.enhanceQuery('What is this?', context);
       const finalQuery = await agent.enhanceQuery('Help me understand?', context);
@@ -418,10 +422,8 @@ Help me understand?`;
       const agent = createAgentForInsightConversation({
         aidaClient: {} as Host.AidaClient.AidaClient,
       });
-      const context1 =
-          PerformanceTraceContext.fromInsight(FAKE_PARSED_TRACE, FAKE_INSIGHTS, FAKE_METADATA, FAKE_LCP_MODEL);
-      const context2 =
-          PerformanceTraceContext.fromInsight(FAKE_PARSED_TRACE, FAKE_INSIGHTS, FAKE_METADATA, FAKE_INP_MODEL);
+      const context1 = PerformanceTraceContext.fromInsight(FAKE_PARSED_TRACE, FAKE_LCP_MODEL);
+      const context2 = PerformanceTraceContext.fromInsight(FAKE_PARSED_TRACE, FAKE_INP_MODEL);
       const firstQuery = await agent.enhanceQuery('Q1', context1);
       const secondQuery = await agent.enhanceQuery('Q2', context1);
       const thirdQuery = await agent.enhanceQuery('Q3', context2);
@@ -434,11 +436,11 @@ Help me understand?`;
   describe('function calls', () => {
     it('can call getNetworkTrackSummary', async function() {
       const metricsSpy = sinon.spy(Host.userMetrics, 'performanceAINetworkSummaryResponseSize');
-      const {data, insights, metadata} = await TraceLoader.traceEngine(this, 'lcp-images.json.gz');
-      assert.isOk(insights);
-      const [firstNav] = data.Meta.mainFrameNavigations;
-      const lcpBreakdown = getInsightOrError('LCPBreakdown', insights, firstNav);
-      const bounds = data.Meta.traceBounds;
+      const parsedTrace = await TraceLoader.traceEngine(this, 'lcp-images.json.gz');
+      assert.isOk(parsedTrace.insights);
+      const [firstNav] = parsedTrace.data.Meta.mainFrameNavigations;
+      const lcpBreakdown = getInsightOrError('LCPBreakdown', parsedTrace.insights, firstNav);
+      const bounds = parsedTrace.data.Meta.traceBounds;
       const agent = createAgentForInsightConversation({
         aidaClient: mockAidaClient([
           [{
@@ -448,7 +450,7 @@ Help me understand?`;
           [{explanation: 'done'}]
         ])
       });
-      const context = PerformanceTraceContext.fromInsight(data, insights, metadata, lcpBreakdown);
+      const context = PerformanceTraceContext.fromInsight(parsedTrace, lcpBreakdown);
 
       const responses = await Array.fromAsync(agent.run('test', {selected: context}));
       const action = responses.find(response => response.type === ResponseType.ACTION);
@@ -462,7 +464,7 @@ Help me understand?`;
       ];
 
       expectedRequestUrls.forEach(url => {
-        const match = data.NetworkRequests.byTime.find(r => r.args.data.url === url);
+        const match = parsedTrace.data.NetworkRequests.byTime.find(r => r.args.data.url === url);
         assert.isOk(match, `no request found for ${url}`);
       });
 
@@ -489,11 +491,11 @@ Help me understand?`;
     it('can call getMainThreadTrackSummary', async function() {
       const metricsSpy = sinon.spy(Host.userMetrics, 'performanceAIMainThreadActivityResponseSize');
 
-      const {data, insights, metadata} = await TraceLoader.traceEngine(this, 'lcp-discovery-delay.json.gz');
-      assert.isOk(insights);
-      const [firstNav] = data.Meta.mainFrameNavigations;
-      const lcpBreakdown = getInsightOrError('LCPBreakdown', insights, firstNav);
-      const bounds = data.Meta.traceBounds;
+      const parsedTrace = await TraceLoader.traceEngine(this, 'lcp-discovery-delay.json.gz');
+      assert.isOk(parsedTrace.insights);
+      const [firstNav] = parsedTrace.data.Meta.mainFrameNavigations;
+      const lcpBreakdown = getInsightOrError('LCPBreakdown', parsedTrace.insights, firstNav);
+      const bounds = parsedTrace.data.Meta.traceBounds;
       const agent = createAgentForInsightConversation({
         aidaClient: mockAidaClient([
           [{
@@ -503,7 +505,7 @@ Help me understand?`;
           [{explanation: 'done'}]
         ])
       });
-      const context = PerformanceTraceContext.fromInsight(data, insights, metadata, lcpBreakdown);
+      const context = PerformanceTraceContext.fromInsight(parsedTrace, lcpBreakdown);
 
       const responses = await Array.fromAsync(agent.run('test', {selected: context}));
       const titleResponse = responses.find(response => response.type === ResponseType.TITLE);
@@ -531,18 +533,18 @@ Help me understand?`;
     });
 
     it('will not send facts from a previous insight if the context changes', async function() {
-      const {data, insights, metadata} = await TraceLoader.traceEngine(this, 'lcp-discovery-delay.json.gz');
-      assert.isOk(insights);
-      const [firstNav] = data.Meta.mainFrameNavigations;
-      const lcpBreakdown = getInsightOrError('LCPBreakdown', insights, firstNav);
-      const renderBlocking = getInsightOrError('RenderBlocking', insights, firstNav);
+      const parsedTrace = await TraceLoader.traceEngine(this, 'lcp-discovery-delay.json.gz');
+      assert.isOk(parsedTrace.insights);
+      const [firstNav] = parsedTrace.data.Meta.mainFrameNavigations;
+      const lcpBreakdown = getInsightOrError('LCPBreakdown', parsedTrace.insights, firstNav);
+      const renderBlocking = getInsightOrError('RenderBlocking', parsedTrace.insights, firstNav);
       const agent = createAgentForInsightConversation({
         aidaClient: mockAidaClient([
           [{explanation: '', functionCalls: [{name: 'getMainThreadTrackSummary', args: {}}]}],
         ])
       });
-      const lcpContext = PerformanceTraceContext.fromInsight(data, insights, metadata, lcpBreakdown);
-      const renderBlockingContext = PerformanceTraceContext.fromInsight(data, insights, metadata, renderBlocking);
+      const lcpContext = PerformanceTraceContext.fromInsight(parsedTrace, lcpBreakdown);
+      const renderBlockingContext = PerformanceTraceContext.fromInsight(parsedTrace, renderBlocking);
 
       // Populate the function calls for the LCP Context
       await Array.fromAsync(agent.run('test 1 LCP', {selected: lcpContext}));
@@ -555,17 +557,17 @@ Help me understand?`;
     });
 
     it('will cache function calls as facts', async function() {
-      const {data, insights, metadata} = await TraceLoader.traceEngine(this, 'lcp-discovery-delay.json.gz');
-      assert.isOk(insights);
-      const [firstNav] = data.Meta.mainFrameNavigations;
-      const lcpBreakdown = getInsightOrError('LCPBreakdown', insights, firstNav);
+      const parsedTrace = await TraceLoader.traceEngine(this, 'lcp-discovery-delay.json.gz');
+      assert.isOk(parsedTrace.insights);
+      const [firstNav] = parsedTrace.data.Meta.mainFrameNavigations;
+      const lcpBreakdown = getInsightOrError('LCPBreakdown', parsedTrace.insights, firstNav);
       const agent = createAgentForInsightConversation({
         aidaClient: mockAidaClient([
           [{explanation: '', functionCalls: [{name: 'getMainThreadTrackSummary', args: {}}]}],
           [{explanation: '', functionCalls: [{name: 'getNetworkTrackSummary', args: {}}]}], [{explanation: 'done'}]
         ])
       });
-      const context = PerformanceTraceContext.fromInsight(data, insights, metadata, lcpBreakdown);
+      const context = PerformanceTraceContext.fromInsight(parsedTrace, lcpBreakdown);
       await Array.fromAsync(agent.run('test 1', {selected: context}));
       await Array.fromAsync(agent.run('test 2', {selected: context}));
       // First 6 are the always included high-level facts. The rests are from the function calls.
@@ -586,9 +588,8 @@ Help me understand?`;
 
 describeWithEnvironment('PerformanceAgent – all focus', () => {
   it('uses the min and max bounds of the trace as the origin', async function() {
-    const {data, insights, metadata} = await TraceLoader.traceEngine(this, 'lcp-images.json.gz');
-    assert.isOk(insights);
-    const context = PerformanceTraceContext.full(data, insights, metadata);
+    const parsedTrace = await TraceLoader.traceEngine(this, 'lcp-images.json.gz');
+    const context = PerformanceTraceContext.full(parsedTrace);
     assert.strictEqual(context.getOrigin(), 'trace-658799706428-658804825864');
   });
 });

front_end/models/ai_assistance/agents/PerformanceAgent.ts

@@ -220,17 +220,13 @@ enum ScorePriority {
 }
 
 export class PerformanceTraceContext extends ConversationContext<TimelineUtils.AIContext.AgentFocus> {
-  static full(
-      parsedTrace: Trace.Handlers.Types.HandlerData, insights: Trace.Insights.Types.TraceInsightSets,
-      traceMetadata: Trace.Types.File.MetaData): PerformanceTraceContext {
-    return new PerformanceTraceContext(TimelineUtils.AIContext.AgentFocus.full(parsedTrace, insights, traceMetadata));
+  static full(parsedTrace: Trace.TraceModel.ParsedTrace): PerformanceTraceContext {
+    return new PerformanceTraceContext(TimelineUtils.AIContext.AgentFocus.full(parsedTrace));
   }
 
-  static fromInsight(
-      parsedTrace: Trace.Handlers.Types.HandlerData, insights: Trace.Insights.Types.TraceInsightSets,
-      traceMetadata: Trace.Types.File.MetaData, insight: Trace.Insights.Types.InsightModel): PerformanceTraceContext {
-    return new PerformanceTraceContext(
-        TimelineUtils.AIContext.AgentFocus.fromInsight(parsedTrace, insights, traceMetadata, insight));
+  static fromInsight(parsedTrace: Trace.TraceModel.ParsedTrace, insight: Trace.Insights.Types.InsightModel):
+      PerformanceTraceContext {
+    return new PerformanceTraceContext(TimelineUtils.AIContext.AgentFocus.fromInsight(parsedTrace, insight));
   }
 
   static fromCallTree(callTree: TimelineUtils.AICallTree.AICallTree): PerformanceTraceContext {
@@ -246,9 +242,10 @@ export class PerformanceTraceContext extends ConversationContext<TimelineUtils.A
 
   override getOrigin(): string {
     const focus = this.#focus.data;
+    const data = focus.parsedTrace.data;
 
     if (focus.type === 'full' || focus.type === 'insight') {
-      const {min, max} = focus.parsedTrace.Meta.traceBounds;
+      const {min, max} = data.Meta.traceBounds;
       return `trace-${min}-${max}`;
     }
 
@@ -262,7 +259,7 @@ export class PerformanceTraceContext extends ConversationContext<TimelineUtils.A
       // Get the non-resolved (ignore sourcemaps) URL for the event. We use the
       // non-resolved URL as in the context of the AI Assistance panel, we care
       // about the origin it was served on.
-      const nonResolvedURL = Trace.Handlers.Helpers.getNonResolvedURL(selectedEvent, focus.callTree.parsedTrace);
+      const nonResolvedURL = Trace.Handlers.Helpers.getNonResolvedURL(selectedEvent, focus.callTree.parsedTrace.data);
       if (nonResolvedURL) {
         const origin = Common.ParsedURL.ParsedURL.extractOrigin(nonResolvedURL);
         if (origin) {  // origin could be the empty string.
@@ -288,9 +285,10 @@ export class PerformanceTraceContext extends ConversationContext<TimelineUtils.A
 
   override getTitle(): string {
     const focus = this.#focus.data;
+    const data = focus.parsedTrace.data;
 
     if (focus.type === 'full' || focus.type === 'insight') {
-      const url = focus.insightSet?.url ?? new URL(focus.parsedTrace.Meta.mainFrameURL);
+      const url = focus.insightSet?.url ?? new URL(data.Meta.mainFrameURL);
       return `Trace: ${url.hostname}`;
     }
 
@@ -693,7 +691,7 @@ export class PerformanceAgent extends AiAgent<TimelineUtils.AIContext.AgentFocus
       return;
     }
 
-    const {parsedTrace, insightSet, traceMetadata} = focus.data;
+    const {parsedTrace, insightSet} = focus.data;
 
     this.declareFunction<{insightName: string}, {details: string}>('getInsightDetails', {
       description:
@@ -771,8 +769,8 @@ export class PerformanceAgent extends AiAgent<TimelineUtils.AIContext.AgentFocus
             return null;
           }
 
-          const clampedMin = Math.max(min ?? 0, parsedTrace.Meta.traceBounds.min);
-          const clampedMax = Math.min(max ?? Number.POSITIVE_INFINITY, parsedTrace.Meta.traceBounds.max);
+          const clampedMin = Math.max(min ?? 0, parsedTrace.data.Meta.traceBounds.min);
+          const clampedMax = Math.min(max ?? Number.POSITIVE_INFINITY, parsedTrace.data.Meta.traceBounds.max);
           if (clampedMin > clampedMax) {
             return null;
           }
@@ -935,7 +933,8 @@ export class PerformanceAgent extends AiAgent<TimelineUtils.AIContext.AgentFocus
     });
 
     const isFresh = TimelineUtils.FreshRecording.Tracker.instance().recordingIsFresh(parsedTrace);
-    const hasScriptContents = traceMetadata.enhancedTraceVersion && parsedTrace.Scripts.scripts.some(s => s.content);
+    const hasScriptContents =
+        parsedTrace.metadata.enhancedTraceVersion && parsedTrace.data.Scripts.scripts.some(s => s.content);
 
     if (isFresh || hasScriptContents) {
       this.declareFunction<{url: string}, {content: string}>('getResourceContent', {