@codingame/monaco-vscode-telemetry-service-override 30.0.1 → 31.0.0

package/package.json

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

package/vscode/src/vs/platform/telemetry/browser/errorTelemetry.d.ts

@@ -1,4 +1,4 @@
-import BaseErrorTelemetry from "../common/errorTelemetry.js";
+import BaseErrorTelemetry from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/errorTelemetry";
 export default class ErrorTelemetry extends BaseErrorTelemetry {
     protected installErrorListeners(): void;
     private _onUncaughtError;

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

@@ -2,7 +2,7 @@
 import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
 import { ErrorNoTelemetry } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import BaseErrorTelemetry from '../common/errorTelemetry.js';
+import BaseErrorTelemetry from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/errorTelemetry';
 
 class ErrorTelemetry extends BaseErrorTelemetry {
     installErrorListeners() {

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

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

@@ -48,6 +48,7 @@ export declare class TelemetryService implements ITelemetryService {
     private _cleanupPatterns;
     constructor(config: ITelemetryServiceConfig, _configurationService: IConfigurationService, _productService: IProductService);
     setExperimentProperty(name: string, value: string): void;
+    setCommonProperty(name: string, value: string): void;
     private _flushPendingEvents;
     private _updateTelemetryLevel;
     get sendErrorTelemetry(): boolean;

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

@@ -12,7 +12,7 @@ import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/com
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { TelemetryLevel, TELEMETRY_SETTING_ID, TELEMETRY_OLD_SETTING_ID, TELEMETRY_CRASH_REPORTER_SETTING_ID, TelemetryConfiguration, TELEMETRY_SECTION_ID } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry';
-import { getTelemetryLevel, cleanData } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
+import { TelemetryTrustedValue, getTelemetryLevel, cleanData } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetryUtils';
 
 var TelemetryService_1;
 let TelemetryService = class TelemetryService {
@@ -72,11 +72,14 @@ let TelemetryService = class TelemetryService {
         }
     }
     setExperimentProperty(name, value) {
-        this._experimentProperties[name] = value;
+        this._experimentProperties[name] = ( new TelemetryTrustedValue(value));
         if (!this._isExperimentPropertySet) {
             this._flushPendingEvents();
         }
     }
+    setCommonProperty(name, value) {
+        this._commonProperties[name] = value;
+    }
     _flushPendingEvents() {
         if (this._isExperimentPropertySet) {
             return;
@@ -134,6 +137,12 @@ let TelemetryService = class TelemetryService {
         data = mixin(data, this._experimentProperties);
         data = cleanData(data, this._cleanupPatterns);
         data = mixin(data, this._commonProperties);
+        if (eventLevel === TelemetryLevel.ERROR) {
+            data = {
+                ...data,
+                "isError": true
+            };
+        }
         this._appenders.forEach(a => a.log(eventName, data ?? {}));
     }
     publicLog(eventName, data) {
@@ -155,28 +164,28 @@ let TelemetryService = class TelemetryService {
 TelemetryService = TelemetryService_1 = ( __decorate([( __param(1, IConfigurationService)), ( __param(2, IProductService))], TelemetryService));
 function getTelemetryLevelSettingDescription() {
     const telemetryText = ( localize(
-        2109,
+        2112,
         "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(
-        2110,
+        2113,
         "Read more about the [data we collect]({0}).",
         "https://aka.ms/vscode-telemetry"
     )) : ( localize(
-        2111,
+        2114,
         "Read more about the [data we collect]({0}) and our [privacy statement]({1}).",
         "https://aka.ms/vscode-telemetry",
         product.privacyStatementUrl
     ));
     const restartString = !isWeb ? ( localize(
-        2112,
+        2115,
         "A full restart of the application is necessary for crash reporting changes to take effect."
     )) : "";
-    const crashReportsHeader = ( localize(2113, "Crash Reports"));
-    const errorsHeader = ( localize(2114, "Error Telemetry"));
-    const usageHeader = ( localize(2115, "Usage Data"));
-    const telemetryTableDescription = ( localize(2116, "The following table outlines the data sent with each setting:"));
+    const crashReportsHeader = ( localize(2116, "Crash Reports"));
+    const errorsHeader = ( localize(2117, "Error Telemetry"));
+    const usageHeader = ( localize(2118, "Usage Data"));
+    const telemetryTableDescription = ( localize(2119, "The following table outlines the data sent with each setting:"));
     const telemetryTable = `
 |       | ${crashReportsHeader} | ${errorsHeader} | ${usageHeader} |
 |:------|:-------------:|:---------------:|:----------:|
@@ -186,7 +195,7 @@ function getTelemetryLevelSettingDescription() {
 | off   |       -       |        -        |     -      |
 `;
     const deprecatedSettingNote = ( localize(
-        2117,
+        2120,
         "****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 = `
@@ -208,7 +217,7 @@ configurationRegistry.registerConfiguration({
     "id": TELEMETRY_SECTION_ID,
     "order": 1,
     "type": "object",
-    "title": ( localize(2118, "Telemetry")),
+    "title": ( localize(2121, "Telemetry")),
     "properties": {
         [TELEMETRY_SETTING_ID]: {
             "type": "string",
@@ -218,7 +227,7 @@ configurationRegistry.registerConfiguration({
                 TelemetryConfiguration.CRASH,
                 TelemetryConfiguration.OFF
             ],
-            "enumDescriptions": [( localize(2119, "Sends usage data, errors, and crash reports.")), ( localize(2120, "Sends general error telemetry and crash reports.")), ( localize(2121, "Sends OS level crash reports.")), ( localize(2122, "Disables all product telemetry."))],
+            "enumDescriptions": [( localize(2122, "Sends usage data, errors, and crash reports.")), ( localize(2123, "Sends general error telemetry and crash reports.")), ( localize(2124, "Sends OS level crash reports.")), ( localize(2125, "Disables all product telemetry."))],
             "markdownDescription": getTelemetryLevelSettingDescription(),
             "default": TelemetryConfiguration.ON,
             "restricted": true,
@@ -231,20 +240,20 @@ configurationRegistry.registerConfiguration({
                 localization: {
                     description: {
                         key: "telemetry.telemetryLevel.policyDescription",
-                        value: ( localize(2123, "Controls the level of telemetry."))
+                        value: ( localize(2126, "Controls the level of telemetry."))
                     },
                     enumDescriptions: [{
                         key: "telemetry.telemetryLevel.default",
-                        value: ( localize(2119, "Sends usage data, errors, and crash reports."))
+                        value: ( localize(2122, "Sends usage data, errors, and crash reports."))
                     }, {
                         key: "telemetry.telemetryLevel.error",
-                        value: ( localize(2120, "Sends general error telemetry and crash reports."))
+                        value: ( localize(2123, "Sends general error telemetry and crash reports."))
                     }, {
                         key: "telemetry.telemetryLevel.crash",
-                        value: ( localize(2121, "Sends OS level crash reports."))
+                        value: ( localize(2124, "Sends OS level crash reports."))
                     }, {
                         key: "telemetry.telemetryLevel.off",
-                        value: ( localize(2122, "Disables all product telemetry."))
+                        value: ( localize(2125, "Disables all product telemetry."))
                     }]
                 }
             }
@@ -253,7 +262,7 @@ configurationRegistry.registerConfiguration({
             type: "boolean",
             default: true,
             description: ( localize(
-                2124,
+                2127,
                 "Enable feedback mechanisms such as the issue reporter, surveys, and other feedback options."
             )),
             policy: {
@@ -264,7 +273,7 @@ configurationRegistry.registerConfiguration({
                     description: {
                         key: "telemetry.feedback.enabled",
                         value: ( localize(
-                            2124,
+                            2127,
                             "Enable feedback mechanisms such as the issue reporter, surveys, and other feedback options."
                         ))
                     }
@@ -274,11 +283,11 @@ configurationRegistry.registerConfiguration({
         [TELEMETRY_OLD_SETTING_ID]: {
             "type": "boolean",
             "markdownDescription": !product.privacyStatementUrl ? ( localize(
-                2125,
+                2128,
                 "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(
-                2126,
+                2129,
                 "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
@@ -286,7 +295,7 @@ configurationRegistry.registerConfiguration({
             "default": true,
             "restricted": true,
             "markdownDeprecationMessage": ( localize(
-                2127,
+                2130,
                 "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(13327, "Show Telemetry")),
+                    title: ( localize2(13462, "Show Telemetry")),
                     category: Categories.Developer,
                     f1: true
                 });
@@ -335,6 +335,7 @@ let ConfigurationTelemetryContribution = class ConfigurationTelemetryContributio
             });
             return;
         case TerminalContribSettingId.AgentSandboxEnabled:
+        case TerminalContribSettingId.DeprecatedAgentSandboxEnabled:
             this.telemetryService.publicLog2("chat.agent.sandbox", {
                 settingValue: this.getValueToReport(key, target),
                 source

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

@@ -28,6 +28,7 @@ export declare class TelemetryService extends Disposable implements ITelemetrySe
      */
     private initializeService;
     setExperimentProperty(name: string, value: string): void;
+    setCommonProperty(name: string, value: string): void;
     get telemetryLevel(): TelemetryLevel;
     publicLog(eventName: string, data?: ITelemetryData): void;
     publicLog2<E extends ClassifiedEvent<OmitMetadata<T>> = never, T extends IGDPRProperty = never>(eventName: string, data?: StrictPropertyCheck<T, E>): void;

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

@@ -132,6 +132,9 @@ let TelemetryService = class TelemetryService extends Disposable {
     setExperimentProperty(name, value) {
         return this.impl.setExperimentProperty(name, value);
     }
+    setCommonProperty(name, value) {
+        this.impl.setCommonProperty(name, value);
+    }
     get telemetryLevel() {
         return this.impl.telemetryLevel;
     }

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

@@ -1,29 +0,0 @@
-import { DisposableStore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
-export interface ErrorEvent {
-    callstack: string;
-    msg?: string;
-    file?: string;
-    line?: number;
-    column?: number;
-    uncaught_error_name?: string;
-    uncaught_error_msg?: string;
-    count?: number;
-}
-export declare namespace ErrorEvent {
-    function compare(a: ErrorEvent, b: ErrorEvent): 1 | 0 | -1;
-}
-export default abstract class BaseErrorTelemetry {
-    static ERROR_FLUSH_TIMEOUT: number;
-    private _telemetryService;
-    private _flushDelay;
-    private _flushHandle;
-    private _buffer;
-    protected readonly _disposables: DisposableStore;
-    constructor(telemetryService: ITelemetryService, flushDelay?: number);
-    dispose(): void;
-    protected installErrorListeners(): void;
-    private _onErrorEvent;
-    protected _enqueue(e: ErrorEvent): void;
-    private _flushBuffer;
-}

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

@@ -1,86 +0,0 @@
-
-import { binarySearch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-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';
-
-var ErrorEvent;
-(function(ErrorEvent) {
-    function compare(a, b) {
-        if (a.callstack < b.callstack) {
-            return -1;
-        } else if (a.callstack > b.callstack) {
-            return 1;
-        }
-        return 0;
-    }
-    ErrorEvent.compare = compare;
-})(ErrorEvent || (ErrorEvent = {}));
-class BaseErrorTelemetry {
-    static {
-        this.ERROR_FLUSH_TIMEOUT = 5 * 1000;
-    }
-    constructor(telemetryService, flushDelay = BaseErrorTelemetry.ERROR_FLUSH_TIMEOUT) {
-        this._flushHandle = undefined;
-        this._buffer = [];
-        this._disposables = ( new DisposableStore());
-        this._telemetryService = telemetryService;
-        this._flushDelay = flushDelay;
-        const unbind = errorHandler.addListener(err => this._onErrorEvent(err));
-        this._disposables.add(toDisposable(unbind));
-        this.installErrorListeners();
-    }
-    dispose() {
-        clearTimeout(this._flushHandle);
-        this._flushBuffer();
-        this._disposables.dispose();
-    }
-    installErrorListeners() {}
-    _onErrorEvent(err) {
-        if (!err || err.code) {
-            return;
-        }
-        if (err.detail && err.detail.stack) {
-            err = err.detail;
-        }
-        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;
-        const msg = err.message ? err.message : safeStringify(err);
-        if (!callstack) {
-            return;
-        }
-        this._enqueue({
-            msg,
-            callstack
-        });
-    }
-    _enqueue(e) {
-        const idx = binarySearch(this._buffer, e, ErrorEvent.compare);
-        if (idx < 0) {
-            e.count = 1;
-            this._buffer.splice(~idx, 0, e);
-        } else {
-            if (!this._buffer[idx].count) {
-                this._buffer[idx].count = 0;
-            }
-            this._buffer[idx].count += 1;
-        }
-        if (this._flushHandle === undefined) {
-            this._flushHandle = setTimeout(() => {
-                this._flushBuffer();
-                this._flushHandle = undefined;
-            }, this._flushDelay);
-        }
-    }
-    _flushBuffer() {
-        for (const error of this._buffer) {
-            this._telemetryService.publicLogError2("UnhandledError", error);
-        }
-        this._buffer.length = 0;
-    }
-}
-
-export { ErrorEvent, BaseErrorTelemetry as default };