Refactor Jupyter URI storage

src/extension.node.ts

@@ -95,6 +95,7 @@ import { IInterpreterPackages } from './platform/interpreter/types';
 import { homedir, platform, arch, userInfo } from 'os';
 import { getUserHomeDir } from './platform/common/utils/platform.node';
 import { homePath } from './platform/common/platform/fs-paths.node';
+import { removeOldCachedItems } from './platform/common/cache';
 
 durations.codeLoadingTime = stopWatch.elapsedTime;
 
@@ -110,6 +111,7 @@ let activatedServiceContainer: IServiceContainer | undefined;
 export async function activate(context: IExtensionContext): Promise<IExtensionApi> {
     context.subscriptions.push({ dispose: () => (Exiting.isExiting = true) });
     try {
+        removeOldCachedItems(context.globalState).then(noop, noop);
         let api: IExtensionApi;
         let ready: Promise<void>;
         let serviceContainer: IServiceContainer;

src/extension.web.ts

@@ -100,6 +100,7 @@ import { ServiceManager } from './platform/ioc/serviceManager';
 import { OutputChannelLogger } from './platform/logging/outputChannelLogger';
 import { ConsoleLogger } from './platform/logging/consoleLogger';
 import { initializeGlobals as initializeTelemetryGlobals } from './platform/telemetry/telemetry';
+import { removeOldCachedItems } from './platform/common/cache';
 
 durations.codeLoadingTime = stopWatch.elapsedTime;
 
@@ -115,6 +116,7 @@ let activatedServiceContainer: IServiceContainer | undefined;
 export async function activate(context: IExtensionContext): Promise<IExtensionApi> {
     context.subscriptions.push({ dispose: () => (Exiting.isExiting = true) });
     try {
+        removeOldCachedItems(context.globalState).then(noop, noop);
         let api: IExtensionApi;
         let ready: Promise<void>;
         let serviceContainer: IServiceContainer;

src/gdpr.ts

@@ -945,15 +945,6 @@
      "${include}": [
        "${F1}"
 
-     ]
-   }
- */
-//Telemetry.SetJupyterURIToLocal
-/* __GDPR__
-   "DATASCIENCE.SET_JUPYTER_URI_LOCAL" : {
-     "${include}": [
-       "${F1}"
-
      ]
    }
  */

src/kernels/common/commonFinder.ts

@@ -1,29 +1,5 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { Memento } from 'vscode';
-import { noop } from '../../platform/common/utils/misc';
-
 // Two cache keys so we can get local and remote separately
 export const RemoteKernelSpecsCacheKey = 'JUPYTER_REMOTE_KERNELSPECS_V4';
-
-export async function removeOldCachedItems(globalState: Memento): Promise<void> {
-    await Promise.all(
-        [
-            'JUPYTER_LOCAL_KERNELSPECS',
-            'JUPYTER_LOCAL_KERNELSPECS_V1',
-            'JUPYTER_LOCAL_KERNELSPECS_V2',
-            'JUPYTER_LOCAL_KERNELSPECS_V3',
-            'JUPYTER_REMOTE_KERNELSPECS',
-            'JUPYTER_REMOTE_KERNELSPECS_V1',
-            'JUPYTER_REMOTE_KERNELSPECS_V2',
-            'JUPYTER_REMOTE_KERNELSPECS_V3',
-            'JUPYTER_LOCAL_KERNELSPECS_V4',
-            'LOCAL_KERNEL_SPECS_CACHE_KEY_V_2022_10',
-            'LOCAL_KERNEL_PYTHON_AND_RELATED_SPECS_CACHE_KEY_V_2022_10'
-        ]
-            .filter((key) => RemoteKernelSpecsCacheKey !== key) // Exclude latest cache key
-            .filter((key) => globalState.get(key, undefined) !== undefined)
-            .map((key) => globalState.update(key, undefined).then(noop, noop))
-    );
-}

src/kernels/jupyter/connection/jupyterConnection.ts

@@ -41,7 +41,7 @@ export class JupyterConnection implements IExtensionSyncActivationService {
         disposables.push(this);
     }
     public activate() {
-        this.serverUriStorage.onDidChangeConnectionType(
+        this.serverUriStorage.onDidChangeUri(
             () =>
                 // When server URI changes, clear our pending URI timeouts
                 this.clearTimeouts(),

src/kernels/jupyter/connection/jupyterConnection.unit.test.ts

@@ -56,7 +56,7 @@ suite('Jupyter Connection', async () => {
         const serverConnectionChangeEvent = new EventEmitter<void>();
         disposables.push(serverConnectionChangeEvent);
 
-        when(serverUriStorage.onDidChangeConnectionType).thenReturn(serverConnectionChangeEvent.event);
+        when(serverUriStorage.onDidChangeUri).thenReturn(serverConnectionChangeEvent.event);
 
         jupyterConnection.activate();
     });
@@ -65,7 +65,7 @@ suite('Jupyter Connection', async () => {
     });
 
     test('Ensure event handler is added', () => {
-        verify(serverUriStorage.onDidChangeConnectionType).once();
+        verify(serverUriStorage.onDidChangeUri).once();
     });
     test('Validation will result in fetching kernels and kernelspecs', async () => {
         const uri = 'http://localhost:8888/?token=1234';

src/kernels/jupyter/connection/jupyterRemoteCachedKernelValidator.ts

@@ -55,7 +55,7 @@ export class JupyterRemoteCachedKernelValidator implements IJupyterRemoteCachedK
                 return true;
             } else {
                 traceWarning(
-                    `Hiding remote kernel ${kernel.id} as the remote Jupyter Server ${item.uri} is no longer available`
+                    `Hiding remote kernel ${kernel.id} for ${provider.id} as the remote Jupyter Server ${item.serverId} is no longer available`
                 );
                 // 3rd party extensions own these kernels, if these are no longer
                 // available, then just don't display them.