💄

Author: jeanp413

src/common/telemetry.ts

@@ -71,26 +71,12 @@ export function getErrorMetricsEndpoint(gitpodHost: string): string {
 	return `https://ide.${serviceUrl.hostname}/metrics-api/reportError`;
 }
 
-export function commonSendEventData(logService: ILogService, segmentKey: string, segmentClient: Analytics | undefined, machineId: string, eventName: string, data?: any) {
-	const idx = eventName.indexOf('/');
-	eventName = eventName.substring(idx + 1);
-
+export function commonSendEventData(logService: ILogService, segmentClient: Analytics, machineId: string, eventName: string, data?: any) {
 	const properties = data ?? {};
 
-	const gitpodHost: string | undefined = properties['gitpodHost'];
-	if (!gitpodHost) {
-		logService.error(`Missing 'gitpodHost' property in event ${eventName}`);
-		return;
-	}
-
 	delete properties['gitpodHost'];
 
-	if (segmentKey !== ProductionUntrustedSegmentKey) {
-		logService.trace('Local event report', eventName, properties);
-		return;
-	}
-
-	segmentClient?.track({
+	segmentClient.track({
 		anonymousId: machineId,
 		event: eventName,
 		properties

src/local-ssh/telemetryService.ts

@@ -33,7 +33,14 @@ export class TelemetryService implements ITelemetryService {
 
 	sendEventData(eventName: string, data?: Record<string, any>) {
 		const properties = mixin(cleanData(data ?? {}, this.cleanupPatterns, isTrustedValue), this.commonProperties);
-		commonSendEventData(this.logService, this.segmentKey, this.segmentClient, this.machineId, eventName, properties);
+
+		this.logService.trace('Local event report', eventName, properties);
+
+		if (!this.segmentClient) {
+			return;
+		}
+
+		commonSendEventData(this.logService, this.segmentClient, this.machineId, eventName, properties);
 	}
 
 	sendErrorData(error: Error, data?: Record<string, any>) {

src/services/telemetryService.ts

@@ -28,15 +28,18 @@ export class TelemetryService extends Disposable implements ITelemetryService {
 					const idx = eventName.indexOf('/');
 					eventName = eventName.substring(idx + 1);
 
-					const properties = data ?? {};
-
-					const gitpodHost: string | undefined = properties['gitpodHost'];
+					const gitpodHost: string | undefined = data?.['gitpodHost'];
 					if (!gitpodHost) {
 						logService.error(`Missing 'gitpodHost' property in event ${eventName}`);
 						return;
 					}
 
-					commonSendEventData(logService, segmentKey, this.getSegmentAnalyticsClient(gitpodHost, segmentKey), vscode.env.machineId, eventName, data);
+					const analyticsClient = this.getSegmentAnalyticsClient(gitpodHost, segmentKey);
+					if (!analyticsClient) {
+						return;
+					}
+
+					commonSendEventData(logService, analyticsClient, vscode.env.machineId, eventName, data);
 				},
 				sendErrorData: (error, data) => {
 					commonSendErrorData(logService, segmentKey, Configuration.getGitpodHost(), error, data, {