@codingame/monaco-vscode-telemetry-service-override 26.2.2 → 28.0.0

package/index.js

@@ -5,15 +5,12 @@ import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platfo
 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';
 
 function getServiceOverride() {
     return {
         [ITelemetryService.toString()]: new SyncDescriptor(TelemetryService, [], true),
-        [IDataChannelService.toString()]: new SyncDescriptor(DataChannelService, [], true),
-        [IRandomService.toString()]: new SyncDescriptor(RandomService, [], true)
+        [IDataChannelService.toString()]: new SyncDescriptor(DataChannelService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-telemetry-service-override",
-  "version": "26.2.2",
+  "version": "28.0.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": "26.2.2",
+    "@codingame/monaco-vscode-api": "28.0.0",
     "@microsoft/1ds-core-js": "3.2.18",
     "@microsoft/1ds-post-js": "3.2.18"
   },

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

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

package/vscode/src/vs/platform/telemetry/common/telemetryService.d.ts

@@ -1,4 +1,5 @@
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IMeteredConnectionService } from "@codingame/monaco-vscode-api/vscode/vs/platform/meteredConnection/common/meteredConnection.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/gdprTypings";
 import { ITelemetryData, TelemetryLevel, ICommonProperties } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry";
@@ -14,6 +15,10 @@ export interface ITelemetryServiceConfig {
      * (up to 10 seconds) to ensure experiment context is attached to all events.
      */
     waitForExperimentProperties?: boolean;
+    /**
+     * If provided, telemetry events will be dropped when the connection is metered.
+     */
+    meteredConnectionService?: IMeteredConnectionService;
 }
 export declare class TelemetryService implements ITelemetryService {
     private _configurationService;
@@ -35,6 +40,7 @@ export declare class TelemetryService implements ITelemetryService {
     private _piiPaths;
     private _telemetryLevel;
     private _sendErrorTelemetry;
+    private readonly _meteredConnectionService;
     private _pendingEvents;
     private _isExperimentPropertySet;
     private _flushTimeout;

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

@@ -50,6 +50,7 @@ let TelemetryService = class TelemetryService {
         this._piiPaths = config.piiPaths || [];
         this._telemetryLevel = TelemetryLevel.USAGE;
         this._sendErrorTelemetry = !!config.sendErrorTelemetry;
+        this._meteredConnectionService = config.meteredConnectionService;
         this._cleanupPatterns = [/(vscode-)?file:\/\/.*?\/resources\/app\//gi];
         for (const piiPath of this._piiPaths) {
             this._cleanupPatterns.push(( new RegExp(escapeRegExpCharacters(piiPath), "gi")));
@@ -114,6 +115,9 @@ let TelemetryService = class TelemetryService {
         if (this._telemetryLevel < eventLevel) {
             return;
         }
+        if (this._meteredConnectionService?.isConnectionMetered) {
+            return;
+        }
         if (!this._isExperimentPropertySet) {
             if (this._pendingEvents.length < TelemetryService_1.MAX_BUFFER_SIZE) {
                 this._pendingEvents.push({
@@ -151,28 +155,28 @@ let TelemetryService = class TelemetryService {
 TelemetryService = TelemetryService_1 = ( __decorate([( __param(1, IConfigurationService)), ( __param(2, IProductService))], TelemetryService));
 function getTelemetryLevelSettingDescription() {
     const telemetryText = ( localize(
-        2065,
+        2103,
         "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(
-        2066,
+        2104,
         "Read more about the [data we collect]({0}).",
         "https://aka.ms/vscode-telemetry"
     )) : ( localize(
-        2067,
+        2105,
         "Read more about the [data we collect]({0}) and our [privacy statement]({1}).",
         "https://aka.ms/vscode-telemetry",
         product.privacyStatementUrl
     ));
     const restartString = !isWeb ? ( localize(
-        2068,
+        2106,
         "A full restart of the application is necessary for crash reporting changes to take effect."
     )) : "";
-    const crashReportsHeader = ( localize(2069, "Crash Reports"));
-    const errorsHeader = ( localize(2070, "Error Telemetry"));
-    const usageHeader = ( localize(2071, "Usage Data"));
-    const telemetryTableDescription = ( localize(2072, "The following table outlines the data sent with each setting:"));
+    const crashReportsHeader = ( localize(2107, "Crash Reports"));
+    const errorsHeader = ( localize(2108, "Error Telemetry"));
+    const usageHeader = ( localize(2109, "Usage Data"));
+    const telemetryTableDescription = ( localize(2110, "The following table outlines the data sent with each setting:"));
     const telemetryTable = `
 |       | ${crashReportsHeader} | ${errorsHeader} | ${usageHeader} |
 |:------|:-------------:|:---------------:|:----------:|
@@ -182,7 +186,7 @@ function getTelemetryLevelSettingDescription() {
 | off   |       -       |        -        |     -      |
 `;
     const deprecatedSettingNote = ( localize(
-        2073,
+        2111,
         "****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 = `
@@ -204,7 +208,7 @@ configurationRegistry.registerConfiguration({
     "id": TELEMETRY_SECTION_ID,
     "order": 1,
     "type": "object",
-    "title": ( localize(2074, "Telemetry")),
+    "title": ( localize(2112, "Telemetry")),
     "properties": {
         [TELEMETRY_SETTING_ID]: {
             "type": "string",
@@ -214,7 +218,7 @@ configurationRegistry.registerConfiguration({
                 TelemetryConfiguration.CRASH,
                 TelemetryConfiguration.OFF
             ],
-            "enumDescriptions": [( localize(2075, "Sends usage data, errors, and crash reports.")), ( localize(2076, "Sends general error telemetry and crash reports.")), ( localize(2077, "Sends OS level crash reports.")), ( localize(2078, "Disables all product telemetry."))],
+            "enumDescriptions": [( localize(2113, "Sends usage data, errors, and crash reports.")), ( localize(2114, "Sends general error telemetry and crash reports.")), ( localize(2115, "Sends OS level crash reports.")), ( localize(2116, "Disables all product telemetry."))],
             "markdownDescription": getTelemetryLevelSettingDescription(),
             "default": TelemetryConfiguration.ON,
             "restricted": true,
@@ -227,20 +231,20 @@ configurationRegistry.registerConfiguration({
                 localization: {
                     description: {
                         key: "telemetry.telemetryLevel.policyDescription",
-                        value: ( localize(2079, "Controls the level of telemetry."))
+                        value: ( localize(2117, "Controls the level of telemetry."))
                     },
                     enumDescriptions: [{
                         key: "telemetry.telemetryLevel.default",
-                        value: ( localize(2075, "Sends usage data, errors, and crash reports."))
+                        value: ( localize(2113, "Sends usage data, errors, and crash reports."))
                     }, {
                         key: "telemetry.telemetryLevel.error",
-                        value: ( localize(2076, "Sends general error telemetry and crash reports."))
+                        value: ( localize(2114, "Sends general error telemetry and crash reports."))
                     }, {
                         key: "telemetry.telemetryLevel.crash",
-                        value: ( localize(2077, "Sends OS level crash reports."))
+                        value: ( localize(2115, "Sends OS level crash reports."))
                     }, {
                         key: "telemetry.telemetryLevel.off",
-                        value: ( localize(2078, "Disables all product telemetry."))
+                        value: ( localize(2116, "Disables all product telemetry."))
                     }]
                 }
             }
@@ -249,7 +253,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             description: ( localize(
-                2080,
+                2118,
                 "Enable feedback mechanisms such as the issue reporter, surveys, and other feedback options."
             )),
             policy: {
@@ -260,7 +264,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "telemetry.feedback.enabled",
                         value: ( localize(
-                            2080,
+                            2118,
                             "Enable feedback mechanisms such as the issue reporter, surveys, and other feedback options."
                         ))
                     }
@@ -270,11 +274,11 @@ configurationRegistry.registerConfiguration({
         [TELEMETRY_OLD_SETTING_ID]: {
             "type": "boolean",
             "markdownDescription": !product.privacyStatementUrl ? ( localize(
-                2081,
+                2119,
                 "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(
-                2082,
+                2120,
                 "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
@@ -282,7 +286,7 @@ configurationRegistry.registerConfiguration({
             "default": true,
             "restricted": true,
             "markdownDeprecationMessage": ( localize(
-                2083,
+                2121,
                 "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/telemetry/browser/telemetry.contribution.js

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

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

@@ -1,7 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { ILoggerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
-import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ClassifiedEvent, IGDPRProperty, OmitMetadata, StrictPropertyCheck } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/gdprTypings";
@@ -9,6 +8,7 @@ import { ITelemetryData, TelemetryLevel } from "@codingame/monaco-vscode-api/vsc
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IBrowserWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service";
 import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service";
+import { IMeteredConnectionService } from "@codingame/monaco-vscode-api/vscode/vs/platform/meteredConnection/common/meteredConnection.service";
 export declare class TelemetryService extends Disposable implements ITelemetryService {
     readonly _serviceBrand: undefined;
     private impl;
@@ -19,7 +19,7 @@ export declare class TelemetryService extends Disposable implements ITelemetrySe
     get devDeviceId(): string;
     get firstSessionDate(): string;
     get msftInternal(): boolean | undefined;
-    constructor(environmentService: IBrowserWorkbenchEnvironmentService, logService: ILogService, loggerService: ILoggerService, configurationService: IConfigurationService, storageService: IStorageService, productService: IProductService, remoteAgentService: IRemoteAgentService);
+    constructor(environmentService: IBrowserWorkbenchEnvironmentService, loggerService: ILoggerService, configurationService: IConfigurationService, storageService: IStorageService, productService: IProductService, remoteAgentService: IRemoteAgentService, meteredConnectionService: IMeteredConnectionService);
     /**
      * Initializes the telemetry service to be a full fledged service.
      * This is only done once and only when telemetry is enabled as this will also ping the endpoint to

package/vscode/src/vs/workbench/services/telemetry/browser/telemetryService.js

@@ -3,7 +3,7 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
-import { ILogService, ILoggerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { ILoggerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { OneDataSystemWebAppender } from '../../../../platform/telemetry/browser/1dsAppender.js';
@@ -14,6 +14,7 @@ import { TelemetryService as TelemetryService$1 } from '../../../../platform/tel
 import { NullTelemetryService, supportsTelemetry, getTelemetryLevel, isInternalTelemetry, isLoggingOnly } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
 import { IBrowserWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/browser/environmentService.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
+import { IMeteredConnectionService } from '@codingame/monaco-vscode-api/vscode/vs/platform/meteredConnection/common/meteredConnection.service';
 import { resolveWorkbenchCommonProperties } from './workbenchCommonProperties.js';
 import { experimentsEnabled } from '../common/workbenchTelemetryUtils.js';
 
@@ -38,47 +39,47 @@ let TelemetryService = class TelemetryService extends Disposable {
     }
     constructor(
         environmentService,
-        logService,
         loggerService,
         configurationService,
         storageService,
         productService,
-        remoteAgentService
+        remoteAgentService,
+        meteredConnectionService
     ) {
         super();
         this.impl = NullTelemetryService;
         this.sendErrorTelemetry = true;
         this.impl = this.initializeService(
             environmentService,
-            logService,
             loggerService,
             configurationService,
             storageService,
             productService,
-            remoteAgentService
+            remoteAgentService,
+            meteredConnectionService
         );
         this._register(configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration(TELEMETRY_SETTING_ID)) {
                 this.impl = this.initializeService(
                     environmentService,
-                    logService,
                     loggerService,
                     configurationService,
                     storageService,
                     productService,
-                    remoteAgentService
+                    remoteAgentService,
+                    meteredConnectionService
                 );
             }
         }));
     }
     initializeService(
         environmentService,
-        logService,
         loggerService,
         configurationService,
         storageService,
         productService,
-        remoteAgentService
+        remoteAgentService,
+        meteredConnectionService
     ) {
         const telemetrySupported = supportsTelemetry(productService, environmentService) && productService.aiConfig?.ariaKey;
         if (telemetrySupported && getTelemetryLevel(configurationService) !== TelemetryLevel.NONE && this.impl === NullTelemetryService) {
@@ -106,7 +107,8 @@ let TelemetryService = class TelemetryService extends Disposable {
                     environmentService.options && environmentService.options.resolveCommonTelemetryProperties
                 ),
                 sendErrorTelemetry: this.sendErrorTelemetry,
-                waitForExperimentProperties: experimentsEnabled(configurationService, productService, environmentService)
+                waitForExperimentProperties: experimentsEnabled(configurationService, productService, environmentService),
+                meteredConnectionService
             };
             return this._register(( new TelemetryService$1(config, configurationService, productService)));
         }
@@ -131,6 +133,6 @@ let TelemetryService = class TelemetryService extends Disposable {
         this.publicLogError(eventName, data);
     }
 };
-TelemetryService = ( __decorate([( __param(0, IBrowserWorkbenchEnvironmentService)), ( __param(1, ILogService)), ( __param(2, ILoggerService)), ( __param(3, IConfigurationService)), ( __param(4, IStorageService)), ( __param(5, IProductService)), ( __param(6, IRemoteAgentService))], TelemetryService));
+TelemetryService = ( __decorate([( __param(0, IBrowserWorkbenchEnvironmentService)), ( __param(1, ILoggerService)), ( __param(2, IConfigurationService)), ( __param(3, IStorageService)), ( __param(4, IProductService)), ( __param(5, IRemoteAgentService)), ( __param(6, IMeteredConnectionService))], TelemetryService));
 
 export { TelemetryService };

package/vscode/src/vs/workbench/contrib/editTelemetry/browser/randomService.d.ts

@@ -1,7 +0,0 @@
-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

@@ -1,13 +0,0 @@
-
-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 };