diff --git a/src/app-logic/constants.js b/src/app-logic/constants.js index 4c9c8cac8e..8cd9b024ae 100644 --- a/src/app-logic/constants.js +++ b/src/app-logic/constants.js @@ -7,10 +7,10 @@ import type { MarkerPhase } from 'firefox-profiler/types'; // The current version of the Gecko profile format. -export const GECKO_PROFILE_VERSION = 25; +export const GECKO_PROFILE_VERSION = 26; // The current version of the "processed" profile format. -export const PROCESSED_PROFILE_VERSION = 43; +export const PROCESSED_PROFILE_VERSION = 44; // The following are the margin sizes for the left and right of the timeline. Independent // components need to share these values. diff --git a/src/profile-logic/gecko-profile-versioning.js b/src/profile-logic/gecko-profile-versioning.js index 664851eb65..dcda455954 100644 --- a/src/profile-logic/gecko-profile-versioning.js +++ b/src/profile-logic/gecko-profile-versioning.js @@ -1365,5 +1365,69 @@ const _upgraders = { // capturing this data and no new mandatory values are present in this // version. }, + [26]: (profile) => { + // `searchable` property in the marker schema wasn't implemented before and + // we had some manual checks for the marker fields below. With this version, + // we removed this manual check and started to use the `searchable` property + // of the marker schema. + function convertToVersion26Recursive(p) { + for (const schema of p.meta.markerSchema) { + let searchableFieldKeys; + switch (schema.name) { + case 'FileIO': { + // threadId wasn't in the schema before, so we need to add manually. + schema.data.push({ + key: 'threadId', + label: 'Thread ID', + format: 'string', + searchable: true, + }); + searchableFieldKeys = []; + break; + } + case 'Log': { + searchableFieldKeys = ['name', 'module']; + break; + } + case 'DOMEvent': { + // In the earlier versions of Firefox, DOMEvent doesn't include + // eventType in the backend. + schema.data.push({ + key: 'eventType', + label: 'Event Type', + format: 'string', + searchable: true, + }); + // 'target' wasn't included in our code before. But I thought this + // would be a useful addition. + searchableFieldKeys = ['target']; + break; + } + case 'TraceEvent': { + // These weren't included in our code before. But I thought this + // would be a useful addition. + searchableFieldKeys = ['name1', 'name2', 'val1', 'val2']; + break; + } + default: { + searchableFieldKeys = ['name', 'category']; + break; + } + } + + for (const field of schema.data) { + if (searchableFieldKeys.includes(field.key)) { + field.searchable = true; + } + } + } + + for (const subprocessProfile of p.processes) { + convertToVersion26Recursive(subprocessProfile); + } + } + + convertToVersion26Recursive(profile); + }, }; /* eslint-enable no-useless-computed-key */ diff --git a/src/profile-logic/marker-data.js b/src/profile-logic/marker-data.js index 02df5ad8c1..7887d3628a 100644 --- a/src/profile-logic/marker-data.js +++ b/src/profile-logic/marker-data.js @@ -13,7 +13,11 @@ import { INTERVAL_START, INTERVAL_END, } from 'firefox-profiler/app-logic/constants'; -import { getMarkerSchemaName } from './marker-schema'; +import { + getMarkerSchemaName, + getSchemaFromMarker, + markerPayloadMatchesSearch, +} from './marker-schema'; import type { Thread, @@ -115,85 +119,52 @@ export function deriveJankMarkers( export function getSearchFilteredMarkerIndexes( getMarker: (MarkerIndex) => Marker, markerIndexes: MarkerIndex[], + markerSchemaByName: MarkerSchemaByName, searchRegExp: RegExp | null, categoryList: CategoryList ): MarkerIndex[] { if (!searchRegExp) { return markerIndexes; } + // Need to assign it to a constant variable so Flow doesn't complain about + // passing it inside a function below. + const regExp = searchRegExp; const newMarkers: MarkerIndex[] = []; for (const markerIndex of markerIndexes) { - const { data, name, category } = getMarker(markerIndex); + const marker = getMarker(markerIndex); + const { data, name, category } = marker; // Reset regexp for each iteration. Otherwise state from previous // iterations can cause matches to fail if the search is global or // sticky. - searchRegExp.lastIndex = 0; + regExp.lastIndex = 0; if (categoryList[category] !== undefined) { const markerCategory = categoryList[category].name; - if (searchRegExp.test(markerCategory)) { + if (regExp.test(markerCategory)) { newMarkers.push(markerIndex); continue; } } - if (searchRegExp.test(name)) { + if (regExp.test(name)) { newMarkers.push(markerIndex); continue; } + if (data && typeof data === 'object') { - if (searchRegExp.test(data.type)) { + if (regExp.test(data.type)) { + // Check the type of the marker payload first. newMarkers.push(markerIndex); continue; } - if (data.type === 'FileIO') { - const { filename, operation, source, threadId } = data; - if ( - searchRegExp.test(filename || '') || - searchRegExp.test(operation) || - searchRegExp.test(source) || - (threadId !== undefined && searchRegExp.test(threadId.toString())) - ) { - newMarkers.push(markerIndex); - continue; - } - } else if (data.type === 'IPC') { - const { messageType, otherPid } = data; - if ( - searchRegExp.test(messageType) || - searchRegExp.test(otherPid.toString()) - ) { - newMarkers.push(markerIndex); - continue; - } - } else if (data.type === 'Log') { - const { name, module } = data; - - if (searchRegExp.test(name) || searchRegExp.test(module)) { - newMarkers.push(markerIndex); - continue; - } - } - - if ( - typeof data.eventType === 'string' && - searchRegExp.test(data.eventType) - ) { - // Match DOMevents data.eventType - newMarkers.push(markerIndex); - continue; - } - if (typeof data.name === 'string' && searchRegExp.test(data.name)) { - // Match UserTiming's name. - newMarkers.push(markerIndex); - continue; - } + // Now check the schema for the marker payload for searchable + const markerSchema = getSchemaFromMarker(markerSchemaByName, marker); if ( - typeof data.category === 'string' && - searchRegExp.test(data.category) + markerSchema && + markerPayloadMatchesSearch(markerSchema, marker, regExp) ) { newMarkers.push(markerIndex); continue; diff --git a/src/profile-logic/marker-schema.js b/src/profile-logic/marker-schema.js index 9235ee5d3a..f8c8d7c029 100644 --- a/src/profile-logic/marker-schema.js +++ b/src/profile-logic/marker-schema.js @@ -56,10 +56,16 @@ export const markerSchemaFrontEndOnly: MarkerSchema[] = [ chartLabel: '{marker.data.messageType}', display: ['marker-chart', 'marker-table', 'timeline-ipc'], data: [ - { key: 'messageType', label: 'Type', format: 'string' }, + { key: 'messageType', label: 'Type', format: 'string', searchable: true }, { key: 'sync', label: 'Sync', format: 'string' }, { key: 'sendThreadName', label: 'From', format: 'string' }, { key: 'recvThreadName', label: 'To', format: 'string' }, + { + key: 'otherPid', + label: 'Other Pid', + format: 'string', + searchable: true, + }, ], }, { @@ -564,3 +570,39 @@ export function formatMarkupFromMarkerSchema( throw new Error(`Unknown format type ${JSON.stringify((format: empty))}`); } } + +/** + * Takes a marker and a RegExp and checks if any of its `searchable` marker + * payload fields match the search regular expression. + */ +export function markerPayloadMatchesSearch( + markerSchema: MarkerSchema, + marker: Marker, + searchRegExp: RegExp +): boolean { + const { data } = marker; + if (!data) { + return false; + } + + // Reset regexp for each marker. Otherwise state from previous + // usages can cause matches to fail if the search is global or + // sticky. + searchRegExp.lastIndex = 0; + + // Check if searchable fields match the search regular expression. + for (const payloadField of markerSchema.data) { + if (payloadField.searchable) { + const value = data[payloadField.key]; + if (value === undefined || value === null || value === '') { + continue; + } + + if (searchRegExp.test(value)) { + return true; + } + } + } + + return false; +} diff --git a/src/profile-logic/processed-profile-versioning.js b/src/profile-logic/processed-profile-versioning.js index c69372c9ad..bfc5f0c397 100644 --- a/src/profile-logic/processed-profile-versioning.js +++ b/src/profile-logic/processed-profile-versioning.js @@ -2141,5 +2141,61 @@ const _upgraders = { [43]: (_) => { // The number property in counters is now optional. }, + [44]: (profile) => { + // `searchable` property in the marker schema wasn't implemented before and + // we had some manual checks for the marker fields below. With this version, + // we removed this manual check and started to use the `searchable` property + // of the marker schema. + for (const schema of profile.meta.markerSchema) { + let searchableFieldKeys; + switch (schema.name) { + case 'FileIO': { + // threadId wasn't in the schema before, so we need to add manually. + schema.data.push({ + key: 'threadId', + label: 'Thread ID', + format: 'string', + searchable: true, + }); + searchableFieldKeys = []; + break; + } + case 'Log': { + searchableFieldKeys = ['name', 'module']; + break; + } + case 'DOMEvent': { + // In the earlier versions of Firefox, DOMEvent doesn't include + // eventType in the backend. + schema.data.push({ + key: 'eventType', + label: 'Event Type', + format: 'string', + searchable: true, + }); + // 'target' wasn't included in our code before. But I thought this + // would be a useful addition. + searchableFieldKeys = ['target']; + break; + } + case 'TraceEvent': { + // These weren't included in our code before. But I thought this + // would be a useful addition. + searchableFieldKeys = ['name1', 'name2', 'val1', 'val2']; + break; + } + default: { + searchableFieldKeys = ['name', 'category']; + break; + } + } + + for (const field of schema.data) { + if (searchableFieldKeys.includes(field.key)) { + field.searchable = true; + } + } + } + }, }; /* eslint-enable no-useless-computed-key */ diff --git a/src/selectors/per-thread/markers.js b/src/selectors/per-thread/markers.js index 60b3e79d03..96b5760e20 100644 --- a/src/selectors/per-thread/markers.js +++ b/src/selectors/per-thread/markers.js @@ -286,6 +286,7 @@ export function getMarkerSelectorsPerThread( createSelector( getMarkerGetter, getCommittedRangeAndTabFilteredMarkerIndexes, + ProfileSelectors.getMarkerSchemaByName, UrlState.getMarkersSearchStringsAsRegExp, ProfileSelectors.getCategories, MarkerData.getSearchFilteredMarkerIndexes @@ -343,6 +344,7 @@ export function getMarkerSelectorsPerThread( createSelector( getMarkerGetter, getNetworkMarkerIndexes, + ProfileSelectors.getMarkerSchemaByName, UrlState.getNetworkSearchStringsAsRegExp, ProfileSelectors.getCategories, MarkerData.getSearchFilteredMarkerIndexes diff --git a/src/test/components/__snapshots__/MarkerChart.test.js.snap b/src/test/components/__snapshots__/MarkerChart.test.js.snap index 8d076e9cac..9eb68aa44e 100644 --- a/src/test/components/__snapshots__/MarkerChart.test.js.snap +++ b/src/test/components/__snapshots__/MarkerChart.test.js.snap @@ -300,6 +300,13 @@ exports[`MarkerChart renders the hoveredItem markers properly 2`] = `
+
+ Name + : +
+ Marker B
@@ -1238,6 +1245,13 @@ exports[`MarkerChart with active tab renders the hovered marker properly 2`] = ` :
7ms +
+ Event Type + : +
+ click
diff --git a/src/test/components/__snapshots__/MarkerSidebar.test.js.snap b/src/test/components/__snapshots__/MarkerSidebar.test.js.snap index fba10ddefa..756ae71e38 100644 --- a/src/test/components/__snapshots__/MarkerSidebar.test.js.snap +++ b/src/test/components/__snapshots__/MarkerSidebar.test.js.snap @@ -52,6 +52,13 @@ exports[`MarkerSidebar matches the snapshots when displaying data about the curr :
Empty (Thread ID: 0) +
+ Other Pid + : +
+ 2222
diff --git a/src/test/components/__snapshots__/StackChart.test.js.snap b/src/test/components/__snapshots__/StackChart.test.js.snap index 77e42d0292..f9d94abb57 100644 --- a/src/test/components/__snapshots__/StackChart.test.js.snap +++ b/src/test/components/__snapshots__/StackChart.test.js.snap @@ -889,6 +889,13 @@ exports[`MarkerChart shows a tooltip when hovering 1`] = `
+
+ Name + : +
+ componentB
diff --git a/src/test/components/__snapshots__/TooltipMarker.test.js.snap b/src/test/components/__snapshots__/TooltipMarker.test.js.snap index ad8bb30d28..4fa09b2247 100644 --- a/src/test/components/__snapshots__/TooltipMarker.test.js.snap +++ b/src/test/components/__snapshots__/TooltipMarker.test.js.snap @@ -2053,6 +2053,13 @@ exports[`TooltipMarker renders tooltips for various markers: DOMEvent-10.5 1`] =
+
+ Event Type + : +
+ commandupdate
@@ -2110,6 +2117,13 @@ exports[`TooltipMarker renders tooltips for various markers: DOMEvent-10.6 1`] =
+
+ Event Type + : +
+ load
@@ -2165,6 +2179,13 @@ exports[`TooltipMarker renders tooltips for various markers: DOMEvent-10.7 1`] =
+
+ Event Type + : +
+ load
@@ -2220,6 +2241,13 @@ exports[`TooltipMarker renders tooltips for various markers: DOMEvent-10.8 1`] =
+
+ Event Type + : +
+ load
@@ -3295,6 +3323,13 @@ exports[`TooltipMarker renders tooltips for various markers: IPCOut-120 1`] = ` :
Main Thread (Thread ID: 0) +
+ Other Pid + : +
+ 2222
@@ -4646,6 +4681,13 @@ exports[`TooltipMarker renders tooltips for various markers: UserTiming-12.5 1`]
+
+ Name + : +
+ foobar
@@ -4831,6 +4873,13 @@ exports[`TooltipMarker shows the source thread for markers from a merged thread
+
+ Event Type + : +
+ click
@@ -4892,6 +4941,13 @@ exports[`TooltipMarker shows the source thread for markers from a merged thread
+
+ Event Type + : +
+ pageload
diff --git a/src/test/fixtures/profiles/marker-schema.js b/src/test/fixtures/profiles/marker-schema.js index 7ed210aaa4..baf4f3f9f2 100644 --- a/src/test/fixtures/profiles/marker-schema.js +++ b/src/test/fixtures/profiles/marker-schema.js @@ -86,7 +86,7 @@ export const markerSchemaForTests: MarkerSchema[] = [ name: 'PreferenceRead', display: ['marker-chart', 'marker-table'], data: [ - { key: 'prefName', label: 'Name', format: 'string' }, + { key: 'prefName', label: 'Name', format: 'string', searchable: true }, { key: 'prefKind', label: 'Kind', format: 'string' }, { key: 'prefType', label: 'Type', format: 'string' }, { key: 'prefValue', label: 'Value', format: 'string' }, @@ -99,7 +99,7 @@ export const markerSchemaForTests: MarkerSchema[] = [ tableLabel: '{marker.data.name}', display: ['marker-chart', 'marker-table'], data: [ - // name + { key: 'name', label: 'Name', format: 'string', searchable: true }, { label: 'Marker', value: 'UserTiming' }, { key: 'entryType', label: 'Entry Type', format: 'string' }, { @@ -114,15 +114,17 @@ export const markerSchemaForTests: MarkerSchema[] = [ tableLabel: '{marker.name} — {marker.data.name}', chartLabel: '{marker.name} — {marker.data.name}', display: ['marker-chart', 'marker-table'], - data: [{ key: 'name', label: 'Details', format: 'string' }], + data: [ + { key: 'name', label: 'Details', format: 'string', searchable: true }, + ], }, { name: 'Log', display: ['marker-table'], tableLabel: '({marker.data.module}) {marker.data.name}', data: [ - { key: 'module', label: 'Module', format: 'string' }, - { key: 'name', label: 'Name', format: 'string' }, + { key: 'module', label: 'Module', format: 'string', searchable: true }, + { key: 'name', label: 'Name', format: 'string', searchable: true }, ], }, { @@ -133,7 +135,12 @@ export const markerSchemaForTests: MarkerSchema[] = [ display: ['marker-chart', 'marker-table', 'timeline-overview'], data: [ { key: 'latency', label: 'Latency', format: 'duration' }, - // eventType is in the payload as well. + { + key: 'eventType', + label: 'Event Type', + format: 'string', + searchable: true, + }, ], }, { @@ -141,21 +148,27 @@ export const markerSchemaForTests: MarkerSchema[] = [ // See issue #2749 name: 'Paint', display: ['marker-chart', 'marker-table', 'timeline-overview'], - data: [{ key: 'category', label: 'Type', format: 'string' }], + data: [ + { key: 'category', label: 'Type', format: 'string', searchable: true }, + ], }, { // TODO - Note that this marker is a "tracing" marker currently. // See issue #2749 name: 'Navigation', display: ['marker-chart', 'marker-table', 'timeline-overview'], - data: [{ key: 'category', label: 'Type', format: 'string' }], + data: [ + { key: 'category', label: 'Type', format: 'string', searchable: true }, + ], }, { // TODO - Note that this marker is a "tracing" marker currently. // See issue #2749 name: 'Layout', display: ['marker-chart', 'marker-table', 'timeline-overview'], - data: [{ key: 'category', label: 'Type', format: 'string' }], + data: [ + { key: 'category', label: 'Type', format: 'string', searchable: true }, + ], }, { name: 'IPC', @@ -174,6 +187,13 @@ export const markerSchemaForTests: MarkerSchema[] = [ { name: 'RefreshDriverTick', display: ['marker-chart', 'marker-table', 'timeline-overview'], - data: [{ key: 'name', label: 'Tick Reasons', format: 'string' }], + data: [ + { + key: 'name', + label: 'Tick Reasons', + format: 'string', + searchable: true, + }, + ], }, ]; diff --git a/src/test/store/__snapshots__/profile-view.test.js.snap b/src/test/store/__snapshots__/profile-view.test.js.snap index 2419dc9d7c..c4350c48b1 100644 --- a/src/test/store/__snapshots__/profile-view.test.js.snap +++ b/src/test/store/__snapshots__/profile-view.test.js.snap @@ -204,6 +204,7 @@ Object { "format": "string", "key": "prefName", "label": "Name", + "searchable": true, }, Object { "format": "string", @@ -230,6 +231,12 @@ Object { Object { "chartLabel": "{marker.data.name}", "data": Array [ + Object { + "format": "string", + "key": "name", + "label": "Name", + "searchable": true, + }, Object { "label": "Marker", "value": "UserTiming", @@ -259,6 +266,7 @@ Object { "format": "string", "key": "name", "label": "Details", + "searchable": true, }, ], "display": Array [ @@ -274,11 +282,13 @@ Object { "format": "string", "key": "module", "label": "Module", + "searchable": true, }, Object { "format": "string", "key": "name", "label": "Name", + "searchable": true, }, ], "display": Array [ @@ -295,6 +305,12 @@ Object { "key": "latency", "label": "Latency", }, + Object { + "format": "string", + "key": "eventType", + "label": "Event Type", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -311,6 +327,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -326,6 +343,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -341,6 +359,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -389,6 +408,7 @@ Object { "format": "string", "key": "name", "label": "Tick Reasons", + "searchable": true, }, ], "display": Array [ @@ -403,7 +423,7 @@ Object { "oscpu": "", "physicalCPUs": 0, "platform": "", - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "Firefox", "sourceURL": "", @@ -411,7 +431,7 @@ Object { "startTime": 0, "symbolicated": true, "toolkit": "", - "version": 25, + "version": 26, }, "pages": Array [ Object { diff --git a/src/test/store/markers.test.js b/src/test/store/markers.test.js index e4f0adf5e4..3a82f6f67f 100644 --- a/src/test/store/markers.test.js +++ b/src/test/store/markers.test.js @@ -18,6 +18,7 @@ import { getNetworkMarkers, } from '../fixtures/profiles/processed-profile'; import { storeWithProfile } from '../fixtures/stores'; +import { markerSchemaForTests } from '../fixtures/profiles/marker-schema'; describe('selectors/getMarkerChartTimingAndBuckets', function () { function getMarkerChartTimingAndBuckets(testMarkers: TestDefinedMarkers) { @@ -723,6 +724,7 @@ describe('profile upgrading and markers', () => { physicalCPUs: 0, logicalCPUs: 0, symbolicated: true, + markerSchema: markerSchemaForTests, }, pages: [], threads: [ diff --git a/src/test/unit/__snapshots__/profile-conversion.test.js.snap b/src/test/unit/__snapshots__/profile-conversion.test.js.snap index 912ecbe17e..942d87f59a 100644 --- a/src/test/unit/__snapshots__/profile-conversion.test.js.snap +++ b/src/test/unit/__snapshots__/profile-conversion.test.js.snap @@ -177,6 +177,12 @@ Object { "label": "Filename", "searchable": true, }, + Object { + "format": "string", + "key": "threadId", + "label": "Thread ID", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -299,6 +305,7 @@ Object { "format": "string", "key": "name", "label": "Details", + "searchable": true, }, ], "display": Array [ @@ -314,11 +321,13 @@ Object { "format": "string", "key": "module", "label": "Module", + "searchable": true, }, Object { "format": "string", "key": "name", "label": "Name", + "searchable": true, }, ], "display": Array [ @@ -335,6 +344,12 @@ Object { "key": "latency", "label": "Latency", }, + Object { + "format": "string", + "key": "eventType", + "label": "Event Type", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -351,6 +366,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -366,6 +382,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -381,6 +398,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -429,6 +447,7 @@ Object { "format": "string", "key": "name", "label": "Tick Reasons", + "searchable": true, }, ], "display": Array [ @@ -450,7 +469,7 @@ Object { "oscpu": undefined, "physicalCPUs": undefined, "platform": undefined, - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "ART Trace (Android)", "sampleUnits": undefined, @@ -460,7 +479,7 @@ Object { "symbolicated": true, "toolkit": undefined, "updateChannel": undefined, - "version": 25, + "version": 26, "visualMetrics": undefined, }, "pages": Array [], @@ -102635,6 +102654,12 @@ Object { "label": "Filename", "searchable": true, }, + Object { + "format": "string", + "key": "threadId", + "label": "Thread ID", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -102757,6 +102782,7 @@ Object { "format": "string", "key": "name", "label": "Details", + "searchable": true, }, ], "display": Array [ @@ -102772,11 +102798,13 @@ Object { "format": "string", "key": "module", "label": "Module", + "searchable": true, }, Object { "format": "string", "key": "name", "label": "Name", + "searchable": true, }, ], "display": Array [ @@ -102793,6 +102821,12 @@ Object { "key": "latency", "label": "Latency", }, + Object { + "format": "string", + "key": "eventType", + "label": "Event Type", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -102809,6 +102843,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -102824,6 +102859,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -102839,6 +102875,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -102887,6 +102924,7 @@ Object { "format": "string", "key": "name", "label": "Tick Reasons", + "searchable": true, }, ], "display": Array [ @@ -102908,7 +102946,7 @@ Object { "oscpu": undefined, "physicalCPUs": undefined, "platform": undefined, - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "ART Trace (Android)", "sampleUnits": undefined, @@ -102918,7 +102956,7 @@ Object { "symbolicated": true, "toolkit": undefined, "updateChannel": undefined, - "version": 25, + "version": 26, "visualMetrics": undefined, }, "pages": Array [], @@ -390202,7 +390240,7 @@ Object { "oscpu": "", "physicalCPUs": 0, "platform": "", - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "Chrome Trace", "sourceURL": "", @@ -390210,7 +390248,7 @@ Object { "startTime": 0, "symbolicated": true, "toolkit": "", - "version": 25, + "version": 26, }, "pages": Array [], "threads": Array [ @@ -444116,7 +444154,7 @@ Object { "oscpu": "", "physicalCPUs": 0, "platform": "", - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "Chrome Trace", "sourceURL": "", @@ -444124,7 +444162,7 @@ Object { "startTime": 0, "symbolicated": true, "toolkit": "", - "version": 25, + "version": 26, }, "pages": Array [], "threads": Array [ @@ -447149,7 +447187,7 @@ Object { "oscpu": "", "physicalCPUs": 0, "platform": "", - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "Chrome Trace", "sourceURL": "", @@ -447157,7 +447195,7 @@ Object { "startTime": 0, "symbolicated": true, "toolkit": "", - "version": 25, + "version": 26, }, "pages": Array [], "threads": Array [ @@ -448395,7 +448433,7 @@ Object { "oscpu": undefined, "physicalCPUs": undefined, "platform": undefined, - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "Firefox", "sampleUnits": undefined, @@ -448405,7 +448443,7 @@ Object { "symbolicated": true, "toolkit": undefined, "updateChannel": undefined, - "version": 25, + "version": 26, "visualMetrics": undefined, }, "pages": Array [], @@ -456138,7 +456176,7 @@ Object { "oscpu": undefined, "physicalCPUs": undefined, "platform": undefined, - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "Firefox", "sampleUnits": undefined, @@ -456148,7 +456186,7 @@ Object { "symbolicated": true, "toolkit": undefined, "updateChannel": undefined, - "version": 25, + "version": 26, "visualMetrics": undefined, }, "pages": Array [], @@ -476162,7 +476200,7 @@ Object { "oscpu": undefined, "physicalCPUs": undefined, "platform": undefined, - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "Firefox", "sampleUnits": undefined, @@ -476172,7 +476210,7 @@ Object { "symbolicated": true, "toolkit": undefined, "updateChannel": undefined, - "version": 25, + "version": 26, "visualMetrics": undefined, }, "pages": Array [], @@ -483910,7 +483948,7 @@ Object { "oscpu": undefined, "physicalCPUs": undefined, "platform": undefined, - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "Firefox", "sampleUnits": undefined, @@ -483920,7 +483958,7 @@ Object { "symbolicated": true, "toolkit": undefined, "updateChannel": undefined, - "version": 25, + "version": 26, "visualMetrics": undefined, }, "pages": Array [], @@ -508324,7 +508362,7 @@ Object { "oscpu": "", "physicalCPUs": 0, "platform": "", - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "target/debug/examples/work_log (dhat)", "sourceURL": "", @@ -508332,7 +508370,7 @@ Object { "startTime": 0, "symbolicated": true, "toolkit": "", - "version": 25, + "version": 26, }, "pages": Array [], "threads": Array [ diff --git a/src/test/unit/__snapshots__/profile-upgrading.test.js.snap b/src/test/unit/__snapshots__/profile-upgrading.test.js.snap index cdaa1a580d..ab6a947ff3 100644 --- a/src/test/unit/__snapshots__/profile-upgrading.test.js.snap +++ b/src/test/unit/__snapshots__/profile-upgrading.test.js.snap @@ -40,7 +40,7 @@ Object { "oscpu": undefined, "physicalCPUs": undefined, "platform": undefined, - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "Firefox", "sampleUnits": undefined, @@ -50,7 +50,7 @@ Object { "symbolicated": true, "toolkit": undefined, "updateChannel": undefined, - "version": 25, + "version": 26, "visualMetrics": undefined, }, "pages": Array [], @@ -7896,6 +7896,12 @@ Object { "label": "Filename", "searchable": true, }, + Object { + "format": "string", + "key": "threadId", + "label": "Thread ID", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -8018,6 +8024,7 @@ Object { "format": "string", "key": "name", "label": "Details", + "searchable": true, }, ], "display": Array [ @@ -8033,11 +8040,13 @@ Object { "format": "string", "key": "module", "label": "Module", + "searchable": true, }, Object { "format": "string", "key": "name", "label": "Name", + "searchable": true, }, ], "display": Array [ @@ -8054,6 +8063,12 @@ Object { "key": "latency", "label": "Latency", }, + Object { + "format": "string", + "key": "eventType", + "label": "Event Type", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -8070,6 +8085,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -8085,6 +8101,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -8100,6 +8117,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -8148,6 +8166,7 @@ Object { "format": "string", "key": "name", "label": "Tick Reasons", + "searchable": true, }, ], "display": Array [ @@ -8174,7 +8193,7 @@ Object { "stackwalk": 1, "startTime": 1460221352723.438, "toolkit": "cocoa", - "version": 25, + "version": 26, }, "pausedRanges": Array [], "processes": Array [ @@ -9341,6 +9360,12 @@ Object { "label": "Filename", "searchable": true, }, + Object { + "format": "string", + "key": "threadId", + "label": "Thread ID", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -9463,6 +9488,7 @@ Object { "format": "string", "key": "name", "label": "Details", + "searchable": true, }, ], "display": Array [ @@ -9478,11 +9504,13 @@ Object { "format": "string", "key": "module", "label": "Module", + "searchable": true, }, Object { "format": "string", "key": "name", "label": "Name", + "searchable": true, }, ], "display": Array [ @@ -9499,6 +9527,12 @@ Object { "key": "latency", "label": "Latency", }, + Object { + "format": "string", + "key": "eventType", + "label": "Event Type", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -9515,6 +9549,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -9530,6 +9565,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -9545,6 +9581,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -9593,6 +9630,7 @@ Object { "format": "string", "key": "name", "label": "Tick Reasons", + "searchable": true, }, ], "display": Array [ @@ -9619,7 +9657,7 @@ Object { "stackwalk": 1, "startTime": 1460221352723.438, "toolkit": "cocoa", - "version": 25, + "version": 26, }, "pages": Array [ Object { @@ -10871,6 +10909,12 @@ Object { "label": "Filename", "searchable": true, }, + Object { + "format": "string", + "key": "threadId", + "label": "Thread ID", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -10993,6 +11037,7 @@ Object { "format": "string", "key": "name", "label": "Details", + "searchable": true, }, ], "display": Array [ @@ -11008,11 +11053,13 @@ Object { "format": "string", "key": "module", "label": "Module", + "searchable": true, }, Object { "format": "string", "key": "name", "label": "Name", + "searchable": true, }, ], "display": Array [ @@ -11029,6 +11076,12 @@ Object { "key": "latency", "label": "Latency", }, + Object { + "format": "string", + "key": "eventType", + "label": "Event Type", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -11045,6 +11098,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -11060,6 +11114,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -11075,6 +11130,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -11123,6 +11179,7 @@ Object { "format": "string", "key": "name", "label": "Tick Reasons", + "searchable": true, }, ], "display": Array [ @@ -11143,7 +11200,7 @@ Object { "misc": "rv:48.0", "oscpu": "Intel Mac OS X 10.11", "platform": "Macintosh", - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "Firefox", "stackwalk": 1, @@ -12530,6 +12587,12 @@ Object { "label": "Filename", "searchable": true, }, + Object { + "format": "string", + "key": "threadId", + "label": "Thread ID", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -12652,6 +12715,7 @@ Object { "format": "string", "key": "name", "label": "Details", + "searchable": true, }, ], "display": Array [ @@ -12667,11 +12731,13 @@ Object { "format": "string", "key": "module", "label": "Module", + "searchable": true, }, Object { "format": "string", "key": "name", "label": "Name", + "searchable": true, }, ], "display": Array [ @@ -12688,6 +12754,12 @@ Object { "key": "latency", "label": "Latency", }, + Object { + "format": "string", + "key": "eventType", + "label": "Event Type", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -12704,6 +12776,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -12719,6 +12792,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -12734,6 +12808,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -12782,6 +12857,7 @@ Object { "format": "string", "key": "name", "label": "Tick Reasons", + "searchable": true, }, ], "display": Array [ @@ -12802,7 +12878,7 @@ Object { "misc": "rv:48.0", "oscpu": "Intel Mac OS X 10.11", "platform": "Macintosh", - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "Firefox", "stackwalk": 1, @@ -14339,6 +14415,12 @@ Object { "label": "Filename", "searchable": true, }, + Object { + "format": "string", + "key": "threadId", + "label": "Thread ID", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -14461,6 +14543,7 @@ Object { "format": "string", "key": "name", "label": "Details", + "searchable": true, }, ], "display": Array [ @@ -14476,11 +14559,13 @@ Object { "format": "string", "key": "module", "label": "Module", + "searchable": true, }, Object { "format": "string", "key": "name", "label": "Name", + "searchable": true, }, ], "display": Array [ @@ -14497,6 +14582,12 @@ Object { "key": "latency", "label": "Latency", }, + Object { + "format": "string", + "key": "eventType", + "label": "Event Type", + "searchable": true, + }, ], "display": Array [ "marker-chart", @@ -14513,6 +14604,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -14528,6 +14620,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -14543,6 +14636,7 @@ Object { "format": "string", "key": "category", "label": "Type", + "searchable": true, }, ], "display": Array [ @@ -14591,6 +14685,7 @@ Object { "format": "string", "key": "name", "label": "Tick Reasons", + "searchable": true, }, ], "display": Array [ @@ -14611,7 +14706,7 @@ Object { "misc": "rv:48.0", "oscpu": "Intel Mac OS X 10.11", "platform": "Macintosh", - "preprocessedProfileVersion": 43, + "preprocessedProfileVersion": 44, "processType": 0, "product": "Firefox", "stackwalk": 1,