diff --git a/TELEMETRY.md b/TELEMETRY.md index bd7090d5fad..723957e69c1 100644 --- a/TELEMETRY.md +++ b/TELEMETRY.md @@ -952,9 +952,9 @@ No properties for event traceCellMessage(cell, `kernel.executeCell, ${getDisplayPath(cell.notebook.uri)}`); initializeInteractiveOrNotebookTelemetryBasedOnUserAction(this.resourceUri, this.kernelConnectionMetadata); sendKernelTelemetryEvent(this.resourceUri, Telemetry.ExecuteCell); + this.sendKernelStartedTelemetry(); const stopWatch = new StopWatch(); const sessionPromise = this.startJupyterSession(); - const promise = this.kernelExecution.executeCell(sessionPromise, cell, codeOverride); ``` @@ -2007,12 +2007,12 @@ No description provided [src/kernels/kernel.ts](https://github.com/microsoft/vscode-jupyter/tree/main/src/kernels/kernel.ts) ```typescript - await this.executeSilently(session, startupCode, { - traceErrors: true, - traceErrorsMessage: 'Error executing jupyter extension internal startup code', - telemetryName: Telemetry.KernelStartupCodeFailure - }); - + await this.executeSilently(session, startupCode, { + traceErrors: true, + traceErrorsMessage: 'Error executing jupyter extension internal startup code', + telemetryName: Telemetry.KernelStartupCodeFailure + }); + if (this.kernelConnectionMetadata.kind !== 'connectToLiveRemoteKernel') { // Run user specified startup commands ``` diff --git a/news/3 Code Health/11190.md b/news/3 Code Health/11190.md new file mode 100644 index 00000000000..debd190291a --- /dev/null +++ b/news/3 Code Health/11190.md @@ -0,0 +1 @@ +Fix the test "Export a basic notebook document with nbconvert" CI failure. \ No newline at end of file diff --git a/src/test/datascience/notebook/helper.ts b/src/test/datascience/notebook/helper.ts index f62f67933cd..f38a6fc7448 100644 --- a/src/test/datascience/notebook/helper.ts +++ b/src/test/datascience/notebook/helper.ts @@ -232,7 +232,7 @@ export async function createTemporaryNotebookFromFile( export async function createTemporaryNotebook( cells: (nbformat.ICodeCell | nbformat.IMarkdownCell | nbformat.IRawCell | nbformat.IUnrecognizedCell)[], disposables: IDisposable[], - kernelName: string = 'Python 3', + kernelSpec: nbformat.IKernelspecMetadata = { display_name: 'Python 3', name: 'python3' }, rootFolder?: Uri, prefix?: string ): Promise { @@ -251,13 +251,11 @@ export async function createTemporaryNotebook( const data: nbformat.INotebookContent = { cells, metadata: { - orig_nbformat: 4 + orig_nbformat: 4, + kernelspec: kernelSpec }, nbformat: 4, - nbformat_minor: 2, - kernel: { - display_name: kernelName - } + nbformat_minor: 2 }; return createTemporaryNotebookFromNotebook(data, disposables, rootFolder, prefix); } @@ -280,7 +278,7 @@ export async function createEmptyPythonNotebook( const serverConnectionType = serviceContainer.get(IServerConnectionType); // Don't use same file (due to dirty handling, we might save in dirty.) // Coz we won't save to file, hence extension will backup in dirty file and when u re-open it will open from dirty. - const nbFile = await createTemporaryNotebook([], disposables, 'Python 3', rootFolder, 'emptyPython'); + const nbFile = await createTemporaryNotebook([], disposables, undefined, rootFolder, 'emptyPython'); // Open a python notebook and use this for all tests in this test suite. await openAndShowNotebook(nbFile); assert.isOk(vscodeNotebook.activeNotebookEditor, 'No active notebook');