Skip to content

Commit 7bc851d

Browse files
jackfranklinDevtools-frontend LUCI CQ
authored andcommitted
Insights: move setting frameId onto Processor
Connor had some nice feedback that we could do this in the processor rather than require every single Insight to define it. Bug: 401519930 Change-Id: I9b12a89399343c8e5fa9ae69bd0914baf2cb9269 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6343131 Auto-Submit: Jack Franklin <[email protected]> Commit-Queue: Nancy Li <[email protected]> Commit-Queue: Jack Franklin <[email protected]> Reviewed-by: Nancy Li <[email protected]>
1 parent eaf4f38 commit 7bc851d

18 files changed

+18
-44
lines changed

front_end/models/trace/Processor.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@ export class TraceProcessor extends EventTarget {
441441
let insightResult;
442442
try {
443443
insightResult = insight.generateInsight(parsedTrace, context);
444+
insightResult.frameId = context.frameId;
444445
const navId = context.navigation?.args.data?.navigationId;
445446
if (navId) {
446447
insightResult.navigationId = navId;

front_end/models/trace/insights/CLSCulprits.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,6 @@ export function generateInsight(
582582
}
583583

584584
return finalize({
585-
frameId: context.frameId,
586585
relatedEvents,
587586
animationFailures,
588587
shifts: rootCausesByShift,

front_end/models/trace/insights/DOMSize.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ export function generateInsight(
165165
}
166166

167167
return finalize({
168-
frameId: context.frameId,
169168
largeLayoutUpdates,
170169
largeStyleRecalcs,
171170
maxDOMStats,

front_end/models/trace/insights/DocumentLatency.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,13 @@ function finalize(partialModel: PartialInsightModel<DocumentLatencyInsightModel>
181181
export function generateInsight(
182182
parsedTrace: Handlers.Types.ParsedTrace, context: InsightSetContext): DocumentLatencyInsightModel {
183183
if (!context.navigation) {
184-
return finalize({frameId: context.frameId});
184+
return finalize({});
185185
}
186186

187187
const documentRequest =
188188
parsedTrace.NetworkRequests.byTime.find(req => req.args.data.requestId === context.navigationId);
189189
if (!documentRequest) {
190-
return finalize({frameId: context.frameId, warnings: [InsightWarning.NO_DOCUMENT_REQUEST]});
190+
return finalize({warnings: [InsightWarning.NO_DOCUMENT_REQUEST]});
191191
}
192192

193193
const serverResponseTime = getServerResponseTime(documentRequest);
@@ -217,7 +217,6 @@ export function generateInsight(
217217
const usesCompression = uncompressedResponseBytes === 0;
218218

219219
return finalize({
220-
frameId: context.frameId,
221220
relatedEvents: [documentRequest],
222221
data: {
223222
serverResponseTime,

front_end/models/trace/insights/DuplicateJavaScript.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@ export function generateInsight(
6565
});
6666

6767
const duplication = Extras.ScriptDuplication.computeScriptDuplication({scripts});
68-
return finalize({frameId: context.frameId, duplication});
68+
return finalize({duplication});
6969
}

front_end/models/trace/insights/FontDisplay.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ export function generateInsight(
100100
const savings = Math.max(...fonts.map(f => f.wastedTime)) as Types.Timing.Milli;
101101

102102
return finalize({
103-
frameId: context.frameId,
104103
relatedEvents: fonts.map(f => f.request),
105104
fonts,
106105
metricSavings: {FCP: savings},

front_end/models/trace/insights/ForcedReflow.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ function finalize(partialModel: PartialInsightModel<ForcedReflowInsightModel>):
201201
}
202202

203203
export function generateInsight(
204-
traceParsedData: Handlers.Types.ParsedTrace, context: InsightSetContext): ForcedReflowInsightModel {
204+
traceParsedData: Handlers.Types.ParsedTrace, _context: InsightSetContext): ForcedReflowInsightModel {
205205
const warningsData = traceParsedData.Warnings;
206206
const entryToNodeMap = traceParsedData.Renderer.entryToNode;
207207

@@ -217,7 +217,6 @@ export function generateInsight(
217217
aggregateForcedReflow(warningsData.perWarning, entryToNodeMap);
218218

219219
return finalize({
220-
frameId: context.frameId,
221220
relatedEvents: topLevelFunctionCallData?.topLevelFunctionCallEvents,
222221
topLevelFunctionCallData,
223222
aggregatedBottomUpData,

front_end/models/trace/insights/ImageDelivery.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ export function generateInsight(
309309
});
310310

311311
return finalize({
312-
frameId: context.frameId,
313312
optimizableImages,
314313
totalByteSavings: optimizableImages.reduce((total, img) => total + img.byteSavings, 0),
315314
metricSavings: metricSavingsForWastedBytes(wastedBytesByRequestId, context),

front_end/models/trace/insights/InteractionToNextPaint.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,7 @@ export function generateInsight(parsedTrace: Handlers.Types.ParsedTrace, context
8080

8181
if (!interactionEvents.length) {
8282
// A valid result, when there is no user interaction.
83-
return finalize({
84-
85-
frameId: context.frameId,
86-
});
83+
return finalize({});
8784
}
8885

8986
const longestByInteractionId = new Map<number, SyntheticInteractionPair>();
@@ -104,7 +101,6 @@ export function generateInsight(parsedTrace: Handlers.Types.ParsedTrace, context
104101
const highPercentileIndex = Math.min(9, Math.floor(normalizedInteractionEvents.length / 50));
105102

106103
return finalize({
107-
frameId: context.frameId,
108104
relatedEvents: [normalizedInteractionEvents[0]],
109105
longestInteractionEvent: normalizedInteractionEvents[0],
110106
highPercentileInteractionEvent: normalizedInteractionEvents[highPercentileIndex],

front_end/models/trace/insights/LCPDiscovery.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,7 @@ function finalize(partialModel: PartialInsightModel<LCPDiscoveryInsightModel>):
9696
export function generateInsight(
9797
parsedTrace: Handlers.Types.ParsedTrace, context: InsightSetContext): LCPDiscoveryInsightModel {
9898
if (!context.navigation) {
99-
return finalize({
100-
101-
frameId: context.frameId,
102-
});
99+
return finalize({});
103100
}
104101

105102
const networkRequests = parsedTrace.NetworkRequests;
@@ -116,17 +113,17 @@ export function generateInsight(
116113
const metricScore = navMetrics.get(Handlers.ModelHandlers.PageLoadMetrics.MetricName.LCP);
117114
const lcpEvent = metricScore?.event;
118115
if (!lcpEvent || !Types.Events.isLargestContentfulPaintCandidate(lcpEvent)) {
119-
return finalize({frameId: context.frameId, warnings: [InsightWarning.NO_LCP]});
116+
return finalize({warnings: [InsightWarning.NO_LCP]});
120117
}
121118

122119
const docRequest = networkRequests.byTime.find(req => req.args.data.requestId === context.navigationId);
123120
if (!docRequest) {
124-
return finalize({frameId: context.frameId, lcpEvent, warnings: [InsightWarning.NO_DOCUMENT_REQUEST]});
121+
return finalize({warnings: [InsightWarning.NO_DOCUMENT_REQUEST]});
125122
}
126123

127124
const lcpRequest = parsedTrace.LargestImagePaint.lcpRequestByNavigation.get(context.navigation);
128125
if (!lcpRequest) {
129-
return finalize({frameId: context.frameId, lcpEvent});
126+
return finalize({lcpEvent});
130127
}
131128

132129
const initiatorUrl = lcpRequest.args.data.initiator?.url;
@@ -147,7 +144,6 @@ export function generateInsight(
147144
const priorityHintFound = imageFetchPriorityHint === 'high';
148145

149146
return finalize({
150-
frameId: context.frameId,
151147
lcpEvent,
152148
lcpRequest,
153149
earliestDiscoveryTimeTs: earliestDiscoveryTime ? Types.Timing.Micro(earliestDiscoveryTime) : undefined,

0 commit comments

Comments
 (0)