mirror
/
sitespeed.io
mirror of https://github.com/sitespeedio/sitespeed.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix browserScript structure. (#3888) 

Oh, we had a really strange behaviour where we added all the Browsertime data
inside the browserScript element (the data we collect with JS) and that
made it so we pushed the HAR file inside that element. This fixes that and make
sure we just cherry pick the exact data we pass on.
This commit is contained in:
Peter Hedenskog 2023-06-20 16:08:26 +02:00 committed by GitHub
parent bbeeb91a38
commit f176e03bae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 85 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
lib/plugins/browsertime/browsertimeAggregator.js
View File

@ -43,25 +43,88 @@ export class BrowsertimeAggregator {
}
}
if (browsertimeRunData.timings.largestContentfulPaint) {
pushGroupStats(
this.statsPerType,
this.groups[group],
['timings', 'largestContentfulPaint'],
browsertimeRunData.timings.largestContentfulPaint.renderTime
);
if (browsertimeRunData.timings) {
if (browsertimeRunData.timings.largestContentfulPaint) {
pushGroupStats(
this.statsPerType,
this.groups[group],
['timings', 'largestContentfulPaint'],
browsertimeRunData.timings.largestContentfulPaint.renderTime
);
}
if (browsertimeRunData.timings.interactionToNextPaint) {
pushGroupStats(
this.statsPerType,
this.groups[group],
['timings', 'interactionToNextPaint'],
browsertimeRunData.timings.interactionToNextPaint
);
}
forEach(timings, timing => {
if (browsertimeRunData.timings[timing]) {
pushGroupStats(
this.statsPerType,
this.groups[group],
timing,
browsertimeRunData.timings[timing]
);
}
});
forEach(browsertimeRunData.timings.navigationTiming, (value, name) => {
if (value) {
pushGroupStats(
this.statsPerType,
this.groups[group],
['navigationTiming', name],
value
);
}
});
forEach(browsertimeRunData.timings.pageTimings, (value, name) => {
pushGroupStats(
this.statsPerType,
this.groups[group],
['pageTimings', name],
value
);
});
forEach(browsertimeRunData.timings.paintTiming, (value, name) => {
pushGroupStats(
this.statsPerType,
this.groups[group],
['paintTiming', name],
value
);
});
forEach(browsertimeRunData.timings.userTimings.marks, timing => {
pushGroupStats(
this.statsPerType,
this.groups[group],
['userTimings', 'marks', timing.name],
timing.startTime
);
});
forEach(browsertimeRunData.timings.userTimings.measures, timing => {
pushGroupStats(
this.statsPerType,
this.groups[group],
['userTimings', 'measures', timing.name],
timing.duration
);
});
}
if (browsertimeRunData.timings.interactionToNextPaint) {
pushGroupStats(
this.statsPerType,
this.groups[group],
['timings', 'interactionToNextPaint'],
browsertimeRunData.timings.interactionToNextPaint
);
}
if (browsertimeRunData.pageinfo.cumulativeLayoutShift) {
if (
browsertimeRunData.pageinfo &&
browsertimeRunData.pageinfo.cumulativeLayoutShift
) {
pushGroupStats(
this.statsPerType,
this.groups[group],
@ -70,28 +133,6 @@ export class BrowsertimeAggregator {
);
}
forEach(timings, timing => {
if (browsertimeRunData.timings[timing]) {
pushGroupStats(
this.statsPerType,
this.groups[group],
timing,
browsertimeRunData.timings[timing]
);
}
});
forEach(browsertimeRunData.timings.navigationTiming, (value, name) => {
if (value) {
pushGroupStats(
this.statsPerType,
this.groups[group],
['navigationTiming', name],
value
);
}
});
// pick up one level of custom metrics
forEach(browsertimeRunData.custom, (value, name) => {
pushGroupStats(
@ -102,42 +143,6 @@ export class BrowsertimeAggregator {
);
});
forEach(browsertimeRunData.timings.pageTimings, (value, name) => {
pushGroupStats(
this.statsPerType,
this.groups[group],
['pageTimings', name],
value
);
});
forEach(browsertimeRunData.timings.paintTiming, (value, name) => {
pushGroupStats(
this.statsPerType,
this.groups[group],
['paintTiming', name],
value
);
});
forEach(browsertimeRunData.timings.userTimings.marks, timing => {
pushGroupStats(
this.statsPerType,
this.groups[group],
['userTimings', 'marks', timing.name],
timing.startTime
);
});
forEach(browsertimeRunData.timings.userTimings.measures, timing => {
pushGroupStats(
this.statsPerType,
this.groups[group],
['userTimings', 'measures', timing.name],
timing.duration
);
});
forEach(browsertimeRunData.visualMetrics, (value, name) => {
// Sometimes visual elements fails and gives us null values
// And skip VisualProgress, ContentfulSpeedIndexProgress and others

10
lib/plugins/browsertime/index.js
View File

@ -204,10 +204,10 @@ export default class BrowsertimePlugin extends SitespeedioPlugin {
group = parse(url).hostname;
}
let runIndex = 0;
for (let run of result[resultIndex].browserScripts) {
// Kind of ugly way to add visualMetrics to a run
// it's outside of browserScripts today
// we could instead pass browsertime.visualMetrics maybe
for (let browserScriptsData of result[resultIndex].browserScripts) {
let run = {};
Object.assign(run, browserScriptsData);
if (result[resultIndex].visualMetrics) {
run.visualMetrics = result[resultIndex].visualMetrics[runIndex];
}
@ -461,7 +461,7 @@ export default class BrowsertimePlugin extends SitespeedioPlugin {
// If the coach is turned on, collect the coach result
if (options.coach) {
const coachAdvice = run.coach.coachAdvice;
const coachAdvice = browserScriptsData.coach.coachAdvice;
// check if the coach has error(s)
if (!isEmpty(coachAdvice.errors)) {
log.error(