Refactor: Get Trace/Experiment Managers Every Use

There were issues with stored managers needing to be updated when the
TspClient Url is updated. It's much simpler to fetch managers every use
to ensure that they are updated.

Signed-off-by: Will Yang <william.yang@ericsson.com>

Author: williamsyang-work

vscode-trace-extension/src/extension.ts

@@ -12,8 +12,7 @@ import {
     resetZoomHandler,
     undoRedoHandler,
     zoomHandler,
-    keyboardShortcutsHandler,
-    reInitializeTraceManager
+    keyboardShortcutsHandler
 } from './trace-explorer/trace-tree';
 import { TraceServerConnectionStatusService } from './utils/trace-server-status';
 import { getTspClientUrl, updateTspClientUrl, isUp } from './utils/backend-tsp-client-provider';
@@ -97,7 +96,6 @@ export function activate(context: vscode.ExtensionContext): ExternalAPI {
                 myAnalysisProvider.updateTraceServerUrl(newTspClientURL);
                 propertiesProvider.updateTraceServerUrl(newTspClientURL);
                 timeRangeDataProvider.updateTraceServerUrl(newTspClientURL);
-                reInitializeTraceManager();
 
                 // Signal the change to all trace panels
                 TraceViewerPanel.updateTraceServerUrl(newTspClientURL);

vscode-trace-extension/src/trace-explorer/trace-tree.ts

@@ -2,24 +2,14 @@ import * as vscode from 'vscode';
 import * as fs from 'fs';
 import * as path from 'path';
 import { Trace as TspTrace } from 'tsp-typescript-client/lib/models/trace';
-import { TraceManager } from 'traceviewer-base/lib/trace-manager';
-import { ExperimentManager } from 'traceviewer-base/lib/experiment-manager';
 import { AnalysisProvider } from './analysis-tree';
 import { TraceViewerPanel } from '../trace-viewer-panel/trace-viewer-webview-panel';
-import { getTspClient } from '../utils/backend-tsp-client-provider';
+import { getExperimentManager, getTraceManager } from '../utils/backend-tsp-client-provider';
 import { traceLogger } from '../extension';
 import { KeyboardShortcutsPanel } from '../trace-viewer-panel/keyboard-shortcuts-panel';
 
 const rootPath = path.resolve(__dirname, '../../..');
 
-let traceManager = new TraceManager(getTspClient());
-let experimentManager = new ExperimentManager(getTspClient(), traceManager);
-
-export const reInitializeTraceManager = (): void => {
-    traceManager = new TraceManager(getTspClient());
-    experimentManager = new ExperimentManager(getTspClient(), traceManager);
-};
-
 // eslint-disable-next-line no-shadow
 export enum ProgressMessages {
     COMPLETE = 'Complete',
@@ -96,6 +86,7 @@ export const traceHandler =
     (analysisTree: AnalysisProvider) =>
     (context: vscode.ExtensionContext, trace: Trace): void => {
         const panel = TraceViewerPanel.createOrShow(context.extensionUri, trace.name, undefined);
+        const { traceManager, experimentManager } = getManagers();
         (async () => {
             const traces = new Array<TspTrace>();
             const t = await traceManager.openTrace(trace.uri, trace.name);
@@ -152,6 +143,7 @@ export const fileHandler =
     (analysisTree: AnalysisProvider) =>
     async (context: vscode.ExtensionContext, traceUri: vscode.Uri): Promise<void> => {
         const resolvedTraceURI: vscode.Uri = traceUri;
+        const { traceManager, experimentManager } = getManagers();
         vscode.window.withProgress(
             {
                 location: vscode.ProgressLocation.Notification,
@@ -264,6 +256,7 @@ const rollbackTraces = async (
         increment: number | undefined;
     }>
 ) => {
+    const { traceManager } = getManagers();
     progress.report({ message: ProgressMessages.ROLLING_BACK_TRACES, increment: progressIncrement });
     for (let i = 0; i < traces.length; i++) {
         await traceManager.deleteTrace(traces[i].UUID);
@@ -314,3 +307,10 @@ function getProgressBarTitle(traceUri: vscode.Uri | undefined): string {
     }
     return path.basename(traceUri.fsPath);
 }
+
+function getManagers() {
+    return {
+        traceManager: getTraceManager(),
+        experimentManager: getExperimentManager()
+    };
+}

vscode-trace-webviews/src/trace-explorer/opened-traces/vscode-trace-explorer-opened-traces-widget.tsx

@@ -10,7 +10,6 @@ import { signalManager, Signals } from 'traceviewer-base/lib/signals/signal-mana
 import '../../style/trace-viewer.css';
 import 'traceviewer-react-components/style/trace-explorer.css';
 import '../../style/react-contextify.css';
-import { ExperimentManager } from 'traceviewer-base/lib/experiment-manager';
 import { convertSignalExperiment } from 'vscode-trace-common/lib/signals/vscode-signal-converter';
 import JSONBigConfig from 'json-bigint';
 import { OpenedTracesUpdatedSignalPayload } from 'traceviewer-base/lib/signals/opened-traces-updated-signal-payload';
@@ -30,7 +29,7 @@ const MENU_ID = 'traceExplorer.openedTraces.menuId';
 
 class TraceExplorerOpenedTraces extends React.Component<{}, OpenedTracesAppState> {
     private _signalHandler: VsCodeMessageManager;
-    private _experimentManager: ExperimentManager;
+
     private _urlProvider: TraceServerUrlProvider;
 
     static ID = 'trace-explorer-opened-traces-widget';
@@ -44,7 +43,8 @@ class TraceExplorerOpenedTraces extends React.Component<{}, OpenedTracesAppState
     private loading = false;
 
     private doHandleRemoveTraceSignal(traceUUID: string) {
-        this._experimentManager
+        this.state.tspClientProvider
+            ?.getExperimentManager()
             .getExperiment(traceUUID)
             .then(experimentOpen => {
                 if (experimentOpen) {
@@ -73,13 +73,6 @@ class TraceExplorerOpenedTraces extends React.Component<{}, OpenedTracesAppState
                         this._signalHandler,
                         this._urlProvider
                     );
-                    this._experimentManager = tspClientProvider.getExperimentManager();
-
-                    tspClientProvider.addTspClientChangeListener(() => {
-                        if (this.state.tspClientProvider) {
-                            this._experimentManager = this.state.tspClientProvider.getExperimentManager();
-                        }
-                    });
 
                     this.setState({ tspClientProvider: tspClientProvider });
                     break;
@@ -223,9 +216,9 @@ class TraceExplorerOpenedTraces extends React.Component<{}, OpenedTracesAppState
                 return;
             case 'remove-id':
                 this._signalHandler.deleteTrace(args.props.experiment as Experiment);
-                if (this._experimentManager) {
-                    this._experimentManager.deleteExperiment((args.props.experiment as Experiment).UUID);
-                }
+                this.state.tspClientProvider
+                    ?.getExperimentManager()
+                    .deleteExperiment((args.props.experiment as Experiment).UUID);
 
                 return;
             default: