Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not collide with common properties #239908

Merged
merged 1 commit into from
Feb 7, 2025
Merged

do not collide with common properties #239908

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/vs/platform/extensionManagement/common/extensionGalleryService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<IRequestContext> {
private async getAsset(extension: string, asset: IGalleryExtensionAsset, assetType: string, extensionVersion: string, options: IRequestOptions = {}, token: CancellationToken = CancellationToken.None): Promise<IRequestContext> {
const commonHeaders = await this.commonHeadersPromise;
const baseOptions = { type: 'GET' };
const headers = { ...commonHeaders, ...(options.headers || {}) };
Expand Down Expand Up @@ -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<GalleryServiceCDNFallbackEvent, GalleryServiceCDNFallbackClassification>('galleryService:cdnFallback', { extension, assetType, message, version });
this.telemetryService.publicLog2<GalleryServiceCDNFallbackEvent, GalleryServiceCDNFallbackClassification>('galleryService:cdnFallback', { extension, assetType, message, extensionVersion });

const fallbackOptions = { ...options, url: fallbackUrl };
return this.requestService.request(fallbackOptions, token);
Expand All @@ -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<GalleryServiceEngineFallbackEvent, GalleryServiceEngineFallbackClassification>('galleryService:engineFallback', { extension, version: rawExtensionVersion.version });
this.telemetryService.publicLog2<GalleryServiceEngineFallbackEvent, GalleryServiceEngineFallbackClassification>('galleryService:engineFallback', { extension, extensionVersion: rawExtensionVersion.version });
const manifest = await this.getManifestFromRawExtensionVersion(extension, rawExtensionVersion, CancellationToken.None);
if (!manifest) {
throw new Error('Manifest was not found');
Expand Down
Loading