[RPP] Extract sample trace id from event payload

After https://chromium-review.googlesource.com/c/chromium/src/+/6288548
some events contain a sampleTraceId in their payload (under event.args,
event.args.data or event.args.beginData). This CL does the frontend
version of this change, to ensure the data is extracted for these events
and used by the SamplesIntegrator to more accurately build a JS
flamechart with this information.

Bug: 396355813
Change-Id: I14241d01899b50bb9d05bcfb6c1123ad9a2d5fcf
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6298064
Auto-Submit: Andres Olivares <[email protected]>
Commit-Queue: Nancy Li <[email protected]>
Reviewed-by: Nancy Li <[email protected]>

Author: and-oli

front_end/models/trace/helpers/Trace.ts

@@ -695,11 +695,12 @@ export function eventContainsTimestamp(event: Types.Events.Event, ts: Types.Timi
 }
 
 export function extractSampleTraceId(event: Types.Events.Event): number|null {
-  if (Types.Events.isConsoleRunTask(event) || Types.Events.isConsoleTimeStamp(event)) {
-    return event.args?.data?.sampleTraceId || null;
+  if (!event.args) {
+    return null;
   }
-  if (Types.Events.isUserTimingMeasure(event)) {
-    return event.args.sampleTraceId;
+  if ('beginData' in event.args) {
+    const beginData = event.args['beginData'] as {sampleTraceId?: number};
+    return beginData.sampleTraceId ?? null;
   }
-  return null;
+  return event.args?.sampleTraceId ?? event.args?.data?.sampleTraceId ?? null;
 }

front_end/models/trace/types/TraceEvents.ts

@@ -87,11 +87,13 @@ export interface Event {
 
 export interface Args {
   data?: ArgsData;
+  sampleTraceId?: number;
   stackTrace?: CallFrame[];
 }
 
 export interface ArgsData {
   stackTrace?: CallFrame[];
+  sampleTraceId?: number;
   url?: string;
   navigationId?: string;
   frame?: string;
@@ -247,9 +249,7 @@ export interface ParseHTML extends Complete {
   name: 'ParseHTML';
   args: Args&{
     beginData: {
-      frame: string,
-      startLine: number,
-      url: string,
+      sampleTraceId?: number, frame: string, startLine: number, url: string,
     },
     endData?: {
       endLine: number,
@@ -1885,7 +1885,7 @@ export interface UpdateLayoutTree extends Complete {
   args: Args&{
     elementCount: number,
     beginData?: {
-      frame: string,
+      sampleTraceId?: number, frame: string,
       stackTrace?: CallFrame[],
     },
   };
@@ -1898,10 +1898,7 @@ export interface Layout extends Complete {
   name: Name.LAYOUT;
   args: Args&{
     beginData: {
-      frame: string,
-      dirtyObjects: number,
-      partialLayout: boolean,
-      totalObjects: number,
+      sampleTraceId?: number, frame: string, dirtyObjects: number, partialLayout: boolean, totalObjects: number,
     },
     // endData is not reliably populated.
     // Why? TBD. https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/core/frame/local_frame_view.cc;l=847-851;drc=8b6aaad8027390ce6b32d82d57328e93f34bb8e5