Skip to content
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

Jump to bottom

Report cancellation errors in telemetry #167799

Merged
merged 1 commit into from Dec 1, 2022
Merged

Report cancellation errors in telemetry #167799

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/vs/workbench/contrib/editSessions/browser/editSessions.contribution.ts
View file
Open in desktop
Expand Up @@ -59,6 +59,7 @@ import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/co
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { ILocalizedString } from 'vs/platform/action/common/action';
import { Codicon } from 'vs/base/common/codicons';
import { CancellationError } from 'vs/base/common/errors';

registerSingleton(IEditSessionsLogService, EditSessionsLogService, InstantiationType.Delayed);
registerSingleton(IEditSessionsStorageService, EditSessionsWorkbenchService, InstantiationType.Delayed);
Expand Down Expand Up @@ -139,7 +140,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
}

private async autoResumeEditSession() {
const shouldAutoResumeOnReload = this.configurationService.getValue('workbench.editSessions.autoResume') === 'onReload';
const shouldAutoResumeOnReload = this.configurationService.getValue('workbench.cloudChanges.autoResume') === 'onReload';

if (this.environmentService.editSessionId !== undefined) {
this.logService.info(`Resuming cloud changes, reason: found editSessionId ${this.environmentService.editSessionId} in environment service...`);
Expand Down Expand Up @@ -198,7 +199,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
}

private async autoStoreEditSession() {
if (this.configurationService.getValue('workbench.experimental.editSessions.autoStore') === 'onShutdown') {
if (this.configurationService.getValue('workbench.experimental.cloudChanges.autoStore') === 'onShutdown') {
const cancellationTokenSource = new CancellationTokenSource();
await this.progressService.withProgress({
location: ProgressLocation.Window,
Expand Down Expand Up @@ -529,7 +530,7 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
folderRoot = f;
break;
} else if (match === EditSessionIdentityMatch.Partial &&
this.configurationService.getValue('workbench.experimental.editSessions.partialMatches.enabled') === true
this.configurationService.getValue('workbench.experimental.cloudChanges.partialMatches.enabled') === true
) {
if (!force) {
// Surface partially matching edit session
Expand Down Expand Up @@ -885,7 +886,11 @@ export class EditSessionsContribution extends Disposable implements IWorkbenchCo
this.telemetryService.publicLog2<EvaluateContinueOnDestinationEvent, EvaluateContinueOnDestinationClassification>('continueOn.openDestination.outcome', { selection: command, outcome: 'invalidDestination' });
return undefined;
} catch (ex) {
this.telemetryService.publicLog2<EvaluateContinueOnDestinationEvent, EvaluateContinueOnDestinationClassification>('continueOn.openDestination.outcome', { selection: command, outcome: 'unknownError' });
if (ex instanceof CancellationError) {
this.telemetryService.publicLog2<EvaluateContinueOnDestinationEvent, EvaluateContinueOnDestinationClassification>('continueOn.openDestination.outcome', { selection: command, outcome: 'cancelled' });
} else {
this.telemetryService.publicLog2<EvaluateContinueOnDestinationEvent, EvaluateContinueOnDestinationClassification>('continueOn.openDestination.outcome', { selection: command, outcome: 'unknownError' });
}
return undefined;
}
}
Expand Down