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

Jump to bottom

Mark extension ids as exempt from cleaning #169027

Merged
merged 1 commit into from
Dec 15, 2022
Merged

Mark extension ids as exempt from cleaning #169027

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/vs/platform/extensionManagement/common/extensionManagementUtil.ts
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@ import { URI } from 'vs/base/common/uri';
import { getErrorMessage } from 'vs/base/common/errors';
import { ILogService } from 'vs/platform/log/common/log';
import { arch } from 'vs/base/common/process';
import { TrustedTelemetryValue } from 'vs/platform/telemetry/common/telemetryUtils';

export function areSameExtensions(a: IExtensionIdentifier, b: IExtensionIdentifier): boolean {
if (a.uuid && b.uuid) {
Expand Down Expand Up @@ -133,8 +134,8 @@ export function getLocalExtensionTelemetryData(extension: ILocalExtension): any
*/
export function getGalleryExtensionTelemetryData(extension: IGalleryExtension): any {
return {
id: extension.identifier.id,
name: extension.name,
id: new TrustedTelemetryValue(extension.identifier.id),
name: new TrustedTelemetryValue(extension.name),
galleryId: extension.identifier.uuid,
publisherId: extension.publisherId,
publisherName: extension.publisher,
Expand Down
5 changes: 3 additions & 2 deletions src/vs/workbench/api/common/extHostCommands.ts
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@ import { SerializableObjectWithBuffers } from 'vs/workbench/services/extensions/
import { toErrorMessage } from 'vs/base/common/errorMessage';
import { StopWatch } from 'vs/base/common/stopwatch';
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
import { TrustedTelemetryValue } from 'vs/platform/telemetry/common/telemetryUtils';

interface CommandHandler {
callback: Function;
Expand Down Expand Up @@ -273,7 +274,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
}
type ExtensionActionTelemetry = {
extensionId: string;
id: string;
id: TrustedTelemetryValue<string>;
duration: number;
};
type ExtensionActionTelemetryMeta = {
Expand All @@ -285,7 +286,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
};
this.#telemetry.$publicLog2<ExtensionActionTelemetry, ExtensionActionTelemetryMeta>('Extension:ActionExecuted', {
extensionId: command.extension.identifier.value,
id: id,
id: new TrustedTelemetryValue(id),
duration: duration,
});
}
Expand Down
5 changes: 3 additions & 2 deletions src/vs/workbench/browser/parts/views/treeView.ts
View file
Open in desktop
Expand Up @@ -68,6 +68,7 @@ import { addExternalEditorsDropData, toVSDataTransfer } from 'vs/editor/browser/
import { CheckboxStateHandler, TreeItemCheckbox } from 'vs/workbench/browser/parts/views/checkbox';
import { setTimeout0 } from 'vs/base/common/platform';
import { AriaRole } from 'vs/base/browser/ui/aria/aria';
import { TrustedTelemetryValue } from 'vs/platform/telemetry/common/telemetryUtils';

export class TreeViewPane extends ViewPane {

Expand Down Expand Up @@ -1463,7 +1464,7 @@ export class CustomTreeView extends AbstractTreeView {
protected activate() {
if (!this.activated) {
type ExtensionViewTelemetry = {
extensionId: string;
extensionId: TrustedTelemetryValue<string>;
id: string;
};
type ExtensionViewTelemetryMeta = {
Expand All @@ -1473,7 +1474,7 @@ export class CustomTreeView extends AbstractTreeView {
comment: 'Helps to gain insights on what extension contributed views are most popular';
};
this.telemetryService.publicLog2<ExtensionViewTelemetry, ExtensionViewTelemetryMeta>('Extension:ViewActivate', {
extensionId: this.extensionId,
extensionId: new TrustedTelemetryValue(this.extensionId),
id: this.id,
});
this.createTree();
Expand Down
5 changes: 3 additions & 2 deletions src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.ts
View file
Open in desktop
Expand Up @@ -48,13 +48,14 @@ import { ExtensionEditor } from 'vs/workbench/contrib/extensions/browser/extensi
import { isWeb, language } from 'vs/base/common/platform';
import { getLocale } from 'vs/platform/languagePacks/common/languagePacks';
import { ILocaleService } from 'vs/workbench/contrib/localization/common/locale';
import { TrustedTelemetryValue } from 'vs/platform/telemetry/common/telemetryUtils';

interface IExtensionStateProvider<T> {
(extension: Extension): T;
}

interface InstalledExtensionsEvent {
readonly extensionIds: string;
readonly extensionIds: TrustedTelemetryValue<string>;
readonly count: number;
}
type ExtensionsLoadClassification = {
Expand Down Expand Up @@ -800,7 +801,7 @@ export class ExtensionsWorkbenchService extends Disposable implements IExtension
(extension.enablementState === EnablementState.EnabledWorkspace ||
extension.enablementState === EnablementState.EnabledGlobally))
.map(extension => ExtensionIdentifier.toKey(extension.identifier.id));
this.telemetryService.publicLog2<InstalledExtensionsEvent, ExtensionsLoadClassification>('installedExtensions', { extensionIds: extensionIds.join(';'), count: extensionIds.length });
this.telemetryService.publicLog2<InstalledExtensionsEvent, ExtensionsLoadClassification>('installedExtensions', { extensionIds: new TrustedTelemetryValue(extensionIds.join(';')), count: extensionIds.length });
}

private async onDidChangeRunningExtensions(added: ReadonlyArray<IExtensionDescription>, removed: ReadonlyArray<IExtensionDescription>): Promise<void> {
Expand Down