Skip to content

Commit 99bb194

Browse files
authored
do not collide with common properties (microsoft#239908)
1 parent a1d56fd commit 99bb194

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/vs/platform/extensionManagement/common/extensionGalleryService.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,7 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
14891489
return result;
14901490
}
14911491

1492-
private async getAsset(extension: string, asset: IGalleryExtensionAsset, assetType: string, version: string, options: IRequestOptions = {}, token: CancellationToken = CancellationToken.None): Promise<IRequestContext> {
1492+
private async getAsset(extension: string, asset: IGalleryExtensionAsset, assetType: string, extensionVersion: string, options: IRequestOptions = {}, token: CancellationToken = CancellationToken.None): Promise<IRequestContext> {
14931493
const commonHeaders = await this.commonHeadersPromise;
14941494
const baseOptions = { type: 'GET' };
14951495
const headers = { ...commonHeaders, ...(options.headers || {}) };
@@ -1518,15 +1518,15 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
15181518
extension: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'extension name' };
15191519
assetType: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'asset that failed' };
15201520
message: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'error message' };
1521-
version: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'version' };
1521+
extensionVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'version' };
15221522
};
15231523
type GalleryServiceCDNFallbackEvent = {
15241524
extension: string;
15251525
assetType: string;
15261526
message: string;
1527-
version: string;
1527+
extensionVersion: string;
15281528
};
1529-
this.telemetryService.publicLog2<GalleryServiceCDNFallbackEvent, GalleryServiceCDNFallbackClassification>('galleryService:cdnFallback', { extension, assetType, message, version });
1529+
this.telemetryService.publicLog2<GalleryServiceCDNFallbackEvent, GalleryServiceCDNFallbackClassification>('galleryService:cdnFallback', { extension, assetType, message, extensionVersion });
15301530

15311531
const fallbackOptions = { ...options, url: fallbackUrl };
15321532
return this.requestService.request(fallbackOptions, token);
@@ -1540,13 +1540,13 @@ abstract class AbstractExtensionGalleryService implements IExtensionGalleryServi
15401540
owner: 'sandy081';
15411541
comment: 'Fallback request when engine is not found in properties of an extension version';
15421542
extension: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'extension name' };
1543-
version: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'version' };
1543+
extensionVersion: { classification: 'SystemMetaData'; purpose: 'FeatureInsight'; comment: 'version' };
15441544
};
15451545
type GalleryServiceEngineFallbackEvent = {
15461546
extension: string;
1547-
version: string;
1547+
extensionVersion: string;
15481548
};
1549-
this.telemetryService.publicLog2<GalleryServiceEngineFallbackEvent, GalleryServiceEngineFallbackClassification>('galleryService:engineFallback', { extension, version: rawExtensionVersion.version });
1549+
this.telemetryService.publicLog2<GalleryServiceEngineFallbackEvent, GalleryServiceEngineFallbackClassification>('galleryService:engineFallback', { extension, extensionVersion: rawExtensionVersion.version });
15501550
const manifest = await this.getManifestFromRawExtensionVersion(extension, rawExtensionVersion, CancellationToken.None);
15511551
if (!manifest) {
15521552
throw new Error('Manifest was not found');

0 commit comments

Comments
 (0)