@codingame/monaco-vscode-telemetry-service-override 22.1.9 → 23.0.0

package/index.js

@@ -5,13 +5,16 @@ import '@codingame/monaco-vscode-api/services';
 import { TelemetryService } from './vscode/src/vs/workbench/services/telemetry/browser/telemetryService.js';
 import { IDataChannelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dataChannel/common/dataChannel.service';
 import { DataChannelService } from './vscode/src/vs/workbench/services/dataChannel/browser/dataChannelService.js';
+import { IRandomService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/randomService.service';
+import { RandomService } from './vscode/src/vs/workbench/contrib/editTelemetry/browser/randomService.js';
 import './vscode/src/vs/workbench/contrib/telemetry/browser/telemetry.contribution.js';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 
 function getServiceOverride() {
     return {
         [ITelemetryService.toString()]: new SyncDescriptor(TelemetryService, [], true),
-        [IDataChannelService.toString()]: new SyncDescriptor(DataChannelService, [], true)
+        [IDataChannelService.toString()]: new SyncDescriptor(DataChannelService, [], true),
+        [IRandomService.toString()]: new SyncDescriptor(RandomService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-telemetry-service-override",
-  "version": "22.1.9",
+  "version": "23.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - telemetry service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "22.1.9",
-    "@codingame/monaco-vscode-api": "22.1.9",
+    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "23.0.0",
+    "@codingame/monaco-vscode-api": "23.0.0",
     "@microsoft/1ds-core-js": "3.2.18",
     "@microsoft/1ds-post-js": "3.2.18"
   },

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

@@ -1,6 +1,6 @@
 
 import { binarySearch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { errorHandler, ErrorNoTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { errorHandler, ErrorNoTelemetry, PendingMigrationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { DisposableStore, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { safeStringify } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { FileOperationError } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
@@ -44,7 +44,7 @@ class BaseErrorTelemetry {
         if (err.detail && err.detail.stack) {
             err = err.detail;
         }
-        if (ErrorNoTelemetry.isErrorNoTelemetry(err) || err instanceof FileOperationError || (typeof err?.message === 'string' && err.message.includes('Unable to read file'))) {
+        if (ErrorNoTelemetry.isErrorNoTelemetry(err) || err instanceof FileOperationError || PendingMigrationError.is(err) || (typeof err?.message === 'string' && err.message.includes('Unable to read file'))) {
             return;
         }
         const callstack = Array.isArray(err.stack) ? err.stack.join('\n') : err.stack;

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(2032, "Telemetry{0}", logSuffix)),
+                name: ( localize(2042, "Telemetry{0}", logSuffix)),
                 group: TelemetryLogGroup,
                 hidden: true
             }));

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

@@ -3,6 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { mixin } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { isWeb } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { PolicyCategory } from '@codingame/monaco-vscode-api/vscode/vs/base/common/policy';
 import { escapeRegExpCharacters } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
@@ -103,30 +104,30 @@ TelemetryService = ( __decorate([
 ], TelemetryService));
 function getTelemetryLevelSettingDescription() {
     const telemetryText = ( localize(
-        2033,
+        2043,
         "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(
-        2034,
+        2044,
         "Read more about the [data we collect]({0}).",
         'https://aka.ms/vscode-telemetry'
     )) :
         ( localize(
-        2035,
+        2045,
         "Read more about the [data we collect]({0}) and our [privacy statement]({1}).",
         'https://aka.ms/vscode-telemetry',
         product.privacyStatementUrl
     ));
     const restartString = !isWeb ? ( localize(
-        2036,
+        2046,
         'A full restart of the application is necessary for crash reporting changes to take effect.'
     )) : '';
-    const crashReportsHeader = ( localize(2037, "Crash Reports"));
-    const errorsHeader = ( localize(2038, "Error Telemetry"));
-    const usageHeader = ( localize(2039, "Usage Data"));
-    const telemetryTableDescription = ( localize(2040, "The following table outlines the data sent with each setting:"));
+    const crashReportsHeader = ( localize(2047, "Crash Reports"));
+    const errorsHeader = ( localize(2048, "Error Telemetry"));
+    const usageHeader = ( localize(2049, "Usage Data"));
+    const telemetryTableDescription = ( localize(2050, "The following table outlines the data sent with each setting:"));
     const telemetryTable = `
 |       | ${crashReportsHeader} | ${errorsHeader} | ${usageHeader} |
 |:------|:-------------:|:---------------:|:----------:|
@@ -136,7 +137,7 @@ function getTelemetryLevelSettingDescription() {
 | off   |       -       |        -        |     -      |
 `;
     const deprecatedSettingNote = ( localize(
-        2041,
+        2051,
         "****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 = `
@@ -158,16 +159,16 @@ configurationRegistry.registerConfiguration({
     'id': TELEMETRY_SECTION_ID,
     'order': 1,
     'type': 'object',
-    'title': ( localize(2042, "Telemetry")),
+    'title': ( localize(2052, "Telemetry")),
     'properties': {
         [TELEMETRY_SETTING_ID]: {
             'type': 'string',
             'enum': [TelemetryConfiguration.ON, TelemetryConfiguration.ERROR, TelemetryConfiguration.CRASH, TelemetryConfiguration.OFF],
             'enumDescriptions': [
-                ( localize(2043, "Sends usage data, errors, and crash reports.")),
-                ( localize(2044, "Sends general error telemetry and crash reports.")),
-                ( localize(2045, "Sends OS level crash reports.")),
-                ( localize(2046, "Disables all product telemetry."))
+                ( localize(2053, "Sends usage data, errors, and crash reports.")),
+                ( localize(2054, "Sends general error telemetry and crash reports.")),
+                ( localize(2055, "Sends OS level crash reports.")),
+                ( localize(2056, "Disables all product telemetry."))
             ],
             'markdownDescription': getTelemetryLevelSettingDescription(),
             'default': TelemetryConfiguration.ON,
@@ -176,32 +177,61 @@ configurationRegistry.registerConfiguration({
             'tags': ['usesOnlineServices', 'telemetry'],
             'policy': {
                 name: 'TelemetryLevel',
+                category: PolicyCategory.Telemetry,
                 minimumVersion: '1.99',
-                description: ( localize(2047, "Controls the level of telemetry.")),
+                localization: {
+                    description: {
+                        key: 'telemetry.telemetryLevel.policyDescription',
+                        value: ( localize(2057, "Controls the level of telemetry.")),
+                    },
+                    enumDescriptions: [
+                        {
+                            key: 'telemetry.telemetryLevel.default',
+                            value: ( localize(2053, "Sends usage data, errors, and crash reports.")),
+                        },
+                        {
+                            key: 'telemetry.telemetryLevel.error',
+                            value: ( localize(2054, "Sends general error telemetry and crash reports.")),
+                        },
+                        {
+                            key: 'telemetry.telemetryLevel.crash',
+                            value: ( localize(2055, "Sends OS level crash reports.")),
+                        },
+                        {
+                            key: 'telemetry.telemetryLevel.off',
+                            value: ( localize(2056, "Disables all product telemetry.")),
+                        }
+                    ]
+                }
             }
         },
         'telemetry.feedback.enabled': {
             type: 'boolean',
             default: true,
             description: ( localize(
-                2048,
+                2058,
                 "Enable feedback mechanisms such as the issue reporter, surveys, and other feedback options."
             )),
             policy: {
                 name: 'EnableFeedback',
+                category: PolicyCategory.Telemetry,
                 minimumVersion: '1.99',
+                localization: { description: { key: 'telemetry.feedback.enabled', value: ( localize(
+                    2058,
+                    "Enable feedback mechanisms such as the issue reporter, surveys, and other feedback options."
+                )) } },
             }
         },
         [TELEMETRY_OLD_SETTING_ID]: {
             'type': 'boolean',
             'markdownDescription': !product.privacyStatementUrl ?
                 ( localize(
-                2049,
+                2059,
                 "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(
-                2050,
+                2060,
                 "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
@@ -209,7 +239,7 @@ configurationRegistry.registerConfiguration({
             'default': true,
             'restricted': true,
             'markdownDeprecationMessage': ( localize(
-                2051,
+                2061,
                 "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/randomService.d.ts

@@ -0,0 +1,7 @@
+import { IRandomService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/editTelemetry/browser/randomService.service";
+export declare class RandomService implements IRandomService {
+    readonly _serviceBrand: undefined;
+    generateUuid(): string;
+    /** Namespace should be 3 letter. */
+    generatePrefixedUuid(namespace: string): string;
+}

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

@@ -0,0 +1,13 @@
+
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
+
+class RandomService {
+    generateUuid() {
+        return generateUuid();
+    }
+    generatePrefixedUuid(namespace) {
+        return `${namespace}-${this.generateUuid()}`;
+    }
+}
+
+export { RandomService };

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

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

package/vscode/src/vs/workbench/services/telemetry/browser/workbenchCommonProperties.d.ts

@@ -1,5 +1,5 @@
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ICommonProperties } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry";
 export declare function resolveWorkbenchCommonProperties(storageService: IStorageService, commit: string | undefined, version: string | undefined, isInternalTelemetry: boolean, remoteAuthority?: string, productIdentifier?: string, removeMachineId?: boolean, resolveAdditionalProperties?: () => {
-    [key: string]: any;
+    [key: string]: unknown;
 }): ICommonProperties;