@codingame/monaco-vscode-telemetry-service-override 37.0.0 → 37.1.0

package/index.js

@@ -8,6 +8,7 @@ import { DataChannelService } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import './vscode/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.js';
 import './vscode/src/vs/workbench/contrib/editTelemetry/browser/editTelemetry.contribution.js';
 import './vscode/src/vs/workbench/contrib/bracketPairColorizer2Telemetry/browser/bracketPairColorizer2Telemetry.contribution.js';
+import './vscode/src/vs/workbench/services/policies/browser/policyTelemetry.contribution.js';
 
 function getServiceOverride() {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-telemetry-service-override",
-  "version": "37.0.0",
+  "version": "37.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - telemetry service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "37.0.0",
+    "@codingame/monaco-vscode-api": "37.1.0",
     "@microsoft/1ds-core-js": "3.2.18",
     "@microsoft/1ds-post-js": "3.2.18"
   },

package/vscode/src/vs/platform/telemetry/common/telemetryLogAppender.js

@@ -20,7 +20,7 @@ let TelemetryLogAppender = class TelemetryLogAppender extends Disposable {
             const justLoggingAndNotSending = isLoggingOnly(productService, environmentService);
             const logSuffix = justLoggingAndNotSending ? " (Not Sent)" : "";
             this.logger = this._register(loggerService.createLogger(id, {
-                name: ( localize(2423, "Telemetry{0}", logSuffix)),
+                name: ( localize(2469, "Telemetry{0}", logSuffix)),
                 group: TelemetryLogGroup,
                 hidden: true
             }));

package/vscode/src/vs/platform/telemetry/common/telemetryService.js

@@ -180,28 +180,28 @@ let TelemetryService = class TelemetryService {
 TelemetryService = TelemetryService_1 = ( __decorate([( __param(1, IConfigurationService)), ( __param(2, IProductService))], TelemetryService));
 function getTelemetryLevelSettingDescription() {
     const telemetryText = ( localize(
-        2424,
+        2470,
         "Controls {0} telemetry, first-party extension telemetry, and participating third-party extension telemetry. Some third party extensions might not respect this setting. Consult the specific extension's documentation to be sure. Telemetry helps us better understand how {0} is performing, where improvements need to be made, and how features are being used.",
         product.nameLong
     ));
     const externalLinksStatement = !product.privacyStatementUrl ? ( localize(
-        2425,
+        2471,
         "Read more about the [data we collect]({0}).",
         "https://aka.ms/vscode-telemetry"
     )) : ( localize(
-        2426,
+        2472,
         "Read more about the [data we collect]({0}) and our [privacy statement]({1}).",
         "https://aka.ms/vscode-telemetry",
         product.privacyStatementUrl
     ));
     const restartString = !isWeb ? ( localize(
-        2427,
+        2473,
         "A full restart of the application is necessary for crash reporting changes to take effect."
     )) : "";
-    const crashReportsHeader = ( localize(2428, "Crash Reports"));
-    const errorsHeader = ( localize(2429, "Error Telemetry"));
-    const usageHeader = ( localize(2430, "Usage Data"));
-    const telemetryTableDescription = ( localize(2431, "The following table outlines the data sent with each setting:"));
+    const crashReportsHeader = ( localize(2474, "Crash Reports"));
+    const errorsHeader = ( localize(2475, "Error Telemetry"));
+    const usageHeader = ( localize(2476, "Usage Data"));
+    const telemetryTableDescription = ( localize(2477, "The following table outlines the data sent with each setting:"));
     const telemetryTable = `
 |       | ${crashReportsHeader} | ${errorsHeader} | ${usageHeader} |
 |:------|:-------------:|:---------------:|:----------:|
@@ -211,7 +211,7 @@ function getTelemetryLevelSettingDescription() {
 | off   |       -       |        -        |     -      |
 `;
     const deprecatedSettingNote = ( localize(
-        2432,
+        2478,
         "****Note:*** If this setting is 'off', no telemetry will be sent regardless of other telemetry settings. If this setting is set to anything except 'off' and telemetry is disabled with deprecated settings, no telemetry will be sent.*"
     ));
     const telemetryDescription = `
@@ -233,7 +233,7 @@ configurationRegistry.registerConfiguration({
     "id": TELEMETRY_SECTION_ID,
     "order": 1,
     "type": "object",
-    "title": ( localize(2433, "Telemetry")),
+    "title": ( localize(2479, "Telemetry")),
     "properties": {
         [TELEMETRY_SETTING_ID]: {
             "type": "string",
@@ -243,7 +243,7 @@ configurationRegistry.registerConfiguration({
                 TelemetryConfiguration.CRASH,
                 TelemetryConfiguration.OFF
             ],
-            "enumDescriptions": [( localize(2434, "Sends usage data, errors, and crash reports.")), ( localize(2435, "Sends general error telemetry and crash reports.")), ( localize(2436, "Sends OS level crash reports.")), ( localize(2437, "Disables all product telemetry."))],
+            "enumDescriptions": [( localize(2480, "Sends usage data, errors, and crash reports.")), ( localize(2481, "Sends general error telemetry and crash reports.")), ( localize(2482, "Sends OS level crash reports.")), ( localize(2483, "Disables all product telemetry."))],
             "markdownDescription": getTelemetryLevelSettingDescription(),
             "default": TelemetryConfiguration.ON,
             "restricted": true,
@@ -256,20 +256,20 @@ configurationRegistry.registerConfiguration({
                 localization: {
                     description: {
                         key: "telemetry.telemetryLevel.policyDescription",
-                        value: ( localize(2438, "Controls the level of telemetry."))
+                        value: ( localize(2484, "Controls the level of telemetry."))
                     },
                     enumDescriptions: [{
                         key: "telemetry.telemetryLevel.default",
-                        value: ( localize(2434, "Sends usage data, errors, and crash reports."))
+                        value: ( localize(2480, "Sends usage data, errors, and crash reports."))
                     }, {
                         key: "telemetry.telemetryLevel.error",
-                        value: ( localize(2435, "Sends general error telemetry and crash reports."))
+                        value: ( localize(2481, "Sends general error telemetry and crash reports."))
                     }, {
                         key: "telemetry.telemetryLevel.crash",
-                        value: ( localize(2436, "Sends OS level crash reports."))
+                        value: ( localize(2482, "Sends OS level crash reports."))
                     }, {
                         key: "telemetry.telemetryLevel.off",
-                        value: ( localize(2437, "Disables all product telemetry."))
+                        value: ( localize(2483, "Disables all product telemetry."))
                     }]
                 }
             }
@@ -278,7 +278,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             description: ( localize(
-                2439,
+                2485,
                 "Enable feedback mechanisms such as the issue reporter, surveys, and other feedback options."
             )),
             policy: {
@@ -289,7 +289,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "telemetry.feedback.enabled",
                         value: ( localize(
-                            2439,
+                            2485,
                             "Enable feedback mechanisms such as the issue reporter, surveys, and other feedback options."
                         ))
                     }
@@ -299,11 +299,11 @@ configurationRegistry.registerConfiguration({
         [TELEMETRY_OLD_SETTING_ID]: {
             "type": "boolean",
             "markdownDescription": !product.privacyStatementUrl ? ( localize(
-                2440,
+                2486,
                 "Enable diagnostic data to be collected. This helps us to better understand how {0} is performing and where improvements need to be made.",
                 product.nameLong
             )) : ( localize(
-                2441,
+                2487,
                 "Enable diagnostic data to be collected. This helps us to better understand how {0} is performing and where improvements need to be made. [Read more]({1}) about what we collect and our privacy statement.",
                 product.nameLong,
                 product.privacyStatementUrl
@@ -311,7 +311,7 @@ configurationRegistry.registerConfiguration({
             "default": true,
             "restricted": true,
             "markdownDeprecationMessage": ( localize(
-                2442,
+                2488,
                 "If this setting is false, no telemetry will be sent regardless of the new setting's value. Deprecated in favor of the {0} setting.",
                 `\`#${TELEMETRY_SETTING_ID}#\``
             )),

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/editStats/aiStatsChart.js

@@ -82,7 +82,7 @@ function createAiStatsChart(options) {
         text.setAttribute("text-anchor", "middle");
         text.setAttribute("fill", asCssVariable(chartsForeground));
         text.setAttribute("font-size", "11px");
-        text.textContent = ( localize(11955, "No data yet"));
+        text.textContent = ( localize(12150, "No data yet"));
         g.appendChild(text);
         return container;
     }

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/editStats/aiStatsStatusBar.js

@@ -36,8 +36,8 @@ let AiStatsStatusBar = class AiStatsStatusBar extends Disposable {
             const statusBarItem = this._createStatusBar().keepUpdated(reader.store);
             const store = this._register(( new DisposableStore()));
             reader.store.add(this._statusbarService.addEntry({
-                name: ( localize(11956, "Inline Suggestions")),
-                ariaLabel: ( localize(11957, "Inline suggestions status bar")),
+                name: ( localize(12151, "Inline Suggestions")),
+                ariaLabel: ( localize(12152, "Inline suggestions status bar")),
                 text: "",
                 tooltip: {
                     element: async _token => {
@@ -140,7 +140,7 @@ function createAiStatsHover(options) {
         style: {
             flex: 1
         }
-    }, [( localize(11958, "AI Usage Statistics"))]), n.div({
+    }, [( localize(12153, "AI Usage Statistics"))]), n.div({
         style: {
             marginLeft: "auto"
         }
@@ -151,7 +151,7 @@ function createAiStatsHover(options) {
             enabled: true,
             run: options.onOpenSettings,
             class: ThemeIcon.asClassName(Codicon.gear),
-            tooltip: ( localize(11959, "Configure"))
+            tooltip: ( localize(12154, "Configure"))
         },
         options: {
             icon: true,
@@ -167,13 +167,13 @@ function createAiStatsHover(options) {
             flex: 1,
             paddingRight: "4px"
         }
-    }, [( localize(11960, "AI vs Typing Average: {0}", aiRatePercent.get()))])]), n.div({
+    }, [( localize(12155, "AI vs Typing Average: {0}", aiRatePercent.get()))])]), n.div({
         style: {
             flex: 1,
             paddingRight: "4px"
         }
     }, [( localize(
-        11961,
+        12156,
         "Accepted inline suggestions today: {0}",
         options.data.acceptedInlineSuggestionsToday.get()
     ))]),
@@ -195,14 +195,14 @@ function createAiStatsHover(options) {
         style: {
             flex: 1
         }
-    }, [( chartViewMode.map(mode => mode === "days" ? ( localize(11962, "AI Rate by Day")) : ( localize(11963, "AI Rate by Session"))))]), n.div({
+    }, [( chartViewMode.map(mode => mode === "days" ? ( localize(12157, "AI Rate by Day")) : ( localize(12158, "AI Rate by Session"))))]), n.div({
         class: "chart-view-toggle",
         style: {
             marginLeft: "auto",
             display: "flex",
             gap: "2px"
         }
-    }, [createToggleButton("days", ( localize(11964, "Days")), Codicon.calendar), createToggleButton("sessions", ( localize(11965, "Sessions")), Codicon.listFlat)])]),
+    }, [createToggleButton("days", ( localize(12159, "Days")), Codicon.calendar), createToggleButton("sessions", ( localize(12160, "Sessions")), Codicon.listFlat)])]),
     derived(reader => {
         const sessions = options.data.sessions.read(reader);
         const viewMode = chartViewMode.read(reader);

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/editTelemetry.contribution.js

@@ -22,12 +22,12 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: "task",
     order: 100,
-    title: ( localize(11966, "Edit Telemetry")),
+    title: ( localize(12161, "Edit Telemetry")),
     type: "object",
     properties: {
         [EDIT_TELEMETRY_SETTING_ID]: {
             markdownDescription: ( localize(
-                11967,
+                12162,
                 "Controls whether to enable telemetry for edit statistics (only sends statistics if general telemetry is enabled)."
             )),
             type: "boolean",
@@ -42,7 +42,7 @@ configurationRegistry.registerConfiguration({
         },
         [AI_STATS_SETTING_ID]: {
             markdownDescription: ( localize(
-                11968,
+                12163,
                 "Controls whether to enable AI statistics in the editor. The gauge shows the average AI rate across 5-minute sessions, where each session's rate is calculated as AI-inserted characters divided by total inserted characters."
             )),
             type: "boolean",
@@ -54,7 +54,7 @@ configurationRegistry.registerConfiguration({
         },
         [EDIT_TELEMETRY_DETAILS_SETTING_ID]: {
             markdownDescription: ( localize(
-                11969,
+                12164,
                 "Controls whether to enable telemetry for detailed edit statistics (only sends statistics if general telemetry is enabled)."
             )),
             type: "boolean",
@@ -65,13 +65,13 @@ configurationRegistry.registerConfiguration({
             }
         },
         [EDIT_TELEMETRY_SHOW_STATUS_BAR]: {
-            markdownDescription: ( localize(11970, "Controls whether to show the status bar for edit telemetry.")),
+            markdownDescription: ( localize(12165, "Controls whether to show the status bar for edit telemetry.")),
             type: "boolean",
             default: false,
             tags: ["experimental"]
         },
         [EDIT_TELEMETRY_SHOW_DECORATIONS]: {
-            markdownDescription: ( localize(11971, "Controls whether to show decorations for edit telemetry.")),
+            markdownDescription: ( localize(12166, "Controls whether to show decorations for edit telemetry.")),
             type: "boolean",
             default: false,
             tags: ["experimental"]

package/vscode/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.js

@@ -176,7 +176,7 @@ let TelemetryContribution = class TelemetryContribution extends Disposable {
             constructor() {
                 super({
                     id: "workbench.action.showTelemetry",
-                    title: ( localize2(16498, "Show Telemetry")),
+                    title: ( localize2(16803, "Show Telemetry")),
                     category: Categories.Developer,
                     f1: true
                 });

package/vscode/src/vs/workbench/services/policies/browser/policyTelemetry.contribution.d.ts

@@ -0,0 +1,14 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IPolicyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/policy/common/policy.service";
+import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+export declare class PolicyTelemetryContribution extends Disposable implements IWorkbenchContribution {
+    private readonly policyService;
+    private readonly telemetryService;
+    static readonly ID = "workbench.contrib.policyTelemetry";
+    private lastSignature;
+    private readonly scheduler;
+    constructor(policyService: IPolicyService, telemetryService: ITelemetryService);
+    private report;
+    private buildEvent;
+}

package/vscode/src/vs/workbench/services/policies/browser/policyTelemetry.contribution.js

@@ -0,0 +1,134 @@
+
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { PolicyValueSource } from '@codingame/monaco-vscode-api/vscode/vs/platform/policy/common/policy';
+import { IPolicyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/policy/common/policy.service';
+import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+
+var PolicyNames;
+(function(PolicyNames) {
+    PolicyNames["DefaultModel"] = "ChatDefaultModel";
+    PolicyNames["ToolsAutoApprove"] = "ChatToolsAutoApprove";
+    PolicyNames["EnabledPlugins"] = "ChatEnabledPlugins";
+    PolicyNames["ExtraMarketplaces"] = "ChatExtraMarketplaces";
+    PolicyNames["StrictMarketplaces"] = "ChatStrictMarketplaces";
+    PolicyNames["ApprovedOrgs"] = "ChatApprovedAccountOrganizations";
+    PolicyNames["OtelEnabled"] = "CopilotOtelEnabled";
+    PolicyNames["TelemetryLevel"] = "TelemetryLevel";
+    PolicyNames["EnableFeedback"] = "EnableFeedback";
+})(PolicyNames || (PolicyNames = {}));
+let PolicyTelemetryContribution = class PolicyTelemetryContribution extends Disposable {
+    static {
+        this.ID = "workbench.contrib.policyTelemetry";
+    }
+    constructor(policyService, telemetryService) {
+        super();
+        this.policyService = policyService;
+        this.telemetryService = telemetryService;
+        this.scheduler = this._register(( new RunOnceScheduler(() => this.report(), 500)));
+        this.scheduler.schedule();
+        this._register(this.policyService.onDidChange(() => this.scheduler.schedule()));
+    }
+    report() {
+        const event = this.buildEvent();
+        const signature = JSON.stringify(event);
+        if (signature === this.lastSignature) {
+            return;
+        }
+        this.lastSignature = signature;
+        this.telemetryService.publicLog2("policy.applied", event);
+    }
+    buildEvent() {
+        const value = name => this.policyService.getPolicyValue(name);
+        let devicePolicyCount = 0;
+        let nativeMdmPolicyCount = 0;
+        let serverManagedSettingsPolicyCount = 0;
+        let fileManagedSettingsPolicyCount = 0;
+        let mixedManagedSettingsPolicyCount = 0;
+        let accountPolicyCount = 0;
+        let accountGatePolicyCount = 0;
+        for (const name in this.policyService.policyDefinitions) {
+            if (value(name) !== undefined) {
+                switch (this.policyService.getPolicyValueSource(name) ?? PolicyValueSource.Device) {
+                case PolicyValueSource.Device:
+                    devicePolicyCount++;
+                    break;
+                case PolicyValueSource.NativeMdm:
+                    nativeMdmPolicyCount++;
+                    break;
+                case PolicyValueSource.ServerManagedSettings:
+                    serverManagedSettingsPolicyCount++;
+                    break;
+                case PolicyValueSource.FileManagedSettings:
+                    fileManagedSettingsPolicyCount++;
+                    break;
+                case PolicyValueSource.MixedManagedSettings:
+                    mixedManagedSettingsPolicyCount++;
+                    break;
+                case PolicyValueSource.Account:
+                    accountPolicyCount++;
+                    break;
+                case PolicyValueSource.AccountGate:
+                    accountGatePolicyCount++;
+                    break;
+                }
+            }
+        }
+        const defaultModel = value(PolicyNames.DefaultModel);
+        const toolsAutoApprove = value(PolicyNames.ToolsAutoApprove);
+        const strictMarketplaces = value(PolicyNames.StrictMarketplaces);
+        const otel = value(PolicyNames.OtelEnabled);
+        const telemetryLevel = value(PolicyNames.TelemetryLevel);
+        return {
+            devicePolicyCount,
+            nativeMdmPolicyCount,
+            serverManagedSettingsPolicyCount,
+            fileManagedSettingsPolicyCount,
+            mixedManagedSettingsPolicyCount,
+            accountPolicyCount,
+            accountGatePolicyCount,
+            defaultModelSet: defaultModel !== undefined,
+            toolsAutoApproveSet: toolsAutoApprove !== undefined,
+            enabledPluginsSet: value(PolicyNames.EnabledPlugins) !== undefined,
+            extraMarketplacesSet: value(PolicyNames.ExtraMarketplaces) !== undefined,
+            strictMarketplacesSet: strictMarketplaces !== undefined,
+            approvedOrgsSet: value(PolicyNames.ApprovedOrgs) !== undefined,
+            otelSet: otel !== undefined,
+            telemetryLevelSet: telemetryLevel !== undefined,
+            enableFeedbackSet: value(PolicyNames.EnableFeedback) !== undefined,
+            defaultModelForcedToAuto: defaultModel === "auto",
+            toolsAutoApproveForcedOff: toolsAutoApprove === false,
+            strictMarketplacesLockdown: isEmptyMarketplaceAllowlist(strictMarketplaces),
+            otelForcedEnabled: otel === true,
+            telemetryLevel: telemetryLevelBucket(telemetryLevel)
+        };
+    }
+};
+PolicyTelemetryContribution = ( __decorate([( __param(0, IPolicyService)), ( __param(1, ITelemetryService))], PolicyTelemetryContribution));
+function isEmptyMarketplaceAllowlist(rawValue) {
+    if (typeof rawValue !== "string") {
+        return false;
+    }
+    try {
+        const parsed = JSON.parse(rawValue);
+        return Array.isArray(parsed) && parsed.length === 0;
+    } catch {
+        return false;
+    }
+}
+const KNOWN_TELEMETRY_LEVELS = ( new Set(["off", "crash", "error", "all"]));
+function telemetryLevelBucket(rawValue) {
+    if (rawValue === undefined) {
+        return undefined;
+    }
+    return typeof rawValue === "string" && ( KNOWN_TELEMETRY_LEVELS.has(rawValue)) ? rawValue : "unknown";
+}
+registerWorkbenchContribution2(
+    PolicyTelemetryContribution.ID,
+    PolicyTelemetryContribution,
+    WorkbenchPhase.AfterRestored
+);
+
+export { PolicyTelemetryContribution };