Skip to content

Commit f87193b

Browse files
and-oliDevtools-frontend LUCI CQ
authored andcommitted
Do not append console timings with extension data in timings track
They are appended in their own track and having them in the timings track only adds noise. Took the chance to update a trace file to have it include extension console timestamps, to cover this behavior with the existing tests. Bug: 390155157 Change-Id: I497b25eb42a59cd4b666144d40c1294ba6fd5002 Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6417102 Reviewed-by: Jack Franklin <[email protected]> Commit-Queue: Andres Olivares <[email protected]>
1 parent 9c2e34b commit f87193b

File tree

5 files changed

+4
-2
lines changed

5 files changed

+4
-2
lines changed

front_end/panels/timeline/TimelineFlameChartDataProvider.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ describeWithEnvironment('TimelineFlameChartDataProvider', function() {
7878
'A track group — Custom track',
7979
'Another Extension Track',
8080
'An Extension Track — Custom track',
81+
'TimeStamp track — Custom track',
8182
'Main — http://localhost:3000/',
8283
'Thread pool',
8384
'Thread pool worker 1',

front_end/panels/timeline/TimingsTrackAppender.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ export class TimingsTrackAppender implements TrackAppender {
7575
m => !Trace.Handlers.ModelHandlers.ExtensionTraceData.extensionDataInPerformanceTiming(m));
7676
const performanceMeasures = this.#parsedTrace.UserTimings.performanceMeasures.filter(
7777
m => !Trace.Handlers.ModelHandlers.ExtensionTraceData.extensionDataInPerformanceTiming(m));
78-
const timestampEvents = this.#parsedTrace.UserTimings.timestampEvents;
78+
const timestampEvents = this.#parsedTrace.UserTimings.timestampEvents.filter(
79+
timeStamp => !Trace.Handlers.ModelHandlers.ExtensionTraceData.extensionDataInConsoleTimeStamp(timeStamp));
7980
const consoleTimings = this.#parsedTrace.UserTimings.consoleTimings;
8081
if (extensionMarkersAreEmpty && performanceMarks.length === 0 && performanceMeasures.length === 0 &&
8182
timestampEvents.length === 0 && consoleTimings.length === 0) {
Binary file not shown.

front_end/panels/timeline/track_appenders/ExtensionTrackAppender.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describeWithEnvironment('ExtensionTrackAppender', function() {
5050

5151
describe('appendTrackAtLevel', function() {
5252
it('creates flamechart groups for the Extension tracks properly', function() {
53-
assert.lengthOf(flameChartData.groups, 3);
53+
assert.lengthOf(flameChartData.groups, 4);
5454
assert.strictEqual(flameChartData.groups[0].name, 'A track group — Custom track');
5555
assert.strictEqual(flameChartData.groups[0].startLevel, 0);
5656
assert.strictEqual(flameChartData.groups[0].style.nestingLevel, 0);
Loading

0 commit comments

Comments
 (0)