From a488a6af7477f954800042da3c5e2f5def85b961 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Fri, 7 Feb 2025 10:11:02 +0100 Subject: [PATCH] do not collide with common properties --- .../common/extensionGalleryService.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts index eb1126e2f130f..a107e590a129a 100644 --- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts +++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts @@ -1489,7 +1489,7 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi return result; } - private async getAsset(extension: string, asset: IGalleryExtensionAsset, assetType: string, version: string, options: IRequestOptions = {}, token: CancellationToken = CancellationToken.None): Promise { + private async getAsset(extension: string, asset: IGalleryExtensionAsset, assetType: string, extensionVersion: string, options: IRequestOptions = {}, token: CancellationToken = CancellationToken.None): Promise { const commonHeaders = await this.commonHeadersPromise; const baseOptions = { type: 'GET' }; const headers = { ...commonHeaders, ...(options.headers || {}) }; @@ -1518,15 +1518,15 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi extension: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'extension name' }; assetType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'asset that failed' }; message: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'error message' }; - version: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'version' }; + extensionVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'version' }; }; type GalleryServiceCDNFallbackEvent = { extension: string; assetType: string; message: string; - version: string; + extensionVersion: string; }; - this.telemetryService.publicLog2('galleryService:cdnFallback', { extension, assetType, message, version }); + this.telemetryService.publicLog2('galleryService:cdnFallback', { extension, assetType, message, extensionVersion }); const fallbackOptions = { ...options, url: fallbackUrl }; return this.requestService.request(fallbackOptions, token); @@ -1540,13 +1540,13 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi owner: 'sandy081'; comment: 'Fallback request when engine is not found in properties of an extension version'; extension: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'extension name' }; - version: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'version' }; + extensionVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'version' }; }; type GalleryServiceEngineFallbackEvent = { extension: string; - version: string; + extensionVersion: string; }; - this.telemetryService.publicLog2('galleryService:engineFallback', { extension, version: rawExtensionVersion.version }); + this.telemetryService.publicLog2('galleryService:engineFallback', { extension, extensionVersion: rawExtensionVersion.version }); const manifest = await this.getManifestFromRawExtensionVersion(extension, rawExtensionVersion, CancellationToken.None); if (!manifest) { throw new Error('Manifest was not found');