Skip to content

Commit 4cc5882

Browse files
committed
Don't sanitized some telemetry events
1 parent 047f9f2 commit 4cc5882

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/authentication.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ export default class GitpodAuthenticationProvider extends Disposable implements
186186
// For the Gitpod scope list, order doesn't matter so we immediately sort the scopes
187187
const sortedScopes = scopes.sort();
188188

189-
this._telemetry.sendTelemetryEvent('gitpod_desktop_auth', {
189+
this._telemetry.sendRawTelemetryEvent('gitpod_desktop_auth', {
190190
kind: 'login',
191191
scopes: JSON.stringify(sortedScopes),
192192
});
@@ -208,17 +208,17 @@ export default class GitpodAuthenticationProvider extends Disposable implements
208208

209209
this._logger.info('Login success!');
210210

211-
this._telemetry.sendTelemetryEvent('gitpod_desktop_auth', { kind: 'login_successful' });
211+
this._telemetry.sendRawTelemetryEvent('gitpod_desktop_auth', { kind: 'login_successful' });
212212

213213
return session;
214214
} catch (e) {
215215
// If login was cancelled, do not notify user.
216216
if (e === 'Cancelled' || e.message === 'Cancelled') {
217-
this._telemetry.sendTelemetryEvent('gitpod_desktop_auth', { kind: 'login_cancelled' });
217+
this._telemetry.sendRawTelemetryEvent('gitpod_desktop_auth', { kind: 'login_cancelled' });
218218
throw e;
219219
}
220220

221-
this._telemetry.sendTelemetryEvent('gitpod_desktop_auth', { kind: 'login_failed' });
221+
this._telemetry.sendRawTelemetryEvent('gitpod_desktop_auth', { kind: 'login_failed' });
222222

223223
vscode.window.showErrorMessage(`Sign in failed: ${e}`);
224224
this._logger.error(e);
@@ -238,7 +238,7 @@ export default class GitpodAuthenticationProvider extends Disposable implements
238238

239239
public async removeSession(id: string) {
240240
try {
241-
this._telemetry.sendTelemetryEvent('gitpod_desktop_auth', { kind: 'logout' });
241+
this._telemetry.sendRawTelemetryEvent('gitpod_desktop_auth', { kind: 'logout' });
242242

243243
this._logger.info(`Logging out of ${id}`);
244244

@@ -255,7 +255,7 @@ export default class GitpodAuthenticationProvider extends Disposable implements
255255
this._logger.error('Session not found');
256256
}
257257
} catch (e) {
258-
this._telemetry.sendTelemetryEvent('gitpod_desktop_auth', { kind: 'logout_failed' });
258+
this._telemetry.sendRawTelemetryEvent('gitpod_desktop_auth', { kind: 'logout_failed' });
259259

260260
vscode.window.showErrorMessage(`Sign out failed: ${e}`);
261261
this._logger.error(e);

src/remoteConnector.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ export default class RemoteConnector extends Disposable {
701701

702702
this.telemetry.sendTelemetryEvent('vscode_desktop_ssh', { kind: 'gateway', status: 'connected', ...params });
703703
} catch (e) {
704-
this.telemetry.sendTelemetryEvent('vscode_desktop_ssh', { kind: 'gateway', status: 'failed', reason: e.toString(), ...params });
704+
this.telemetry.sendRawTelemetryEvent('vscode_desktop_ssh', { kind: 'gateway', status: 'failed', reason: e.toString(), ...params });
705705
if (e instanceof NoSSHGatewayError) {
706706
this.logger.error('No SSH gateway:', e);
707707
vscode.window.showWarningMessage(`${e.host} does not support [direct SSH access](https://github.com/gitpod-io/gitpod/blob/main/install/installer/docs/workspace-ssh-access.md), connecting via the deprecated SSH tunnel over WebSocket.`);
@@ -741,9 +741,9 @@ export default class RemoteConnector extends Disposable {
741741

742742
this.telemetry.sendTelemetryEvent('vscode_desktop_ssh', { kind: 'local-app', status: 'connected', ...params });
743743
} catch (e) {
744+
this.telemetry.sendRawTelemetryEvent('vscode_desktop_ssh', { kind: 'local-app', status: 'failed', reason: e.toString(), ...params });
744745
this.logger.error(`Failed to connect ${params.workspaceId} Gitpod workspace:`, e);
745746
if (e instanceof LocalAppError) {
746-
this.telemetry.sendTelemetryEvent('vscode_desktop_ssh', { kind: 'local-app', status: 'failed', reason: e.toString(), ...params });
747747
const seeLogs = 'See Logs';
748748
const showTroubleshooting = 'Show Troubleshooting';
749749
const action = await vscode.window.showErrorMessage(`Failed to connect to ${params.workspaceId} Gitpod workspace`, seeLogs, showTroubleshooting);
@@ -758,7 +758,6 @@ export default class RemoteConnector extends Disposable {
758758
}
759759
} else {
760760
// Do nothing, user cancelled the operation
761-
this.telemetry.sendTelemetryEvent('vscode_desktop_ssh', { kind: 'local-app', status: 'failed', reason: 'cancelled' });
762761
}
763762
return;
764763
}

0 commit comments

Comments
 (0)