Finished up changes to perf tracking for jql fetching.

Author: Migelangel04

src/views/jira/treeViews/jiraAssignedWorkItemsViewProvider.ts

@@ -27,6 +27,7 @@ import { executeJqlQuery, JiraIssueNode, loginToJiraMessageNode, TreeViewIssue }
 
 const AssignedWorkItemsViewProviderId = AssignedJiraItemsViewId;
 const RefreshCumulativeJqlFetchEventName = 'ui.jira.jqlFetch.update.lcp';
+const InitialCumulativeJqlFetchEventName = 'ui.jira.jqlFetch.render.lcp';
 
 export class AssignedWorkItemsViewProvider extends Disposable implements TreeDataProvider<TreeItem> {
     private static readonly _treeItemConfigureJiraMessage = loginToJiraMessageNode;
@@ -60,7 +61,15 @@ export class AssignedWorkItemsViewProvider extends Disposable implements TreeDat
 
         const jqlEntries = Container.jqlManager.getAllDefaultJQLEntries();
         if (jqlEntries.length) {
-            this._initPromises = new PromiseRacer(jqlEntries.map((entry) => executeJqlQuery(entry, true)));
+            timer.mark(InitialCumulativeJqlFetchEventName);
+            const promises = jqlEntries.map(executeJqlQuery);
+            this._initPromises = new PromiseRacer(promises);
+            Promise.all(promises).then(() => {
+                const jqlInitialDuration = timer.measureAndClear(InitialCumulativeJqlFetchEventName);
+                performanceEvent(InitialCumulativeJqlFetchEventName, jqlInitialDuration).then((event) => {
+                    Container.analyticsClient.sendTrackEvent(event);
+                });
+            });
         }
 
         Container.context.subscriptions.push(configuration.onDidChange(this.onConfigurationChanged, this));
@@ -153,13 +162,12 @@ export class AssignedWorkItemsViewProvider extends Disposable implements TreeDat
         }
         // this branch triggers when refresing an already rendered panel
         else {
+            timer.mark(RefreshCumulativeJqlFetchEventName);
             const jqlEntries = Container.jqlManager.getAllDefaultJQLEntries();
             if (!jqlEntries.length) {
                 return [AssignedWorkItemsViewProvider._treeItemConfigureJiraMessage];
             }
-            timer.mark(RefreshCumulativeJqlFetchEventName);
             const allIssues = (await Promise.all(jqlEntries.map((entry) => executeJqlQuery(entry)))).flat();
-            const jqlRefreshDuration = timer.measureAndClear(RefreshCumulativeJqlFetchEventName);
 
             if (this._skipNotificationForNextFetch) {
                 this._skipNotificationForNextFetch = false;
@@ -169,6 +177,7 @@ export class AssignedWorkItemsViewProvider extends Disposable implements TreeDat
             }
 
             SearchJiraHelper.setIssues(allIssues, AssignedWorkItemsViewProviderId);
+            const jqlRefreshDuration = timer.measureAndClear(RefreshCumulativeJqlFetchEventName);
             performanceEvent(RefreshCumulativeJqlFetchEventName, jqlRefreshDuration).then((event) => {
                 Container.analyticsClient.sendTrackEvent(event);
             });

src/views/jira/treeViews/utils.ts

@@ -1,6 +1,4 @@
 import { isMinimalIssue, MinimalIssue } from '@atlassianlabs/jira-pi-common-models';
-import { performanceEvent } from 'src/analytics';
-import timer from 'src/util/perf';
 import { Command, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode';
 
 import { DetailedSiteInfo, ProductJira } from '../../../atlclients/authInfo';
@@ -11,8 +9,6 @@ import { issuesForJQL } from '../../../jira/issuesForJql';
 import { Logger } from '../../../logger';
 import { AbstractBaseNode } from '../../../views/nodes/abstractBaseNode';
 
-const InitialCumulativeJqlFetchEventName = 'ui.jira.jqlFetch.render.lcp';
-
 export function createLabelItem(label: string, command?: Command): TreeItem {
     const item = new TreeItem(label);
     item.resourceUri = Uri.parse(label);
@@ -26,28 +22,17 @@ export interface TreeViewIssue extends MinimalIssue<DetailedSiteInfo> {
 }
 
 /** This function returns a Promise that never rejects. */
-export async function executeJqlQuery(jqlEntry: JQLEntry, isInitialLoad: boolean = false): Promise<TreeViewIssue[]> {
+export async function executeJqlQuery(jqlEntry: JQLEntry): Promise<TreeViewIssue[]> {
     try {
         if (jqlEntry) {
             const jqlSite = Container.siteManager.getSiteForId(ProductJira, jqlEntry.siteId);
             if (jqlSite) {
-                if (isInitialLoad) {
-                    timer.mark(`${InitialCumulativeJqlFetchEventName}_${jqlSite.id}`);
-                }
                 const issues = (await issuesForJQL(jqlEntry.query, jqlSite)) as TreeViewIssue[];
 
                 issues.forEach((i) => {
                     i.source = jqlEntry;
                     i.children = [];
                 });
-                if (isInitialLoad) {
-                    const jqlInitialDuration = timer.measureAndClear(
-                        `${InitialCumulativeJqlFetchEventName}_${jqlSite.id}`,
-                    );
-                    performanceEvent(InitialCumulativeJqlFetchEventName, jqlInitialDuration).then((event) => {
-                        Container.analyticsClient.sendTrackEvent(event);
-                    });
-                }
                 return issues;
             }
         }