Skip to content

Clean up the extension activation code. #10455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Eric Snow (ericsnowcurrently) merged 18 commits into from
Mar 11, 2020
Merged

Clean up the extension activation code. #10455

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c8cccbf
Mark various timed intervals.
ericsnowcurrently Mar 6, 2020
3deac30
Move sendStartupTelemetry() down to the bottom.
ericsnowcurrently Mar 6, 2020
4c0b6e8
Move startup telemetry code to its own module.
ericsnowcurrently Mar 6, 2020
9578180
Simplify the buildApi() call in activateUnsafe().
ericsnowcurrently Mar 6, 2020
db994ec
Keep the expoerted functions adjacent.
ericsnowcurrently Mar 6, 2020
1253891
Factor out initializeGlobals(), initializeComponents(), and activateC…
ericsnowcurrently Mar 6, 2020
b7f127b
Factor out activateLegacy().
ericsnowcurrently Mar 6, 2020
0f75f63
Add notes about what happens during "initialization".
ericsnowcurrently Mar 6, 2020
c9cbb95
Add a NEWS entry.
ericsnowcurrently Mar 6, 2020
5b3d57d
Factor out sendStartupTelemetryInBackground().
ericsnowcurrently Mar 9, 2020
2d30f10
Factor out extension-init.ts and extension-activation.ts.
ericsnowcurrently Mar 9, 2020
ef6d0b4
Fix the extension API tests.
ericsnowcurrently Mar 9, 2020
b1f8eb9
Log an error instead of ignoring.
ericsnowcurrently Mar 9, 2020
cb2f619
Drop a superfluous comment.
ericsnowcurrently Mar 9, 2020
24ce4ea
Fix module names.
ericsnowcurrently Mar 11, 2020
3f5aad9
Eliminate sendStartupTelemetryInBackground().
ericsnowcurrently Mar 11, 2020
e6f3835
Pass the stopwatch and durations explicitly.
ericsnowcurrently Mar 11, 2020
ecb5766
Make activationDeferred a local variable.
ericsnowcurrently Mar 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Factor out sendStartupTelemetryInBackground().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Mar 9, 2020
commit 5b3d57d44581b1fad9004f95224b94585228e97d
14 changes: 7 additions & 7 deletions src/client/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ import { registerTypes as providersRegisterTypes } from './providers/serviceRegi
import { activateSimplePythonRefactorProvider } from './providers/simpleRefactorProvider';
import { TerminalProvider } from './providers/terminalProvider';
import { ISortImportsEditingProvider } from './providers/types';
import { sendErrorTelemetry, sendStartupTelemetry } from './startupTelemetry';
import { sendErrorTelemetry, sendStartupTelemetryInBackground } from './startupTelemetry';
import { registerTypes as commonRegisterTerminalTypes } from './terminals/serviceRegistry';
import { ICodeExecutionManager, ITerminalAutoActivation } from './terminals/types';
import { TEST_OUTPUT_CHANNEL } from './testing/common/constants';
Expand All @@ -118,7 +118,9 @@ export async function activate(context: ExtensionContext): Promise<IExtensionApi
try {
return await activateUnsafe(context);
} catch (ex) {
handleError(ex);
// We want to completely handle the error
// before notifying VS Code.
await handleError(ex);
throw ex; // re-raise
}
}
Expand Down Expand Up @@ -156,9 +158,7 @@ async function activateUnsafe(context: ExtensionContext): Promise<IExtensionApi>
durations.endActivateTime = stopWatch.elapsedTime;
activationDeferred.resolve();

sendStartupTelemetry(activationPromise, durations, stopWatch, serviceContainer)
// It will run in the background.
.ignoreErrors();
sendStartupTelemetryInBackground(activationPromise, durations, stopWatch, serviceContainer);
Comment thread
kimadeline marked this conversation as resolved.
Resolved

return buildApi(activationPromise, serviceManager, serviceContainer);
}
Expand Down Expand Up @@ -360,12 +360,12 @@ async function initializeServices(
/////////////////////////////
// error handling

function handleError(ex: Error) {
async function handleError(ex: Error) {
notifyUser(
"Extension activation failed, run the 'Developer: Toggle Developer Tools' command for more information."
);
traceError('extension activation failed', ex);
sendErrorTelemetry(ex, durations, activatedServiceContainer).ignoreErrors();
await sendErrorTelemetry(ex, durations, activatedServiceContainer);
}

interface IAppShell {
Expand Down
12 changes: 11 additions & 1 deletion src/client/startupTelemetry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,17 @@ interface IStopWatch {
elapsedTime: number;
}

export async function sendStartupTelemetry(
export function sendStartupTelemetryInBackground(
Comment thread
ericsnowcurrently marked this conversation as resolved.
Resolved
// tslint:disable-next-line:no-any
activatedPromise: Promise<any>,
durations: Record<string, number>,
stopWatch: IStopWatch,
serviceContainer: IServiceContainer
) {
sendStartupTelemetry(activatedPromise, durations, stopWatch, serviceContainer).ignoreErrors();
}

async function sendStartupTelemetry(
// tslint:disable-next-line:no-any
activatedPromise: Promise<any>,
durations: Record<string, number>,
Expand Down