@paulirish/trace_engine 0.0.50 → 0.0.52

package/models/trace/extras/ThirdParties.js

@@ -1,153 +1,120 @@
 // Copyright 2024 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-import * as ThirdPartyWeb from '../../../third_party/third-party-web/third-party-web.js';
 import * as Handlers from '../handlers/handlers.js';
 import * as Helpers from '../helpers/helpers.js';
 import * as Types from '../types/types.js';
-function getOrMakeSummaryByEntity(thirdPartySummary, event, url) {
-    const entity = ThirdPartyWeb.ThirdPartyWeb.getEntity(url) ??
-        Handlers.Helpers.makeUpEntity(thirdPartySummary.madeUpEntityCache, url);
-    if (!entity) {
-        return null;
-    }
-    const urls = thirdPartySummary.urlsByEntity.get(entity) ?? new Set();
-    urls.add(url);
-    thirdPartySummary.urlsByEntity.set(entity, urls);
-    const events = thirdPartySummary.eventsByEntity.get(entity) ?? [];
-    events.push(event);
-    thirdPartySummary.eventsByEntity.set(entity, events);
-    let summary = thirdPartySummary.byEntity.get(entity);
-    if (summary) {
-        return summary;
-    }
-    summary = { transferSize: 0, mainThreadTime: Types.Timing.Micro(0) };
-    thirdPartySummary.byEntity.set(entity, summary);
-    return summary;
-}
-function getOrMakeSummaryByURL(thirdPartySummary, url) {
-    let summary = thirdPartySummary.byUrl.get(url);
-    if (summary) {
-        return summary;
-    }
-    summary = { transferSize: 0, mainThreadTime: Types.Timing.Micro(0) };
-    thirdPartySummary.byUrl.set(url, summary);
-    return summary;
-}
-// TODO: Remove and use the the BottomUpRootNode defined in ThirdPartyTreeView instead.
-function collectMainThreadActivity(thirdPartySummary, parsedTrace, bounds) {
-    for (const process of parsedTrace.Renderer.processes.values()) {
-        if (!process.isOnMainFrame) {
-            continue;
-        }
-        for (const thread of process.threads.values()) {
-            if (thread.name === 'CrRendererMain') {
-                if (!thread.tree) {
-                    break;
-                }
-                for (const event of thread.entries) {
-                    if (!Helpers.Timing.eventIsInBounds(event, bounds)) {
-                        continue;
-                    }
-                    const node = parsedTrace.Renderer.entryToNode.get(event);
-                    if (!node || !node.selfTime) {
-                        continue;
-                    }
-                    const url = Handlers.Helpers.getNonResolvedURL(event, parsedTrace);
-                    if (!url) {
-                        continue;
-                    }
-                    let summary = getOrMakeSummaryByEntity(thirdPartySummary, event, url);
-                    if (summary) {
-                        summary.mainThreadTime = (summary.mainThreadTime + node.selfTime);
-                    }
-                    summary = getOrMakeSummaryByURL(thirdPartySummary, url);
-                    if (summary) {
-                        summary.mainThreadTime = (summary.mainThreadTime + node.selfTime);
-                    }
-                }
-            }
-        }
+import * as TraceFilter from './TraceFilter.js';
+import * as TraceTree from './TraceTree.js';
+/**
+ *
+ * Returns Main frame main thread events.
+ * These events are inline with the ones used by selectedEvents() of TimelineTreeViews
+ */
+function collectMainThreadActivity(parsedTrace) {
+    // TODO: Note b/402658800 could be an issue here.
+    const mainFrameMainThread = parsedTrace.Renderer.processes.values()
+        .find(p => {
+        const url = p.url ?? '';
+        // Frame url checked a la CompatibilityTracksAppenders's addThreadAppenders
+        return p.isOnMainFrame && !url.startsWith('about:') && !url.startsWith('chrome:');
+    })
+        ?.threads.values()
+        .find(t => t.name === 'CrRendererMain');
+    if (!mainFrameMainThread) {
+        return [];
     }
+    return mainFrameMainThread.entries;
 }
-function collectNetworkActivity(thirdPartySummary, requests) {
-    for (const request of requests) {
-        const url = request.args.data.url;
-        let summary = getOrMakeSummaryByEntity(thirdPartySummary, request, url);
-        if (summary) {
-            summary.transferSize += request.args.data.encodedDataLength;
-        }
-        summary = getOrMakeSummaryByURL(thirdPartySummary, url);
-        if (summary) {
-            summary.transferSize += request.args.data.encodedDataLength;
-        }
-    }
+export function summarizeByThirdParty(parsedTrace, traceBounds) {
+    const mainThreadEvents = collectMainThreadActivity(parsedTrace).sort(Helpers.Trace.eventTimeComparator);
+    const groupingFunction = (event) => {
+        const entity = parsedTrace.Renderer.entityMappings.entityByEvent.get(event);
+        return entity?.name ?? '';
+    };
+    const node = getBottomUpTree(mainThreadEvents, traceBounds, groupingFunction);
+    const summaries = summarizeBottomUpByEntity(node, parsedTrace);
+    return summaries;
 }
 /**
- * @param networkRequests Won't be filtered by trace bounds, so callers should ensure it is filtered.
+ * Used only by Lighthouse.
  */
-export function summarizeThirdParties(parsedTrace, traceBounds, networkRequests) {
-    const thirdPartySummary = {
-        byEntity: new Map(),
-        byUrl: new Map(),
-        urlsByEntity: new Map(),
-        eventsByEntity: new Map(),
-        madeUpEntityCache: new Map(),
+export function summarizeByURL(parsedTrace, traceBounds) {
+    const mainThreadEvents = collectMainThreadActivity(parsedTrace).sort(Helpers.Trace.eventTimeComparator);
+    const groupingFunction = (event) => {
+        return Handlers.Helpers.getNonResolvedURL(event, parsedTrace) ?? '';
     };
-    collectMainThreadActivity(thirdPartySummary, parsedTrace, traceBounds);
-    collectNetworkActivity(thirdPartySummary, networkRequests);
-    return thirdPartySummary;
+    const node = getBottomUpTree(mainThreadEvents, traceBounds, groupingFunction);
+    const summaries = summarizeBottomUpByURL(node, parsedTrace);
+    return summaries;
 }
-function getSummaryMapWithMapping(events, entityByEvent, eventsByEntity) {
-    const byEvent = new Map();
-    const byEntity = new Map();
-    const defaultSummary = { transferSize: 0, mainThreadTime: Types.Timing.Micro(0) };
-    for (const event of events) {
-        const urlSummary = byEvent.get(event) || { ...defaultSummary };
-        if (Types.Events.isSyntheticNetworkRequest(event)) {
-            urlSummary.transferSize += event.args.data.encodedDataLength;
+function summarizeBottomUpByEntity(root, parsedTrace) {
+    const summaries = [];
+    // Top nodes are the 3P entities.
+    const topNodes = [...root.children().values()].flat();
+    for (const node of topNodes) {
+        if (node.id === '') {
+            continue;
+        }
+        const entity = parsedTrace.Renderer.entityMappings.entityByEvent.get(node.event);
+        if (!entity) {
+            continue;
         }
-        byEvent.set(event, urlSummary);
+        // Lets use the mapper events as our source of events, since we use the main thread to construct
+        // the bottom up tree. The mapper will give us all related events.
+        const summary = {
+            transferSize: node.transferSize,
+            mainThreadTime: Types.Timing.Milli(node.selfTime),
+            entity,
+            relatedEvents: parsedTrace.Renderer.entityMappings.eventsByEntity.get(entity) ?? [],
+        };
+        summaries.push(summary);
     }
-    // Map each request's stat to a particular entity.
-    for (const [request, requestSummary] of byEvent.entries()) {
-        const entity = entityByEvent.get(request);
+    return summaries;
+}
+function summarizeBottomUpByURL(root, parsedTrace) {
+    const summaries = [];
+    const allRequests = parsedTrace.NetworkRequests.byTime;
+    // Top nodes are URLs.
+    const topNodes = [...root.children().values()].flat();
+    for (const node of topNodes) {
+        if (node.id === '' || typeof node.id !== 'string') {
+            continue;
+        }
+        const entity = parsedTrace.Renderer.entityMappings.entityByEvent.get(node.event);
         if (!entity) {
-            byEvent.delete(request);
             continue;
         }
-        const entitySummary = byEntity.get(entity) || { ...defaultSummary };
-        entitySummary.transferSize += requestSummary.transferSize;
-        byEntity.set(entity, entitySummary);
+        const url = node.id;
+        const request = allRequests.find(r => r.args.data.url === url);
+        const summary = {
+            request,
+            url,
+            entity,
+            transferSize: node.transferSize,
+            mainThreadTime: Types.Timing.Milli(node.selfTime),
+        };
+        summaries.push(summary);
     }
-    return { byEntity, eventsByEntity, madeUpEntityCache: new Map(), byUrl: new Map(), urlsByEntity: new Map() };
+    return summaries;
 }
-// TODO(crbug.com/352244718): Remove or refactor to use summarizeThirdParties/collectMainThreadActivity/etc.
-/**
- * Note: unlike summarizeThirdParties, this does not calculate mainThreadTime. The reason is that it is not
- * needed for its one use case, and when dragging the trace bounds it takes a long time to calculate.
- * If it is ever needed, we need to make getSelfTimeByUrl (see deleted code/blame) much faster (cache + bucket?).
- */
-export function getSummariesAndEntitiesWithMapping(parsedTrace, traceBounds, entityMapping) {
-    const entityByEvent = new Map(entityMapping.entityByEvent);
-    const eventsByEntity = new Map(entityMapping.eventsByEntity);
-    // Consider events only in bounds.
-    const entityByEventArr = Array.from(entityByEvent.entries());
-    const filteredEntries = entityByEventArr.filter(([event]) => {
-        return Helpers.Timing.eventIsInBounds(event, traceBounds);
-    });
-    const entityByEventFiltered = new Map(filteredEntries);
-    // Consider events only in bounds.
-    const eventsByEntityArr = Array.from(eventsByEntity.entries());
-    const filtered = eventsByEntityArr.filter(([, events]) => {
-        events.map(event => {
-            return Helpers.Timing.eventIsInBounds(event, traceBounds);
-        });
-        return events.length > 0;
+function getBottomUpTree(mainThreadEvents, tracebounds, groupingFunction) {
+    // Use the same filtering as front_end/panels/timeline/TimelineTreeView.ts.
+    const visibleEvents = Helpers.Trace.VISIBLE_TRACE_EVENT_TYPES.values().toArray();
+    const filter = new TraceFilter.VisibleEventsFilter(visibleEvents.concat(["SyntheticNetworkRequest" /* Types.Events.Name.SYNTHETIC_NETWORK_REQUEST */]));
+    // The bottom up root node handles all the "in Tracebounds" checks we need for the insight.
+    const startTime = Helpers.Timing.microToMilli(tracebounds.min);
+    const endTime = Helpers.Timing.microToMilli(tracebounds.max);
+    const node = new TraceTree.BottomUpRootNode(mainThreadEvents, {
+        textFilter: new TraceFilter.ExclusiveNameFilter([]),
+        filters: [filter],
+        startTime,
+        endTime,
+        eventGroupIdCallback: groupingFunction,
+        calculateTransferSize: true,
+        // Ensure we group by 3P alongside eventID for correct 3P grouping.
+        forceGroupIdCallback: true,
     });
-    const eventsByEntityFiltered = new Map(filtered);
-    const allEvents = Array.from(entityByEvent.keys());
-    const summaries = getSummaryMapWithMapping(allEvents, entityByEventFiltered, eventsByEntityFiltered);
-    return { summaries, entityByEvent: entityByEventFiltered };
+    return node;
 }
 //# sourceMappingURL=ThirdParties.js.map

package/models/trace/extras/ThirdParties.js.map

@@ -1 +1 @@
-{"version":3,"file":"ThirdParties.js","sourceRoot":"","sources":["../../../../../../../front_end/models/trace/extras/ThirdParties.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2024 The Chromium Authors. All rights reserved.\n// Use of this source code is governed by a BSD-style license that can be\n// found in the LICENSE file.\n\nimport * as ThirdPartyWeb from '../../../third_party/third-party-web/third-party-web.js';\nimport * as Handlers from '../handlers/handlers.js';\nimport * as Helpers from '../helpers/helpers.js';\nimport * as Types from '../types/types.js';\n\nexport type Entity = typeof ThirdPartyWeb.ThirdPartyWeb.entities[number];\n\nexport interface Summary {\n  transferSize: number;\n  mainThreadTime: Types.Timing.Micro;\n}\n\nexport interface ThirdPartySummary {\n  byEntity: Map<Entity, Summary>;\n  byUrl: Map<string, Summary>;\n  urlsByEntity: Map<Entity, Set<string>>;\n  eventsByEntity: Map<Entity, Types.Events.Event[]>;\n  madeUpEntityCache: Map<string, Entity>;\n}\n\nfunction getOrMakeSummaryByEntity(\n    thirdPartySummary: ThirdPartySummary, event: Types.Events.Event, url: string): Summary|null {\n  const entity = ThirdPartyWeb.ThirdPartyWeb.getEntity(url) ??\n      Handlers.Helpers.makeUpEntity(thirdPartySummary.madeUpEntityCache, url);\n  if (!entity) {\n    return null;\n  }\n\n  const urls = thirdPartySummary.urlsByEntity.get(entity) ?? new Set();\n  urls.add(url);\n  thirdPartySummary.urlsByEntity.set(entity, urls);\n\n  const events = thirdPartySummary.eventsByEntity.get(entity) ?? [];\n  events.push(event);\n  thirdPartySummary.eventsByEntity.set(entity, events);\n\n  let summary = thirdPartySummary.byEntity.get(entity);\n  if (summary) {\n    return summary;\n  }\n\n  summary = {transferSize: 0, mainThreadTime: Types.Timing.Micro(0)};\n  thirdPartySummary.byEntity.set(entity, summary);\n  return summary;\n}\n\nfunction getOrMakeSummaryByURL(thirdPartySummary: ThirdPartySummary, url: string): Summary|null {\n  let summary = thirdPartySummary.byUrl.get(url);\n  if (summary) {\n    return summary;\n  }\n\n  summary = {transferSize: 0, mainThreadTime: Types.Timing.Micro(0)};\n  thirdPartySummary.byUrl.set(url, summary);\n  return summary;\n}\n\n// TODO: Remove and use the the BottomUpRootNode defined in ThirdPartyTreeView instead.\nfunction collectMainThreadActivity(\n    thirdPartySummary: ThirdPartySummary, parsedTrace: Handlers.Types.ParsedTrace,\n    bounds: Types.Timing.TraceWindowMicro): void {\n  for (const process of parsedTrace.Renderer.processes.values()) {\n    if (!process.isOnMainFrame) {\n      continue;\n    }\n\n    for (const thread of process.threads.values()) {\n      if (thread.name === 'CrRendererMain') {\n        if (!thread.tree) {\n          break;\n        }\n\n        for (const event of thread.entries) {\n          if (!Helpers.Timing.eventIsInBounds(event, bounds)) {\n            continue;\n          }\n\n          const node = parsedTrace.Renderer.entryToNode.get(event);\n          if (!node || !node.selfTime) {\n            continue;\n          }\n\n          const url = Handlers.Helpers.getNonResolvedURL(event, parsedTrace);\n          if (!url) {\n            continue;\n          }\n\n          let summary = getOrMakeSummaryByEntity(thirdPartySummary, event, url);\n          if (summary) {\n            summary.mainThreadTime = (summary.mainThreadTime + node.selfTime) as Types.Timing.Micro;\n          }\n\n          summary = getOrMakeSummaryByURL(thirdPartySummary, url);\n          if (summary) {\n            summary.mainThreadTime = (summary.mainThreadTime + node.selfTime) as Types.Timing.Micro;\n          }\n        }\n      }\n    }\n  }\n}\n\nfunction collectNetworkActivity(\n    thirdPartySummary: ThirdPartySummary, requests: Types.Events.SyntheticNetworkRequest[]): void {\n  for (const request of requests) {\n    const url = request.args.data.url;\n\n    let summary = getOrMakeSummaryByEntity(thirdPartySummary, request, url);\n    if (summary) {\n      summary.transferSize += request.args.data.encodedDataLength;\n    }\n\n    summary = getOrMakeSummaryByURL(thirdPartySummary, url);\n    if (summary) {\n      summary.transferSize += request.args.data.encodedDataLength;\n    }\n  }\n}\n\n/**\n * @param networkRequests Won't be filtered by trace bounds, so callers should ensure it is filtered.\n */\nexport function summarizeThirdParties(\n    parsedTrace: Handlers.Types.ParsedTrace, traceBounds: Types.Timing.TraceWindowMicro,\n    networkRequests: Types.Events.SyntheticNetworkRequest[]): ThirdPartySummary {\n  const thirdPartySummary: ThirdPartySummary = {\n    byEntity: new Map(),\n    byUrl: new Map(),\n    urlsByEntity: new Map(),\n    eventsByEntity: new Map(),\n    madeUpEntityCache: new Map(),\n  };\n\n  collectMainThreadActivity(thirdPartySummary, parsedTrace, traceBounds);\n  collectNetworkActivity(thirdPartySummary, networkRequests);\n\n  return thirdPartySummary;\n}\n\nfunction getSummaryMapWithMapping(\n    events: Types.Events.Event[], entityByEvent: Map<Types.Events.Event, Handlers.Helpers.Entity>,\n    eventsByEntity: Map<Handlers.Helpers.Entity, Types.Events.Event[]>): ThirdPartySummary {\n  const byEvent = new Map<Types.Events.Event, Summary>();\n  const byEntity = new Map<Handlers.Helpers.Entity, Summary>();\n  const defaultSummary: Summary = {transferSize: 0, mainThreadTime: Types.Timing.Micro(0)};\n\n  for (const event of events) {\n    const urlSummary = byEvent.get(event) || {...defaultSummary};\n    if (Types.Events.isSyntheticNetworkRequest(event)) {\n      urlSummary.transferSize += event.args.data.encodedDataLength;\n    }\n    byEvent.set(event, urlSummary);\n  }\n\n  // Map each request's stat to a particular entity.\n  for (const [request, requestSummary] of byEvent.entries()) {\n    const entity = entityByEvent.get(request);\n    if (!entity) {\n      byEvent.delete(request);\n      continue;\n    }\n\n    const entitySummary = byEntity.get(entity) || {...defaultSummary};\n    entitySummary.transferSize += requestSummary.transferSize;\n    byEntity.set(entity, entitySummary);\n  }\n\n  return {byEntity, eventsByEntity, madeUpEntityCache: new Map(), byUrl: new Map(), urlsByEntity: new Map()};\n}\n\n// TODO(crbug.com/352244718): Remove or refactor to use summarizeThirdParties/collectMainThreadActivity/etc.\n/**\n * Note: unlike summarizeThirdParties, this does not calculate mainThreadTime. The reason is that it is not\n * needed for its one use case, and when dragging the trace bounds it takes a long time to calculate.\n * If it is ever needed, we need to make getSelfTimeByUrl (see deleted code/blame) much faster (cache + bucket?).\n */\nexport function getSummariesAndEntitiesWithMapping(\n    parsedTrace: Handlers.Types.ParsedTrace, traceBounds: Types.Timing.TraceWindowMicro,\n    entityMapping: Handlers.Helpers.EntityMappings): {\n  summaries: ThirdPartySummary,\n  entityByEvent: Map<Types.Events.Event, Handlers.Helpers.Entity>,\n} {\n  const entityByEvent = new Map(entityMapping.entityByEvent);\n  const eventsByEntity = new Map(entityMapping.eventsByEntity);\n\n  // Consider events only in bounds.\n  const entityByEventArr = Array.from(entityByEvent.entries());\n  const filteredEntries = entityByEventArr.filter(([event]) => {\n    return Helpers.Timing.eventIsInBounds(event, traceBounds);\n  });\n  const entityByEventFiltered = new Map(filteredEntries);\n\n  // Consider events only in bounds.\n  const eventsByEntityArr = Array.from(eventsByEntity.entries());\n  const filtered = eventsByEntityArr.filter(([, events]) => {\n    events.map(event => {\n      return Helpers.Timing.eventIsInBounds(event, traceBounds);\n    });\n    return events.length > 0;\n  });\n  const eventsByEntityFiltered = new Map(filtered);\n\n  const allEvents = Array.from(entityByEvent.keys());\n  const summaries = getSummaryMapWithMapping(allEvents, entityByEventFiltered, eventsByEntityFiltered);\n\n  return {summaries, entityByEvent: entityByEventFiltered};\n}\n"]}
+{"version":3,"file":"ThirdParties.js","sourceRoot":"","sources":["../../../../../../../front_end/models/trace/extras/ThirdParties.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2024 The Chromium Authors. All rights reserved.\n// Use of this source code is governed by a BSD-style license that can be\n// found in the LICENSE file.\n\nimport type * as ThirdPartyWeb from '../../../third_party/third-party-web/third-party-web.js';\nimport * as Handlers from '../handlers/handlers.js';\nimport * as Helpers from '../helpers/helpers.js';\nimport * as Types from '../types/types.js';\n\nimport * as TraceFilter from './TraceFilter.js';\nimport * as TraceTree from './TraceTree.js';\n\nexport type Entity = typeof ThirdPartyWeb.ThirdPartyWeb.entities[number];\n\ninterface BaseSummary {\n  entity: Entity;\n  transferSize: number;\n  mainThreadTime: Types.Timing.Milli;\n}\n\nexport interface EntitySummary extends BaseSummary {\n  relatedEvents: Types.Events.Event[];\n}\n\nexport interface URLSummary extends BaseSummary {\n  url: string;\n  request?: Types.Events.SyntheticNetworkRequest;\n}\n\n/**\n *\n * Returns Main frame main thread events.\n * These events are inline with the ones used by selectedEvents() of TimelineTreeViews\n */\nfunction collectMainThreadActivity(parsedTrace: Handlers.Types.ParsedTrace): Types.Events.Event[] {\n  // TODO: Note b/402658800 could be an issue here.\n  const mainFrameMainThread = parsedTrace.Renderer.processes.values()\n                                  .find(p => {\n                                    const url = p.url ?? '';\n                                    // Frame url checked a la CompatibilityTracksAppenders's addThreadAppenders\n                                    return p.isOnMainFrame && !url.startsWith('about:') && !url.startsWith('chrome:');\n                                  })\n                                  ?.threads.values()\n                                  .find(t => t.name === 'CrRendererMain');\n\n  if (!mainFrameMainThread) {\n    return [];\n  }\n\n  return mainFrameMainThread.entries;\n}\n\nexport function summarizeByThirdParty(\n    parsedTrace: Handlers.Types.ParsedTrace, traceBounds: Types.Timing.TraceWindowMicro): EntitySummary[] {\n  const mainThreadEvents = collectMainThreadActivity(parsedTrace).sort(Helpers.Trace.eventTimeComparator);\n  const groupingFunction = (event: Types.Events.Event): string => {\n    const entity = parsedTrace.Renderer.entityMappings.entityByEvent.get(event);\n    return entity?.name ?? '';\n  };\n  const node = getBottomUpTree(mainThreadEvents, traceBounds, groupingFunction);\n  const summaries = summarizeBottomUpByEntity(node, parsedTrace);\n\n  return summaries;\n}\n\n/**\n * Used only by Lighthouse.\n */\nexport function summarizeByURL(\n    parsedTrace: Handlers.Types.ParsedTrace, traceBounds: Types.Timing.TraceWindowMicro): URLSummary[] {\n  const mainThreadEvents = collectMainThreadActivity(parsedTrace).sort(Helpers.Trace.eventTimeComparator);\n  const groupingFunction = (event: Types.Events.Event): string => {\n    return Handlers.Helpers.getNonResolvedURL(event, parsedTrace) ?? '';\n  };\n  const node = getBottomUpTree(mainThreadEvents, traceBounds, groupingFunction);\n  const summaries = summarizeBottomUpByURL(node, parsedTrace);\n\n  return summaries;\n}\n\nfunction summarizeBottomUpByEntity(\n    root: TraceTree.BottomUpRootNode, parsedTrace: Handlers.Types.ParsedTrace): EntitySummary[] {\n  const summaries: EntitySummary[] = [];\n\n  // Top nodes are the 3P entities.\n  const topNodes = [...root.children().values()].flat();\n  for (const node of topNodes) {\n    if (node.id === '') {\n      continue;\n    }\n\n    const entity = parsedTrace.Renderer.entityMappings.entityByEvent.get(node.event);\n    if (!entity) {\n      continue;\n    }\n\n    // Lets use the mapper events as our source of events, since we use the main thread to construct\n    // the bottom up tree. The mapper will give us all related events.\n    const summary: EntitySummary = {\n      transferSize: node.transferSize,\n      mainThreadTime: Types.Timing.Milli(node.selfTime),\n      entity,\n      relatedEvents: parsedTrace.Renderer.entityMappings.eventsByEntity.get(entity) ?? [],\n    };\n    summaries.push(summary);\n  }\n\n  return summaries;\n}\n\nfunction summarizeBottomUpByURL(\n    root: TraceTree.BottomUpRootNode, parsedTrace: Handlers.Types.ParsedTrace): URLSummary[] {\n  const summaries: URLSummary[] = [];\n  const allRequests = parsedTrace.NetworkRequests.byTime;\n\n  // Top nodes are URLs.\n  const topNodes = [...root.children().values()].flat();\n  for (const node of topNodes) {\n    if (node.id === '' || typeof node.id !== 'string') {\n      continue;\n    }\n\n    const entity = parsedTrace.Renderer.entityMappings.entityByEvent.get(node.event);\n    if (!entity) {\n      continue;\n    }\n\n    const url = node.id;\n    const request = allRequests.find(r => r.args.data.url === url);\n\n    const summary: URLSummary = {\n      request,\n      url,\n      entity,\n      transferSize: node.transferSize,\n      mainThreadTime: Types.Timing.Milli(node.selfTime),\n    };\n    summaries.push(summary);\n  }\n\n  return summaries;\n}\n\nfunction getBottomUpTree(\n    mainThreadEvents: Types.Events.Event[], tracebounds: Types.Timing.TraceWindowMicro,\n    groupingFunction: ((arg0: Types.Events.Event) => string)|null): TraceTree.BottomUpRootNode {\n  // Use the same filtering as front_end/panels/timeline/TimelineTreeView.ts.\n  const visibleEvents = Helpers.Trace.VISIBLE_TRACE_EVENT_TYPES.values().toArray();\n  const filter =\n      new TraceFilter.VisibleEventsFilter(visibleEvents.concat([Types.Events.Name.SYNTHETIC_NETWORK_REQUEST]));\n\n  // The bottom up root node handles all the \"in Tracebounds\" checks we need for the insight.\n  const startTime = Helpers.Timing.microToMilli(tracebounds.min);\n  const endTime = Helpers.Timing.microToMilli(tracebounds.max);\n  const node = new TraceTree.BottomUpRootNode(mainThreadEvents, {\n    textFilter: new TraceFilter.ExclusiveNameFilter([]),\n    filters: [filter],\n    startTime,\n    endTime,\n    eventGroupIdCallback: groupingFunction,\n    calculateTransferSize: true,\n    // Ensure we group by 3P alongside eventID for correct 3P grouping.\n    forceGroupIdCallback: true,\n  }) as TraceTree.BottomUpRootNode;\n  return node;\n}\n"]}

package/models/trace/extras/TraceTree.d.ts

@@ -67,21 +67,33 @@ export declare class BottomUpRootNode extends Node {
     readonly filter: (e: Types.Events.Event) => boolean;
     readonly startTime: Types.Timing.Milli;
     readonly endTime: Types.Timing.Milli;
-    private eventGroupIdCallback;
     totalTime: number;
+    eventGroupIdCallback: ((arg0: Types.Events.Event) => string) | null | undefined;
     private calculateTransferSize?;
-    constructor(events: Types.Events.Event[], { textFilter, filters, startTime, endTime, eventGroupIdCallback, calculateTransferSize, }: {
+    private forceGroupIdCallback?;
+    constructor(events: Types.Events.Event[], { textFilter, filters, startTime, endTime, eventGroupIdCallback, calculateTransferSize, forceGroupIdCallback, }: {
         textFilter: TraceFilter;
         filters: readonly TraceFilter[];
         startTime: Types.Timing.Milli;
         endTime: Types.Timing.Milli;
         eventGroupIdCallback?: ((arg0: Types.Events.Event) => string) | null;
         calculateTransferSize?: boolean;
+        /**
+         * This forces using `eventGroupIdCallback` in combination with generateEventID
+         * to generate the ID of the node.
+         *
+         * This is used in the ThirdPartyTreeView and BottomUpTreeView, where we want to group all events
+         * related to a specific 3P entity together, regardless of the specific event name/type.
+         * There are cases where events under the same event name belong to different entities. But, because
+         * they get grouped first by event name/type, it throws off the 3P groupBy - grouping events of different
+         * 3P entities together.
+         */
+        forceGroupIdCallback?: boolean;
     });
     hasChildren(): boolean;
     filterChildren(children: ChildrenCache): ChildrenCache;
     children(): ChildrenCache;
-    private ungrouppedTopNodes;
+    private ungroupedTopNodes;
     private grouppedTopNodes;
 }
 export declare class GroupNode extends Node {

package/models/trace/extras/TraceTree.js

@@ -283,10 +283,11 @@ export class BottomUpRootNode extends Node {
     filter;
     startTime;
     endTime;
-    eventGroupIdCallback;
     totalTime;
+    eventGroupIdCallback;
     calculateTransferSize;
-    constructor(events, { textFilter, filters, startTime, endTime, eventGroupIdCallback, calculateTransferSize, }) {
+    forceGroupIdCallback;
+    constructor(events, { textFilter, filters, startTime, endTime, eventGroupIdCallback, calculateTransferSize, forceGroupIdCallback, }) {
         super('', events[0]);
         this.childrenInternal = null;
         this.events = events;
@@ -297,6 +298,7 @@ export class BottomUpRootNode extends Node {
         this.eventGroupIdCallback = eventGroupIdCallback;
         this.totalTime = endTime - startTime;
         this.calculateTransferSize = calculateTransferSize;
+        this.forceGroupIdCallback = forceGroupIdCallback;
     }
     hasChildren() {
         return true;
@@ -320,7 +322,7 @@ export class BottomUpRootNode extends Node {
     // If no grouping is applied, the nodes returned here are what's initially shown in the bottom-up view.
     // "No grouping" == no grouping in UI dropdown == no groupingFunction…
     // … HOWEVER, nodes are still aggregated via `generateEventID`, which is ~= the event name.
-    ungrouppedTopNodes() {
+    ungroupedTopNodes() {
         const root = this;
         const startTime = this.startTime;
         const endTime = this.endTime;
@@ -328,10 +330,16 @@ export class BottomUpRootNode extends Node {
         const selfTimeStack = [endTime - startTime];
         const firstNodeStack = [];
         const totalTimeById = new Map();
+        // TODO(paulirish): rename to getGroupNodeId
+        const eventGroupIdCallback = this.eventGroupIdCallback;
+        const forceGroupIdCallback = this.forceGroupIdCallback;
         // encodedDataLength is provided solely on instant events.
         const sumTransferSizeOfInstantEvent = (e) => {
             if (Types.Events.isReceivedDataEvent(e)) {
-                const id = generateEventID(e);
+                let id = generateEventID(e);
+                if (this.forceGroupIdCallback && this.eventGroupIdCallback) {
+                    id = `${id}-${this.eventGroupIdCallback(e)}`;
+                }
                 let node = nodeById.get(id);
                 if (!node) {
                     node = new BottomUpNode(root, id, e, false, root);
@@ -340,7 +348,20 @@ export class BottomUpRootNode extends Node {
                 else {
                     node.events.push(e);
                 }
-                node.transferSize += e.args.data.encodedDataLength;
+                // ResourceReceivedData events tally up the transfer size over time, but the
+                // ResourceReceiveResponse / ResourceFinish events hold the final result.
+                if (e.name === 'ResourceReceivedData') {
+                    node.transferSize += e.args.data.encodedDataLength;
+                }
+                else if (e.args.data.encodedDataLength > 0) {
+                    // For some reason, ResourceFinish can be zero even if data was sent.
+                    // Ignore that case.
+                    // Note: this will count the entire resource size if just the last bit of a
+                    // request is in view. If it isn't in view, the transfer size is counted
+                    // gradually, in proportion with the ResourceReceivedData events in the
+                    // current view.
+                    node.transferSize = e.args.data.encodedDataLength;
+                }
             }
         };
         Helpers.Trace.forEachEvent(this.events, {
@@ -358,7 +379,10 @@ export class BottomUpRootNode extends Node {
             const duration = actualEndTime - Math.max(currentStartTime, startTime);
             selfTimeStack[selfTimeStack.length - 1] -= duration;
             selfTimeStack.push(duration);
-            const id = generateEventID(e);
+            let id = generateEventID(e);
+            if (forceGroupIdCallback && eventGroupIdCallback) {
+                id = `${id}-${eventGroupIdCallback(e)}`;
+            }
             const noNodeOnStack = !totalTimeById.has(id);
             if (noNodeOnStack) {
                 totalTimeById.set(id, duration);
@@ -366,7 +390,10 @@ export class BottomUpRootNode extends Node {
             firstNodeStack.push(noNodeOnStack);
         }
         function onEndEvent(event) {
-            const id = generateEventID(event);
+            let id = generateEventID(event);
+            if (forceGroupIdCallback && eventGroupIdCallback) {
+                id = `${id}-${eventGroupIdCallback(event)}`;
+            }
             let node = nodeById.get(id);
             if (!node) {
                 node = new BottomUpNode(root, id, event, false, root);
@@ -394,7 +421,7 @@ export class BottomUpRootNode extends Node {
         return nodeById;
     }
     grouppedTopNodes() {
-        const flatNodes = this.ungrouppedTopNodes();
+        const flatNodes = this.ungroupedTopNodes();
         if (!this.eventGroupIdCallback) {
             return flatNodes;
         }
@@ -544,6 +571,7 @@ export function eventStackFrame(event) {
     }
     return { ...topFrame, scriptId: String(topFrame.scriptId) };
 }
+// TODO(paulirish): rename to generateNodeId
 export function generateEventID(event) {
     if (Types.Events.isProfileCall(event)) {
         const name = SamplesIntegrator.isNativeRuntimeFrame(event.callFrame) ?