Skip to content

Commit

Permalink
Minor polish
Browse files Browse the repository at this point in the history
  • Loading branch information
dtivel committed Dec 22, 2022
1 parent f9193e3 commit 8fff554
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';

export const enum ExtensionVerificationStatus {
'Verified' = 'verified',
'Verified' = 'Verified',
'Unverified' = 'Unverified',
'UnknownError' = 'UnknownError',
}
Expand Down Expand Up @@ -686,7 +686,7 @@ function toExtensionManagementError(error: Error): ExtensionManagementError {
return e;
}

export function reportTelemetry(telemetryService: ITelemetryService, eventName: string, { extensionData, verificationStatus, hadUnknownError, duration, error, durationSinceUpdate }: { extensionData: any; verificationStatus?: ExtensionVerificationStatus; hadUnknownError?: boolean; duration?: number; durationSinceUpdate?: number; error?: Error }): void {
export function reportTelemetry(telemetryService: ITelemetryService, eventName: string, { extensionData, verificationStatus, duration, error, durationSinceUpdate }: { extensionData: any; verificationStatus?: ExtensionVerificationStatus; duration?: number; durationSinceUpdate?: number; error?: Error }): void {
let errorcode: ExtensionManagementErrorCode | undefined;
let errorcodeDetail: string | undefined;

Expand Down Expand Up @@ -736,13 +736,12 @@ export function reportTelemetry(telemetryService: ITelemetryService, eventName:
"errorcode": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
"errorcodeDetail": { "classification": "CallstackOrException", "purpose": "PerformanceAndHealth" },
"verificationStatus" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"hadUnknownError" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
"${include}": [
"${GalleryExtensionTelemetryData}"
]
}
*/
telemetryService.publicLog(eventName, { ...extensionData, verificationStatus, hadUnknownError, success: !error, duration, errorcode, errorcodeDetail, durationSinceUpdate });
telemetryService.publicLog(eventName, { ...extensionData, verificationStatus, success: !error, duration, errorcode, errorcodeDetail, durationSinceUpdate });
}

export abstract class AbstractExtensionTask<T> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ export class ExtensionsDownloader extends Disposable {
if (verified) {
verificationStatus = ExtensionVerificationStatus.Verified;
}
this.logService.info(`Extension signature verification: ${extension.identifier.id}. Verification Status: ${verificationStatus})`);
this.logService.info(`Extension signature verification: ${extension.identifier.id}. Verification status: ${verificationStatus}.`);
} catch (error) {
const code: string = (error as ExtensionSignatureVerificationError).code;

if (code === 'UnknownError') {
verificationStatus = ExtensionVerificationStatus.UnknownError;
this.logService.warn(`Extension signature verification: ${extension.identifier.id} (was verified: ${verificationStatus} with UnknownError)`);
this.logService.warn(`Extension signature verification: ${extension.identifier.id}. Verification status: ${verificationStatus}.`);
} else {
await this.delete(signatureArchiveLocation);
await this.delete(location);
Expand Down

0 comments on commit 8fff554

Please sign in to comment.