More telemetry related changes (#7635)

* More telemetry related changes

* Misc

src/client/datascience/interactive-common/notebookProvider.ts

@@ -139,7 +139,9 @@ export class NotebookProvider implements INotebookProvider {
               )
             : this.jupyterNotebookProvider.createNotebook(options);
 
-        sendKernelTelemetryWhenDone(resource, Telemetry.NotebookStart, promise);
+        sendKernelTelemetryWhenDone(resource, Telemetry.NotebookStart, promise, undefined, {
+            disableUI: options.disableUI
+        });
 
         this.cacheNotebookPromise(options.identity, promise);
 

src/client/datascience/jupyter/kernels/kernel.ts

@@ -61,6 +61,8 @@ import type { nbformat } from '@jupyterlab/coreutils';
 import { concatMultilineString } from '../../../../datascience-ui/common';
 import { CellHashProviderFactory } from '../../editor-integration/cellHashProviderFactory';
 import { IPythonExecutionFactory } from '../../../common/process/types';
+import { INotebookControllerManager } from '../../notebook/types';
+import { getResourceType } from '../../common';
 
 export class Kernel implements IKernel {
     get connection(): INotebookProviderConnection | undefined {
@@ -125,7 +127,8 @@ export class Kernel implements IKernel {
         outputTracker: CellOutputDisplayIdTracker,
         private readonly workspaceService: IWorkspaceService,
         private readonly cellHashProviderFactory: CellHashProviderFactory,
-        private readonly pythonExecutionFactory: IPythonExecutionFactory
+        private readonly pythonExecutionFactory: IPythonExecutionFactory,
+        notebookControllerManager: INotebookControllerManager
     ) {
         this.kernelExecution = new KernelExecution(
             this,
@@ -138,8 +141,14 @@ export class Kernel implements IKernel {
             outputTracker,
             cellHashProviderFactory
         );
+        const isPreferredKernel =
+            getResourceType(resourceUri) === 'notebook'
+                ? notebookControllerManager.getPreferredNotebookController(this.notebookDocument)?.controller ===
+                  controller
+                : undefined;
         trackKernelResourceInformation(resourceUri, {
-            kernelConnection: kernelConnectionMetadata
+            kernelConnection: kernelConnectionMetadata,
+            isPreferredKernel
         });
     }
     private perceivedJupyterStartupTelemetryCaptured?: boolean;

src/client/datascience/jupyter/kernels/kernelProvider.ts

@@ -16,8 +16,10 @@ import {
     IDisposableRegistry
 } from '../../../common/types';
 import { noop } from '../../../common/utils/misc';
+import { IServiceContainer } from '../../../ioc/types';
 import { CellHashProviderFactory } from '../../editor-integration/cellHashProviderFactory';
 import { InteractiveWindowView } from '../../notebook/constants';
+import { INotebookControllerManager } from '../../notebook/types';
 import {
     IDataScienceErrorHandler,
     IJupyterServerUriStorage,
@@ -58,7 +60,8 @@ export class KernelProvider implements IKernelProvider {
         @inject(IWorkspaceService) private readonly workspaceService: IWorkspaceService,
         @inject(CellHashProviderFactory) private cellHashProviderFactory: CellHashProviderFactory,
         @inject(IVSCodeNotebook) private readonly notebook: IVSCodeNotebook,
-        @inject(IPythonExecutionFactory) private readonly pythonExecutionFactory: IPythonExecutionFactory
+        @inject(IPythonExecutionFactory) private readonly pythonExecutionFactory: IPythonExecutionFactory,
+        @inject(IServiceContainer) private readonly serviceContainer: IServiceContainer
     ) {
         this.asyncDisposables.push(this);
     }
@@ -107,7 +110,8 @@ export class KernelProvider implements IKernelProvider {
             this.outputTracker,
             this.workspaceService,
             this.cellHashProviderFactory,
-            this.pythonExecutionFactory
+            this.pythonExecutionFactory,
+            this.serviceContainer.get<INotebookControllerManager>(INotebookControllerManager)
         );
         kernel.onRestarted(() => this._onDidRestartKernel.fire(kernel), this, this.disposables);
         kernel.onDisposed(() => this._onDidDisposeKernel.fire(kernel), this, this.disposables);

src/client/datascience/telemetry/telemetry.ts

@@ -27,6 +27,12 @@ import { getNormalizedInterpreterPath } from '../../pythonEnvironments/info/inte
  * This information is sent with each telemetry event.
  */
 type ContextualTelemetryProps = {
+    /**
+     * Whether we're starting the preferred kernel or not.
+     * If false, then the user chose a different kernel when starting the notebook.
+     * Doesn't really apply to Interactive Window, as we always pick the current interpreter.
+     */
+    isPreferredKernel?: boolean;
     kernelConnection: KernelConnectionMetadata;
     startFailed: boolean;
     kernelDied: boolean;

src/client/datascience/telemetry/types.ts

@@ -6,6 +6,11 @@ import { KernelConnectionMetadata } from '../jupyter/kernels/types';
 
 export type ResourceSpecificTelemetryProperties = Partial<{
     resourceType: 'notebook' | 'interactive';
+    /**
+     * Whether the notebook startup UI (progress indicator & the like) was displayed to the user or not.
+     * If its not displayed, then its considered an auto start (start in the background, like pre-warming kernel)
+     */
+    disableUI?: boolean;
     /**
      * Hash of the resource (notebook.uri or pythonfile.uri associated with this).
      * If we run the same notebook tomorrow, the hash will be the same.