Add galleryHost label

Author: jeanp413

src/vs/gitpod/browser/gitpodInsightsAppender.ts

@@ -20,6 +20,8 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 	private readonly _baseProperties: { appName: string; uiKind: 'web'; version: string };
 	private readonly devMode = this.productService.nameShort.endsWith(' Dev');
 	private gitpodUserId: string | undefined;
+	private galleryHost: string | undefined;
+
 	constructor(
 		@IProductService private readonly productService: IProductService
 	) {
@@ -28,6 +30,8 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 			uiKind: 'web',
 			version: this.productService.version,
 		};
+		this.galleryHost = this.productService.extensionsGallery?.serviceUrl ? new URL(this.productService.extensionsGallery?.serviceUrl).host : undefined;
+
 		window.gitpod?.service.server.getLoggedInUser().then((user) => {
 			this.gitpodUserId = user.id;
 		}).catch((e) => {
@@ -71,7 +75,7 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 
 	private async sendMetrics(eventName: string, data: any): Promise<void> {
 		try {
-			const metrics = mapMetrics('window', eventName, data);
+			const metrics = mapMetrics('window', eventName, data, { galleryHost: this.galleryHost });
 			if (!metrics || !metrics.length) {
 				return;
 			}

src/vs/gitpod/common/insightsHelper.ts

@@ -37,12 +37,12 @@ function getEventName(name: string) {
 let readAccessTracked = false;
 let writeAccessTracked = false;
 
-export function mapMetrics(source: 'window' | 'remote-server', eventName: string, data: any): IDEMetric[] | undefined {
+export function mapMetrics(source: 'window' | 'remote-server', eventName: string, data: any, extraData?: any): IDEMetric[] | undefined {
 	const maybeMetrics = doMapMetrics(source, eventName, data);
 	return maybeMetrics instanceof Array ? maybeMetrics : typeof maybeMetrics === 'object' ? [maybeMetrics] : undefined;
 }
 
-function doMapMetrics(source: 'window' | 'remote-server', eventName: string, data: any): IDEMetric[] | IDEMetric | undefined {
+function doMapMetrics(source: 'window' | 'remote-server', eventName: string, data: any, extraData?: any): IDEMetric[] | IDEMetric | undefined {
 	if (source === 'remote-server') {
 		if (eventName.startsWith('extensionGallery:')) {
 			const operation = eventName.split(':')[1];
@@ -53,6 +53,7 @@ function doMapMetrics(source: 'window' | 'remote-server', eventName: string, dat
 					labels: {
 						operation,
 						status: data.success ? 'success' : 'failure',
+						galleryHost: extraData.galleryHost
 						// TODO errorCode
 					}
 				}];
@@ -61,7 +62,8 @@ function doMapMetrics(source: 'window' | 'remote-server', eventName: string, dat
 						kind: 'histogram',
 						name: 'gitpod_vscode_extension_gallery_operation_duration_seconds',
 						labels: {
-							operation
+							operation,
+							galleryHost: extraData.galleryHost
 						},
 						value: data.duration / 1000
 					});
@@ -77,11 +79,14 @@ function doMapMetrics(source: 'window' | 'remote-server', eventName: string, dat
 					status: data.success ? 'success' : 'failure',
 					statusCode: data.statusCode,
 					errorCode: data.errorCode,
+					galleryHost: extraData.galleryHost
 				}
 			}, {
 				kind: 'histogram',
 				name: 'gitpod_vscode_extension_gallery_query_duration_seconds',
-				labels: {},
+				labels: {
+					galleryHost: extraData.galleryHost
+				},
 				value: data.duration / 1000
 			}];
 			return metrics;

src/vs/gitpod/node/gitpodInsightsAppender.ts

@@ -56,14 +56,22 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 	private readonly supervisor = new SupervisorConnection();
 	private readonly devMode = this.productName.endsWith(' Dev');
 	private gitpodUserId: string | undefined;
+	private galleryHost: string | undefined;
 
-	constructor(private productName: string, private productVersion: string, private readonly gitpodPreview?: IGitpodPreviewConfiguration) {
+	constructor(
+		private productName: string,
+		private productVersion: string,
+		private readonly gitpodPreview?: IGitpodPreviewConfiguration,
+		readonly galleryServiceUrl?: string
+	) {
 		this._asyncAIClient = null;
 		this._baseProperties = {
 			appName: productName,
 			uiKind: 'web',
 			version: productVersion,
 		};
+		this.galleryHost = galleryServiceUrl ? new URL(galleryServiceUrl).host : undefined;
+
 		this._withAIClient(async (client) => {
 			this.gitpodUserId = (await client.getLoggedInUser()).id;
 		});
@@ -136,7 +144,7 @@ export class GitpodInsightsAppender implements ITelemetryAppender {
 
 	private async sendMetrics(data: any, eventName: string): Promise<void> {
 		try {
-			const metrics = mapMetrics('remote-server', eventName, data);
+			const metrics = mapMetrics('remote-server', eventName, data, { galleryHost: this.galleryHost });
 			if (!metrics || !metrics.length) {
 				return;
 			}

src/vs/server/node/serverServices.ts

@@ -146,7 +146,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 			disposables.add(toDisposable(() => oneDsAppender?.flush())); // Ensure the AI appender is disposed so that it flushes remaining data
 		}
 
-		oneDsAppender = new GitpodInsightsAppender(productService.nameShort, productService.version, productService.gitpodPreview);
+		oneDsAppender = new GitpodInsightsAppender(productService.nameShort, productService.version, productService.gitpodPreview, productService.extensionsGallery?.serviceUrl);
 
 		const config: ITelemetryServiceConfig = {
 			appenders: [oneDsAppender],