💄

Author: jeanp413

src/local-ssh/proxy.ts

@@ -148,11 +148,13 @@ class WebSocketSSHProxy {
                             sendErrorReport = false;
                         }
                     }
-                    await Promise.allSettled([
-                        this.sendUserStatusFlow('failed'),
-                        sendErrorReport ? this.sendErrorReport(this.flow, err, 'failed to authenticate proxy with username: ' + e.username ?? '') : undefined,
-                    ]);
-                    this.logService.error(err, 'failed to authenticate proxy with username: ' + e.username ?? '');
+
+                    this.sendUserStatusFlow('failed');
+                    if (sendErrorReport) {
+                        this.sendErrorReport(this.flow, err, 'failed to authenticate proxy with username: ' + e.username ?? '');
+                    }
+
+                    this.logService.error('failed to authenticate proxy with username: ' + e.username ?? '', err);
                     await session.close(SshDisconnectReason.byApplication, err.toString(), err instanceof Error ? err : undefined);
                     return null;
                 });
@@ -165,7 +167,7 @@ class WebSocketSSHProxy {
                 return;
             }
             this.logService.error(e, 'failed to connect to client');
-            await this.sendErrorReport(this.flow, e, 'failed to connect to client');
+            this.sendErrorReport(this.flow, e, 'failed to connect to client');
             await session.close(SshDisconnectReason.byApplication, e.toString(), e instanceof Error ? e : undefined);
         }
     }
@@ -250,14 +252,12 @@ class WebSocketSSHProxy {
         }, 200, 50);
     }
 
-    async sendUserStatusFlow(status: 'connected' | 'connecting' | 'failed') {
-        this.metricsReporter.reportConnectionStatus(this.flow.gitpodHost, status, this.flow.failureCode).catch(e => {
-            this.logService.error('Failed to report connection status', e);
-        });
+    sendUserStatusFlow(status: 'connected' | 'connecting' | 'failed') {
+        this.metricsReporter.reportConnectionStatus(this.flow.gitpodHost, status, this.flow.failureCode);
         this.telemetryService.sendUserFlowStatus(status, this.flow);
     }
 
-    async sendErrorReport(info: UserFlowTelemetryProperties, err: Error | any, message: string) {
+    sendErrorReport(info: UserFlowTelemetryProperties, err: Error | any, message: string) {
         const properties = {
             gitpodHost: info.gitpodHost,
             userId: info.userId,

src/local-ssh/telemetryService.ts

@@ -34,8 +34,6 @@ export class TelemetryService implements ITelemetryService {
 	sendEventData(eventName: string, data?: Record<string, any>) {
 		const properties = mixin(cleanData(data ?? {}, this.cleanupPatterns, isTrustedValue), this.commonProperties);
 
-		this.logService.trace('Local event report', eventName, properties);
-
 		if (!this.segmentClient) {
 			return;
 		}
@@ -51,12 +49,8 @@ export class TelemetryService implements ITelemetryService {
 		});
 	}
 
-	async flush() {
-		try {
-			await this.segmentClient?.closeAndFlush({ timeout: 3000 });
-		} catch (e: any) {
-			this.logService.error('Failed to flush app analytics!', e);
-		}
+	flush() {
+		// Noop, we disabled buffering
 	}
 
 	sendTelemetryEvent(eventName: string, properties?: TelemetryEventProperties): void {

src/services/localSSHMetrics.ts

@@ -12,21 +12,24 @@ export class LocalSSHMetricsReporter {
         private readonly logService: ILogService,
     ) { }
 
-    async reportConfigStatus(gitpodHost: string | undefined, status: 'success' | 'failure', failureCode?: string): Promise<void> {
+    reportConfigStatus(gitpodHost: string, status: 'success' | 'failure', failureCode?: string) {
         if (status === 'success') {
             failureCode = 'None';
         }
-        return addCounter(gitpodHost, 'vscode_desktop_local_ssh_config_total', { status, failure_code: failureCode ?? 'Unknown' }, 1, this.logService);
+        addCounter(gitpodHost, 'vscode_desktop_local_ssh_config_total', { status, failure_code: failureCode ?? 'Unknown' }, 1, this.logService)
+            .catch(e => this.logService.error('Error while reporting metrics', e));
     }
 
-    async reportPingExtensionStatus(gitpodHost: string | undefined, status: 'success' | 'failure'): Promise<void> {
-        return addCounter(gitpodHost, 'vscode_desktop_ping_extension_server_total', { status }, 1, this.logService);
+    reportPingExtensionStatus(gitpodHost: string | undefined, status: 'success' | 'failure') {
+        addCounter(gitpodHost, 'vscode_desktop_ping_extension_server_total', { status }, 1, this.logService)
+            .catch(e => this.logService.error('Error while reporting metrics', e));
     }
 
-    async reportConnectionStatus(gitpodHost: string | undefined, phase: 'connected' | 'connecting' | 'failed', failureCode?: string): Promise<void> {
+    reportConnectionStatus(gitpodHost: string, phase: 'connected' | 'connecting' | 'failed', failureCode?: string) {
         if (phase === 'connecting' || phase === 'connected') {
             failureCode = 'None';
         }
-        return addCounter(gitpodHost, 'vscode_desktop_local_ssh_total', { phase, failure_code: failureCode ?? 'Unknown' }, 1, this.logService);
+        addCounter(gitpodHost, 'vscode_desktop_local_ssh_total', { phase, failure_code: failureCode ?? 'Unknown' }, 1, this.logService)
+            .catch(e => this.logService.error('Error while reporting metrics', e));
     }
 }