Merge pull request #454 from lukecotter/feat-parser-duration-rollups

feat: parser duration rollups

Author: lcottercertinia

lana/src/Context.ts

@@ -3,7 +3,7 @@
  */
 import { type ExtensionContext, workspace } from 'vscode';
 
-import ShowAnalysisCodeLens from './codelenses/ShowAnalysisCodeLens.js';
+import { ShowAnalysisCodeLens } from './codelenses/ShowAnalysisCodeLens.js';
 import { RetrieveLogFile } from './commands/RetrieveLogFile.js';
 import { ShowLogAnalysis } from './commands/ShowLogAnalysis.js';
 import { Display } from './display/Display.js';

lana/src/codelenses/ShowAnalysisCodeLens.ts

@@ -39,4 +39,4 @@ class ShowAnalysisCodeLens implements CodeLensProvider {
   }
 }
 
-export default ShowAnalysisCodeLens;
+export { ShowAnalysisCodeLens };

log-viewer/modules/__tests__/ApexLogParser.test.ts

@@ -90,22 +90,22 @@ describe('Pseudo EXIT events', () => {
 
     const log1 = parse(logData);
     expect(log1.children.length).toEqual(4);
-    expect(log1.duration).toEqual(3);
+    expect(log1.duration).toEqual({ self: 0, total: 3 });
 
     const approval1 = log1.children[0] as Method;
-    expect(approval1.duration).toEqual(1);
+    expect(approval1.duration).toEqual({ self: 1, total: 1 });
     expect(approval1.type).toEqual('WF_APPROVAL_SUBMIT');
 
     const processFound1 = log1.children[1] as Method;
-    expect(processFound1.duration).toEqual(1);
+    expect(processFound1.duration).toEqual({ self: 1, total: 1 });
     expect(processFound1.type).toEqual('WF_PROCESS_FOUND');
 
     const approval2 = log1.children[2] as Method;
-    expect(approval2.duration).toEqual(1);
+    expect(approval2.duration).toEqual({ self: 1, total: 1 });
     expect(approval2.type).toEqual('WF_APPROVAL_SUBMIT');
 
     const processFound2 = log1.children[3] as Method;
-    expect(processFound2.duration).toEqual(0); // no lines after the last WF_PROCESS_FOUND to use as an exit
+    expect(processFound2.duration).toEqual({ self: 0, total: 0 }); // no lines after the last WF_PROCESS_FOUND to use as an exit
     expect(processFound2.type).toEqual('WF_PROCESS_FOUND');
   });
 
@@ -121,7 +121,7 @@ describe('Pseudo EXIT events', () => {
 
     const log1 = parse(logData);
     expect(log1.children.length).toEqual(1);
-    expect(log1.duration).toEqual(6);
+    expect(log1.duration).toEqual({ self: 0, total: 6 });
 
     const children = (log1.children[0] as Method).children;
     expect(children.length).toEqual(4);
@@ -153,7 +153,7 @@ describe('Pseudo EXIT events', () => {
 
     const log1 = parse(logData);
     expect(log1.children.length).toEqual(1);
-    expect(log1.duration).toEqual(4);
+    expect(log1.duration).toEqual({ self: 0, total: 4 });
 
     const children = (log1.children[0] as Method).children;
     expect(children.length).toEqual(3);
@@ -426,8 +426,8 @@ describe('parseLog tests', () => {
     const soqlLine = execEvent.children[0] as SOQLExecuteBeginLine;
     expect(soqlLine.type).toEqual('SOQL_EXECUTE_BEGIN');
     expect(soqlLine.aggregations).toEqual(2);
-    expect(soqlLine.selfRowCount).toEqual(50);
-    expect(soqlLine.totalRowCount).toEqual(50);
+    expect(soqlLine.rowCount.self).toEqual(50);
+    expect(soqlLine.rowCount.total).toEqual(50);
 
     const soqlExplain = soqlLine.children[0] as SOQLExecuteExplainLine;
     expect(soqlExplain.type).toEqual('SOQL_EXECUTE_EXPLAIN');
@@ -474,7 +474,7 @@ describe('getRootMethod tests', () => {
     expect(interViewsBegin.children.length).toBe(1);
     const interViewBegin = interViewsBegin.children[0];
     expect(interViewBegin?.type).toBe('FLOW_START_INTERVIEW_BEGIN');
-    expect(interViewBegin?.duration).toBe(6332706);
+    expect(interViewBegin?.duration).toEqual({ self: 6332706, total: 6332706 });
   });
 
   it('FlowStartInterviewsBeginLine should be a flow ', async () => {
@@ -509,7 +509,7 @@ describe('getRootMethod tests', () => {
     expect(interViewsBegin.children.length).toBe(1);
     const interViewBegin = interViewsBegin.children[0];
     expect(interViewBegin?.type).toBe('FLOW_START_INTERVIEW_BEGIN');
-    expect(interViewBegin?.duration).toBe(6332706);
+    expect(interViewBegin?.duration).toEqual({ self: 6332706, total: 6332706 });
   });
 
   it('FlowStartInterviewsBeginLine should be a flow called from a process builder', async () => {
@@ -554,12 +554,12 @@ describe('getRootMethod tests', () => {
     expect(interViewsBegin.type).toBe('FLOW_START_INTERVIEWS_BEGIN');
     expect(interViewsBegin.text).toBe('FLOW_START_INTERVIEWS : Example Flow');
     expect(interViewsBegin.suffix).toBe(' (Flow)');
-    expect(interViewsBegin.duration).toBe(3);
+    expect(interViewsBegin.duration).toEqual({ self: 2, total: 3 });
 
     expect(interViewsBegin.children.length).toBe(1);
     const interViewBegin = interViewsBegin.children[0];
     expect(interViewBegin?.type).toBe('FLOW_START_INTERVIEW_BEGIN');
-    expect(interViewBegin?.duration).toBe(1);
+    expect(interViewBegin?.duration).toEqual({ self: 1, total: 1 });
   });
 
   it('Root exitStamp should match last line pair with a duration', async () => {
@@ -691,21 +691,20 @@ describe('Recalculate durations tests', () => {
     node.exitStamp = 3;
 
     node.recalculateDurations();
-    expect(node.duration).toBe(2);
-    expect(node.selfTime).toBe(2);
+    expect(node.duration).toEqual({ self: 2, total: 2 });
   });
+
   it('Children are subtracted from net duration', () => {
     const node = new Method(['14:32:07.563 (0)', 'DUMMY'], [], 'Method', ''),
       child1 = new Method(['14:32:07.563 (10)', 'DUMMY'], [], 'Method', ''),
       child2 = new Method(['14:32:07.563 (70)', 'DUMMY'], [], 'Method', '');
     node.exitStamp = 100;
-    child1.duration = 50;
-    child2.duration = 25;
+    child1.duration.total = 50;
+    child2.duration.total = 25;
     node.addChild(child1);
     node.addChild(child2);
     node.recalculateDurations();
-    expect(node.duration).toBe(100);
-    expect(node.selfTime).toBe(25);
+    expect(node.duration).toEqual({ self: 25, total: 100 });
   });
 });
 

log-viewer/modules/components/AnalysisView.ts

@@ -255,8 +255,8 @@ function addNodeToMap(map: Map<string, Metric>, node: TimedNode, key?: string) {
   const children = node.children;
 
   if (key) {
-    const totalTime = node.duration;
-    const selfTime = node.selfTime;
+    const totalTime = node.duration.total;
+    const selfTime = node.duration.self;
     let metric = map.get(key);
     if (!metric) {
       metric = new Metric(key, node);

log-viewer/modules/components/LogViewer.ts

@@ -81,7 +81,7 @@ export class LogViewer extends LitElement {
 
     this.logSize = apexLog.size;
     this.timelineRoot = apexLog;
-    this.logDuration = apexLog.duration;
+    this.logDuration = apexLog.duration.total;
     document.dispatchEvent(
       new CustomEvent('logsettings', {
         detail: { logSettings: this.timelineRoot?.debugLevels },

log-viewer/modules/components/calltree-view/CalltreeView.ts

@@ -488,13 +488,13 @@ function toCallTree(nodes: LogLine[]): CalltreeRow[] | undefined {
       const data: CalltreeRow = {
         id: node.timestamp,
         text: node.text,
-        duration: node.duration,
-        selfTime: node.selfTime,
+        duration: node.duration.total,
+        selfTime: node.duration.self,
         _children: children,
-        totalDmlCount: node.totalDmlCount,
-        totalSoqlCount: node.totalSoqlCount,
+        totalDmlCount: node.dmlCount.total,
+        totalSoqlCount: node.soqlCount.total,
         totalThrownCount: node.totalThrownCount,
-        rows: node.totalRowCount || 0,
+        rows: node.rowCount.total,
         originalData: node,
       };
       results.push(data);
@@ -569,7 +569,7 @@ const showDetailsFilter = (data: CalltreeRow) => {
   return deepFilter(
     data,
     (rowData) => {
-      return rowData.originalData.duration > 0 || rowData.originalData.discontinuity;
+      return rowData.originalData.duration.total > 0 || rowData.originalData.discontinuity;
     },
     {
       filterCache: showDetailsFilterCache,

log-viewer/modules/components/database-view/DatabaseSection.ts

@@ -36,7 +36,7 @@ export class DatabaseSection extends LitElement {
     const totalCount = this.dbLines.length;
     let totalRows = 0;
     this.dbLines.forEach((value) => {
-      totalRows += value.selfRowCount || 0;
+      totalRows += value.rowCount.self || 0;
     });
 
     return html`

log-viewer/modules/components/database-view/DatabaseView.ts

@@ -190,8 +190,8 @@ function renderDMLTable(dmlTableContainer: HTMLElement, dmlLines: DMLBeginLine[]
       dmlText.push(dml.text);
       dmlData.push({
         dml: dml.text,
-        rowCount: dml.selfRowCount,
-        timeTaken: dml.duration,
+        rowCount: dml.rowCount.self,
+        timeTaken: dml.duration.total,
         timestamp: dml.timestamp,
         _children: [{ timestamp: dml.timestamp, isDetail: true }],
       });
@@ -388,8 +388,8 @@ function renderSOQLTable(soqlTableContainer: HTMLElement, soqlLines: SOQLExecute
         isSelective: explainLine?.relativeCost ? explainLine.relativeCost <= 1 : null,
         relativeCost: explainLine?.relativeCost,
         soql: soql.text,
-        rowCount: soql.selfRowCount,
-        timeTaken: soql.duration,
+        rowCount: soql.rowCount.self,
+        timeTaken: soql.duration.total,
         aggregations: soql.aggregations,
         timestamp: soql.timestamp,
         _children: [{ timestamp: soql.timestamp, isDetail: true }],