[lssh] add telemetry logging

Author: akosyakov

src/commands/logs.ts

@@ -31,7 +31,12 @@ export class ExportLogsCommand implements Command {
 		private readonly telemetryService: ITelemetryService,
 		private readonly logService: ILogService,
 		private readonly hostService: IHostService,
-	) { }
+	) {
+		const lsshLog = this.getLSSHLog();
+		if (lsshLog) {
+			this.logService.info('LSSH Log:', lsshLog);
+		}
+	}
 
 	async execute() {
 		const gitpodHost = this.hostService.gitpodHost;
@@ -57,12 +62,20 @@ export class ExportLogsCommand implements Command {
 
 	private getAdditionalLocalLogs() {
 		const additionalLocalLogs = [];
+		const lsshLog = this.getLSSHLog();
+		if (lsshLog) {
+			additionalLocalLogs.push(lsshLog);
+		}
+		return additionalLocalLogs;
+	}
+
+	private getLSSHLog(): string | undefined {
 		const sshDestStr = getGitpodRemoteWindowConnectionInfo(this.context)?.sshDestStr;
 		if (sshDestStr) {
 			const sshDest = SSHDestination.fromRemoteSSHString(sshDestStr);
-			additionalLocalLogs.push(path.join(os.tmpdir(), `lssh-${sshDest.hostname}.log`));
+			return path.join(os.tmpdir(), `lssh-${sshDest.hostname}.log`);
 		}
-		return additionalLocalLogs;
+		return undefined;
 	}
 
 	async exportLogs() {

src/common/telemetry.ts

@@ -69,13 +69,14 @@ export function getErrorMetricsEndpoint(gitpodHost: string): string {
 	return `https://ide.${serviceUrl.hostname}/metrics-api/reportError`;
 }
 
-export async function commonSendEventData(logService: ILogService, segmentClient: Analytics, machineId: string, eventName: string, data?: any): Promise<void> {
+export async function commonSendEventData(logService: ILogService, segmentClient: Analytics | undefined, machineId: string, eventName: string, data?: any): Promise<void> {
 	const properties = data ?? {};
 
 	delete properties['gitpodHost'];
 
-	if (!isBuiltFromGHA) {
-		logService.trace('Local event report', eventName, properties);
+	logService.trace('[TELEMETRY]', eventName, properties);
+
+	if (!segmentClient) {
 		return;
 	}
 	return new Promise((resolve) =>

src/local-ssh/telemetryService.ts

@@ -34,11 +34,6 @@ export class TelemetryService implements ITelemetryService {
 
 	async sendEventData(eventName: string, data?: Record<string, any>): Promise<void> {
 		const properties = mixin(cleanData(data ?? {}, this.cleanupPatterns, isTrustedValue), this.commonProperties);
-
-		if (!this.segmentClient) {
-			return;
-		}
-
 		return commonSendEventData(this.logService, this.segmentClient, this.machineId, eventName, properties);
 	}