chrome-devtools-frontend 1.0.1376716 → 1.0.1386602

package/front_end/models/persistence/editFileSystemView.css

@@ -4,20 +4,36 @@
  * found in the LICENSE file.
  */
 
-.file-system-header {
+.excluded-folder-header {
   display: flex;
-  flex-direction: row;
-  align-items: center;
-  flex: auto;
-  margin: 10px 0;
+  flex-direction: column;
+  min-height: var(--sys-size-16);
+  border-bottom: var(--sys-size-1) solid var(--sys-color-divider);
+  padding: var(--sys-size-5) var(--sys-size-6);
+
+  & > .url-header {
+    height: var(--sys-size-9);
+  }
+
+  & > .excluded-folder-url {
+    color: var(--sys-color-on-surface-subtle);
+    overflow-wrap: break-word;
+  }
 }
 
-.file-system-header-text {
-  flex: 1 0 auto;
+.exclude-subfolders-text,
+.file-system-list-empty {
+  padding: 0 var(--sys-size-6);
+  height: var(--sys-size-13);
+}
+
+.exclude-subfolders-text {
+  align-items: center;
+  display: flex;
 }
 
 .add-button {
-  margin-left: 10px;
+  padding: var(--sys-size-4) var(--sys-size-6);
   align-self: flex-start;
 }
 
@@ -26,17 +42,12 @@
 }
 
 .file-system-list-empty {
-  flex: auto;
-  height: 30px;
   display: flex;
   align-items: center;
-  justify-content: center;
-  text-align: center;
 }
 
 .file-system-list-item {
-  padding: 3px 5px;
-  height: 30px;
+  height: var(--sys-size-13);
   display: flex;
   align-items: center;
   flex: auto 1 1;
@@ -46,6 +57,18 @@
   flex: 1 1 0;
 }
 
+.list {
+  border: none;
+}
+
+.list-item {
+  padding: 0 var(--sys-size-6);
+}
+
+.editor-buttons {
+  padding: var(--sys-size-4) var(--sys-size-6);
+}
+
 .list-item .file-system-value {
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -57,7 +80,7 @@
   flex: none;
   display: flex;
   flex-direction: row;
-  margin: 6px 5px;
+  margin: var(--sys-size-4) var(--sys-size-6);
   align-items: center;
 }
 

package/front_end/models/persistence/workspaceSettingsTab.css

@@ -4,106 +4,40 @@
  * found in the LICENSE file.
  */
 
-.workspace-settings-tab header {
-  padding: 0 0 6px;
+.mappings-info,
+.folder-exclude-pattern {
+  height: var(--settings-single-item-height);
 }
 
-.workspace-settings-tab header > h1 {
-  font-size: 18px;
-  font-weight: normal;
-  margin: 0;
-  padding-bottom: 3px;
+.mapping-view-container {
+  padding-left: 0;
+  padding-right: 0;
 }
 
-.workspace-settings-tab .settings-content {
-  overflow-y: auto;
-  overflow-x: hidden;
-  margin: 8px 8px 8px 0;
-  padding: 0 4px;
-  flex: auto;
-}
-
-.workspace-settings-tab .settings-container {
-  width: 100%;
-  column-width: 288px;
-}
-
-.workspace-settings-tab .settings-tab.settings-container {
-  column-width: 308px;
-}
-
-.workspace-settings-tab .settings-container-wrapper {
-  position: absolute;
-  top: 31px;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  overflow: auto;
-  padding-top: 9px;
-}
-
-.workspace-settings-tab .settings-tab.settings-content {
-  margin: 0;
-  padding: 0;
-}
-
-.workspace-settings-tab .settings-tab p {
-  margin: 12px 0;
-}
-
-.workspace-settings-tab p.folder-exclude-pattern {
-  display: grid;
-  align-items: center;
-}
-
-.workspace-settings-tab p.folder-exclude-pattern > input {
-  width: 80%;
-  margin-left: 10px;
-}
-
-.workspace-settings-tab .settings-tab .file-system-container {
-  border-top: 1px solid var(--sys-color-divider);
-  padding: 19px 0 10px;
-  margin: 20px 0;
-}
-
-.workspace-settings-tab .settings-tab .file-system-header {
+.folder-exclude-pattern {
   display: flex;
-  flex-direction: row;
   align-items: center;
-}
 
-.workspace-settings-tab .settings-tab .file-system-name {
-  font-weight: bold;
-  flex: none;
-  margin-right: 10px;
-  font-size: 15px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-width: 70%;
+  & > input {
+    flex: 1;
+  }
 }
 
-.workspace-settings-tab .settings-tab .file-system-path {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  flex: auto;
+label {
+  padding-bottom: 0;
 }
 
-.workspace-settings-tab .settings-info-message {
-  background-color: var(--sys-color-neutral-container);
-  border-radius: 5px;
-  padding: 10px;
-  margin: 20px 0;
+.mappings-info {
+  border: none;
 }
 
-.workspace-settings-tab .settings-tab.settings-content.settings-container {
-  column-width: initial;
-  overflow: hidden;
-  padding-bottom: 1px;
-  padding-right: 10px;
+.add-button-container {
+  max-width: var(--sys-size-35);
+  margin-left: var(--sys-size-8);
+  width: 100%;
 
-  > devtools-button {
-    margin: 0 0 3px 5px;
+  & .add-folder {
+    min-width: var(--sys-size-31);
+    max-width: var(--sys-size-35);
   }
 }

package/front_end/models/timeline_model/timeline_model.ts

@@ -1,14 +1,8 @@
 // Copyright 2019 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 TimelineJSProfile from './TimelineJSProfile.js';
-import * as TimelineModelFilter from './TimelineModelFilter.js';
-import * as TimelineProfileTree from './TimelineProfileTree.js';
 import * as TracingLayerTree from './TracingLayerTree.js';
 
 export {
-  TimelineJSProfile,
-  TimelineModelFilter,
-  TimelineProfileTree,
   TracingLayerTree,
 };

package/front_end/models/trace/Processor.test.ts

@@ -139,6 +139,7 @@ describeWithEnvironment('TraceProcessor', function() {
     const baseHandler = {
       data() {},
       handleEvent() {},
+      async finalize() {},
       reset() {},
     };
 
@@ -262,7 +263,7 @@ describeWithEnvironment('TraceProcessor', function() {
             generateInsight: () => {
               throw new Error('forced error');
             },
-            deps: Trace.Insights.InsightRunners.RenderBlocking.deps,
+            deps: Trace.Insights.Models.RenderBlocking.deps,
           },
         };
       });
@@ -277,8 +278,8 @@ describeWithEnvironment('TraceProcessor', function() {
 
       const insights = Array.from(processor.insights.values());
       assert.strictEqual(insights.length, 2);
-      assert(insights[1].data.RenderBlocking instanceof Error, 'RenderBlocking did not throw an error');
-      assert.strictEqual(insights[1].data.RenderBlocking.message, 'forced error');
+      assert(insights[1].model.RenderBlocking instanceof Error, 'RenderBlocking did not throw an error');
+      assert.strictEqual(insights[1].model.RenderBlocking.message, 'forced error');
     });
 
     it('skips insights that are missing one or more dependencies', async function() {
@@ -298,8 +299,8 @@ describeWithEnvironment('TraceProcessor', function() {
       ]);
 
       const insights = Array.from(processor.insights.values());
-      assert.isUndefined(insights[0].data.RenderBlocking);
-      assert.isUndefined(insights[1].data.RenderBlocking);
+      assert.isUndefined(insights[0].model.RenderBlocking);
+      assert.isUndefined(insights[1].model.RenderBlocking);
     });
 
     it('returns insights for a navigation', async function() {
@@ -317,15 +318,15 @@ describeWithEnvironment('TraceProcessor', function() {
       ]);
 
       const insights = Array.from(processor.insights.values());
-      if (insights[0].data.RenderBlocking instanceof Error) {
+      if (insights[0].model.RenderBlocking instanceof Error) {
         throw new Error('RenderBlocking threw an error');
       }
-      if (insights[1].data.RenderBlocking instanceof Error) {
+      if (insights[1].model.RenderBlocking instanceof Error) {
         throw new Error('RenderBlocking threw an error');
       }
 
-      assert.strictEqual(insights[0].data.RenderBlocking.renderBlockingRequests.length, 0);
-      assert.strictEqual(insights[1].data.RenderBlocking.renderBlockingRequests.length, 2);
+      assert.strictEqual(insights[0].model.RenderBlocking.renderBlockingRequests.length, 0);
+      assert.strictEqual(insights[1].model.RenderBlocking.renderBlockingRequests.length, 2);
     });
 
     it('returns insights for multiple navigations', async function() {
@@ -345,23 +346,23 @@ describeWithEnvironment('TraceProcessor', function() {
       ]);
 
       const insights = Array.from(processor.insights.values());
-      if (insights[0].data.RenderBlocking instanceof Error) {
+      if (insights[0].model.RenderBlocking instanceof Error) {
         throw new Error('RenderBlocking threw an error');
       }
-      if (insights[1].data.RenderBlocking instanceof Error) {
+      if (insights[1].model.RenderBlocking instanceof Error) {
         throw new Error('RenderBlocking threw an error');
       }
-      if (insights[2].data.RenderBlocking instanceof Error) {
+      if (insights[2].model.RenderBlocking instanceof Error) {
         throw new Error('RenderBlocking threw an error');
       }
-      if (insights[3].data.RenderBlocking instanceof Error) {
+      if (insights[3].model.RenderBlocking instanceof Error) {
         throw new Error('RenderBlocking threw an error');
       }
 
-      assert.strictEqual(insights[0].data.RenderBlocking.renderBlockingRequests.length, 0);
-      assert.strictEqual(insights[1].data.RenderBlocking.renderBlockingRequests.length, 0);
-      assert.strictEqual(insights[2].data.RenderBlocking.renderBlockingRequests.length, 0);
-      assert.strictEqual(insights[3].data.RenderBlocking.renderBlockingRequests.length, 1);
+      assert.strictEqual(insights[0].model.RenderBlocking.renderBlockingRequests.length, 0);
+      assert.strictEqual(insights[1].model.RenderBlocking.renderBlockingRequests.length, 0);
+      assert.strictEqual(insights[2].model.RenderBlocking.renderBlockingRequests.length, 0);
+      assert.strictEqual(insights[3].model.RenderBlocking.renderBlockingRequests.length, 1);
     });
   });
 });

package/front_end/models/trace/Processor.ts

@@ -52,6 +52,7 @@ declare global {
 export interface ParseOptions {
   /**
    * If the trace was just recorded on the current page, rather than an imported file.
+   * TODO(paulirish): Maybe remove. This is currently unused by the Processor and Handlers
    * @default false
    */
   isFreshRecording?: boolean;
@@ -75,9 +76,9 @@ export class TraceProcessor extends EventTarget {
     return new TraceProcessor(Handlers.ModelHandlers, Types.Configuration.defaults());
   }
 
-  static getEnabledInsightRunners(parsedTrace: Handlers.Types.ParsedTrace): Partial<Insights.Types.InsightRunnersType> {
-    const enabledInsights = {} as Insights.Types.InsightRunnersType;
-    for (const [name, insight] of Object.entries(Insights.InsightRunners)) {
+  static getEnabledInsightRunners(parsedTrace: Handlers.Types.ParsedTrace): Partial<Insights.Types.InsightModelsType> {
+    const enabledInsights = {} as Insights.Types.InsightModelsType;
+    for (const [name, insight] of Object.entries(Insights.Models)) {
       const deps = insight.deps();
       if (deps.some(dep => !parsedTrace[dep])) {
         continue;
@@ -170,7 +171,7 @@ export class TraceProcessor extends EventTarget {
     }
     try {
       this.#status = Status.PARSING;
-      await this.#computeParsedTrace(traceEvents, Boolean(options.isFreshRecording));
+      await this.#computeParsedTrace(traceEvents);
       if (this.#data && !options.isCPUProfile) {  // We do not calculate insights for CPU Profiles.
         this.#computeInsights(this.#data, traceEvents);
       }
@@ -184,7 +185,7 @@ export class TraceProcessor extends EventTarget {
   /**
    * Run all the handlers and set the result to `#data`.
    */
-  async #computeParsedTrace(traceEvents: readonly Types.Events.Event[], freshRecording: boolean): Promise<void> {
+  async #computeParsedTrace(traceEvents: readonly Types.Events.Event[]): Promise<void> {
     /**
      * We want to yield regularly to maintain responsiveness. If we yield too often, we're wasting idle time.
      * We could do this by checking `performance.now()` regularly, but it's an expensive call in such a hot loop.
@@ -202,11 +203,6 @@ export class TraceProcessor extends EventTarget {
       handler.reset();
     }
 
-    // Initialize.
-    for (const handler of sortedHandlers) {
-      handler.initialize?.(freshRecording);
-    }
-
     // Handle each event.
     for (let i = 0; i < traceEvents.length; ++i) {
       // Every so often we take a break just to render.
@@ -348,8 +344,8 @@ export class TraceProcessor extends EventTarget {
 
   #computeInsightSets(
       insights: Insights.Types.TraceInsightSets, parsedTrace: Handlers.Types.ParsedTrace,
-      insightRunners: Partial<typeof Insights.InsightRunners>, context: Insights.Types.InsightSetContext): void {
-    const data = {} as Insights.Types.InsightSets['data'];
+      insightRunners: Partial<typeof Insights.Models>, context: Insights.Types.InsightSetContext): void {
+    const model = {} as Insights.Types.InsightSet['model'];
 
     for (const [name, insight] of Object.entries(insightRunners)) {
       let insightResult;
@@ -358,7 +354,7 @@ export class TraceProcessor extends EventTarget {
       } catch (err) {
         insightResult = err;
       }
-      Object.assign(data, {[name]: insightResult});
+      Object.assign(model, {[name]: insightResult});
     }
 
     let id, urlString, navigation;
@@ -386,7 +382,7 @@ export class TraceProcessor extends EventTarget {
       navigation,
       frameId: context.frameId,
       bounds: context.bounds,
-      data,
+      model,
     };
     insights.set(insightSets.id, insightSets);
   }

package/front_end/models/trace/README.md

@@ -21,7 +21,6 @@ This folder contains the new trace engine that was first implemented for the Per
 │NetworkRequestHandler│     │...many more handlers │
 │                     │     │                      │
 │     reset()         │     │                      │
-│     initialize()    │     │                      │
 │                     │     │                      │
 │     handleEvent()   │     │                      │
 │                     │     │                      │

package/front_end/models/trace/extras/Metadata.test.ts

@@ -13,11 +13,12 @@ describeWithEnvironment('Trace Metadata', () => {
     sinon.stub(cpuThrottlingManager, 'getHardwareConcurrency').returns(Promise.resolve(1));
     sinon.stub(cpuThrottlingManager, 'cpuThrottlingRate').returns(2);
     const networkManager = SDK.NetworkManager.MultitargetNetworkManager.instance({forceNew: true});
+    sinon.stub(networkManager, 'isThrottling').returns(true);
     sinon.stub(networkManager, 'networkConditions').returns({
       title: 'Slow 3G',
       download: 1,
-      upload: 1,
-      latency: 1,
+      upload: 2,
+      latency: 3,
     });
     const metadata = await Trace.Extras.Metadata.forNewRecording(/* isCpuProfile= */ false);
     assert.deepEqual(metadata, {
@@ -25,7 +26,17 @@ describeWithEnvironment('Trace Metadata', () => {
       startTime: undefined,
       cpuThrottling: 2,
       networkThrottling: 'Slow 3G',
+      networkThrottlingConditions: {
+        download: 1,
+        latency: 3,
+        upload: 2,
+        packetLoss: undefined,
+        packetQueueLength: undefined,
+        packetReordering: undefined,
+        targetLatency: undefined,
+      },
       dataOrigin: Trace.Types.File.DataOrigin.TRACE_EVENTS,
+      emulatedDeviceTitle: undefined,
       hardwareConcurrency: 1,
     });
   });
@@ -36,6 +47,7 @@ describeWithEnvironment('Trace Metadata', () => {
     sinon.stub(cpuThrottlingManager, 'getHardwareConcurrency').returns(Promise.resolve(1));
     sinon.stub(cpuThrottlingManager, 'cpuThrottlingRate').returns(2);
     const networkManager = SDK.NetworkManager.MultitargetNetworkManager.instance({forceNew: true});
+    sinon.stub(networkManager, 'isThrottling').returns(true);
     sinon.stub(networkManager, 'networkConditions').returns({
       title: () => 'Slow 3G',
       download: 1,
@@ -48,6 +60,16 @@ describeWithEnvironment('Trace Metadata', () => {
       startTime: undefined,
       cpuThrottling: 2,
       networkThrottling: 'Slow 3G',
+      networkThrottlingConditions: {
+        download: 1,
+        latency: 1,
+        upload: 1,
+        packetLoss: undefined,
+        packetQueueLength: undefined,
+        packetReordering: undefined,
+        targetLatency: undefined,
+      },
+      emulatedDeviceTitle: undefined,
       dataOrigin: Trace.Types.File.DataOrigin.TRACE_EVENTS,
       hardwareConcurrency: 1,
     });
@@ -59,6 +81,7 @@ describeWithEnvironment('Trace Metadata', () => {
     const getHardwareConcurrencyStub = sinon.stub(cpuThrottlingManager, 'getHardwareConcurrency');
     sinon.stub(cpuThrottlingManager, 'cpuThrottlingRate').returns(2);
     const networkManager = SDK.NetworkManager.MultitargetNetworkManager.instance({forceNew: true});
+    sinon.stub(networkManager, 'isThrottling').returns(true);
     sinon.stub(networkManager, 'networkConditions').returns({
       title: () => 'Slow 3G',
       download: 1,
@@ -71,7 +94,17 @@ describeWithEnvironment('Trace Metadata', () => {
       startTime: undefined,
       cpuThrottling: 2,
       networkThrottling: 'Slow 3G',
+      networkThrottlingConditions: {
+        download: 1,
+        latency: 1,
+        upload: 1,
+        packetLoss: undefined,
+        packetQueueLength: undefined,
+        packetReordering: undefined,
+        targetLatency: undefined,
+      },
       dataOrigin: Trace.Types.File.DataOrigin.TRACE_EVENTS,
+      emulatedDeviceTitle: undefined,
       hardwareConcurrency: undefined,
     });
     assert.strictEqual(getHardwareConcurrencyStub.callCount, 0);

package/front_end/models/trace/extras/Metadata.ts

@@ -5,7 +5,8 @@
 import * as SDK from '../../../core/sdk/sdk.js';
 import * as Types from '../types/types.js';
 
-export async function forNewRecording(isCpuProfile: boolean, recordStartTime?: number): Promise<Types.File.MetaData> {
+export async function forNewRecording(
+    isCpuProfile: boolean, recordStartTime?: number, emulatedDeviceTitle?: string): Promise<Types.File.MetaData> {
   try {
     if (isCpuProfile) {
       // For CPU profile, only specify data origin
@@ -36,15 +37,33 @@ export async function forNewRecording(isCpuProfile: boolean, recordStartTime?: n
     const hardwareConcurrency =
         cpuThrottlingManager.hasPrimaryPageTargetSet() ? await getConcurrencyOrTimeout() : undefined;
     const cpuThrottling = SDK.CPUThrottlingManager.CPUThrottlingManager.instance().cpuThrottlingRate();
-    const networkConditions = SDK.NetworkManager.MultitargetNetworkManager.instance().networkConditions();
-    const networkTitle =
-        typeof networkConditions.title === 'function' ? networkConditions.title() : networkConditions.title;
+    const networkConditions = SDK.NetworkManager.MultitargetNetworkManager.instance().isThrottling() ?
+        SDK.NetworkManager.MultitargetNetworkManager.instance().networkConditions() :
+        undefined;
+
+    let networkThrottlingConditions;
+    let networkTitle;
+    if (networkConditions) {
+      networkThrottlingConditions = {
+        download: networkConditions.download,
+        upload: networkConditions.upload,
+        latency: networkConditions.latency,
+        packetLoss: networkConditions.packetLoss,
+        packetQueueLength: networkConditions.packetQueueLength,
+        packetReordering: networkConditions.packetReordering,
+        targetLatency: networkConditions.targetLatency,
+      };
+      networkTitle =
+          typeof networkConditions.title === 'function' ? networkConditions.title() : networkConditions.title;
+    }
 
     return {
       source: 'DevTools',
       startTime: recordStartTime ? new Date(recordStartTime).toJSON() : undefined,  // ISO-8601 timestamp
-      cpuThrottling,
+      emulatedDeviceTitle,
+      cpuThrottling: cpuThrottling !== 1 ? cpuThrottling : undefined,
       networkThrottling: networkTitle,
+      networkThrottlingConditions,
       hardwareConcurrency,
       dataOrigin: Types.File.DataOrigin.TRACE_EVENTS,
     };

package/front_end/models/{timeline_model → trace/extras}/TimelineJSProfile.ts

@@ -4,19 +4,12 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import * as i18n from '../../core/i18n/i18n.js';
-import type * as Protocol from '../../generated/protocol.js';
-import * as Trace from '../trace/trace.js';
+import type * as Protocol from '../../../generated/protocol.js';
+import * as Types from '../types/types.js';
 
-const UIStrings = {
-  /**
-   *@description Text for the name of a thread of the page
-   *@example {1} PH1
-   */
-  threadS: 'Thread {PH1}',
-};
-const str_ = i18n.i18n.registerUIStrings('models/timeline_model/TimelineJSProfile.ts', UIStrings);
-const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
+// TODO(paulirish): Delete this file.
+//   - Move isNativeRuntimeFrame and nativeGroup to TraceEvents.d.ts (or TraceTree)
+//   - Move createFakeTraceFromCpuProfile to TimelineLoader
 export class TimelineJSProfileProcessor {
   static isNativeRuntimeFrame(frame: Protocol.Runtime.CallFrame): boolean {
     return frame.url === 'native V8Runtime';
@@ -32,14 +25,13 @@ export class TimelineJSProfileProcessor {
     return null;
   }
 
-  static createFakeTraceFromCpuProfile(profile: Protocol.Profiler.Profile, tid: Trace.Types.Events.ThreadID):
-      Trace.Types.Events.Event[] {
-    const events: Trace.Types.Events.Event[] = [];
+  static createFakeTraceFromCpuProfile(profile: Protocol.Profiler.Profile, tid: Types.Events.ThreadID):
+      Types.Events.Event[] {
+    const events: Types.Events.Event[] = [];
 
-    const threadName = i18nString(UIStrings.threadS, {PH1: tid});
-    appendEvent('TracingStartedInPage', {data: {sessionId: '1'}}, 0, 0, Trace.Types.Events.Phase.METADATA);
-    appendEvent(
-        Trace.Types.Events.Name.THREAD_NAME, {name: threadName}, 0, 0, Trace.Types.Events.Phase.METADATA, '__metadata');
+    const threadName = `Thread ${tid}`;
+    appendEvent('TracingStartedInPage', {data: {sessionId: '1'}}, 0, 0, Types.Events.Phase.METADATA);
+    appendEvent(Types.Events.Name.THREAD_NAME, {name: threadName}, 0, 0, Types.Events.Phase.METADATA, '__metadata');
     if (!profile) {
       return events;
     }
@@ -49,28 +41,26 @@ export class TimelineJSProfileProcessor {
     // 'JSRoot' doesn't exist in the new engine and is not the name of an actual trace event, but changing it might break other trace processing tools that rely on this, so we stick with this name.
     // TODO(crbug.com/341234884): consider removing this or clarify why it's required.
     appendEvent(
-        'JSRoot', {}, profile.startTime, profile.endTime - profile.startTime, Trace.Types.Events.Phase.COMPLETE,
-        'toplevel');
+        'JSRoot', {}, profile.startTime, profile.endTime - profile.startTime, Types.Events.Phase.COMPLETE, 'toplevel');
 
     // TODO: create a `Profile` event instead, as `cpuProfile` is legacy
-    appendEvent('CpuProfile', {data: {cpuProfile: profile}}, profile.endTime, 0, Trace.Types.Events.Phase.COMPLETE);
+    appendEvent('CpuProfile', {data: {cpuProfile: profile}}, profile.endTime, 0, Types.Events.Phase.COMPLETE);
     return events;
 
     function appendEvent(
-        name: string, args: any, ts: number, dur?: number, ph?: Trace.Types.Events.Phase,
-        cat?: string): Trace.Types.Events.Event {
-      const event: Trace.Types.Events.Event = {
+        name: string, args: any, ts: number, dur?: number, ph?: Types.Events.Phase, cat?: string): Types.Events.Event {
+      const event: Types.Events.Event = {
         cat: cat || 'disabled-by-default-devtools.timeline',
         name,
-        ph: ph || Trace.Types.Events.Phase.COMPLETE,
-        pid: Trace.Types.Events.ProcessID(1),
+        ph: ph || Types.Events.Phase.COMPLETE,
+        pid: Types.Events.ProcessID(1),
         tid,
-        ts: Trace.Types.Timing.MicroSeconds(ts),
+        ts: Types.Timing.MicroSeconds(ts),
         args,
       };
 
       if (dur) {
-        event.dur = Trace.Types.Timing.MicroSeconds(dur);
+        event.dur = Types.Timing.MicroSeconds(dur);
       }
       events.push(event);
       return event;