Stop testing the endpoint if telemetry is disabled

microsoft · Aug 27, 2021 · 1b4e1da · 1b4e1da
1 parent 3abf6bc
commit 1b4e1da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/browser/telemetryReporter.ts b/src/browser/telemetryReporter.ts
@@ -3,6 +3,7 @@
  *--------------------------------------------------------*/
 
 import { ApplicationInsights } from "@microsoft/applicationinsights-web";
+import * as vscode from "vscode";
 import { AppenderData, BaseTelemtryReporter, ITelemetryAppender } from "../common/baseTelemetryReporter";
 
 class WebAppInsightsAppender implements ITelemetryAppender {
@@ -32,7 +33,7 @@ class WebAppInsightsAppender implements ITelemetryAppender {
 
 		// If we cannot access the endpoint this most likely means it's being blocked
 		// and we should not attempt to send any telemetry.
-		if (endpointUrl) {
+		if (endpointUrl && vscode.env.isTelemetryEnabled) {
 			fetch(endpointUrl).catch(() => (this._aiClient = undefined));
 		}
 	}

diff --git a/src/common/baseTelemetryReporter.ts b/src/common/baseTelemetryReporter.ts
@@ -245,7 +245,7 @@ export class BaseTelemtryReporter {
 			// Check for common user data in the telemetry events
 			if (value.indexOf("token=") !== -1) {
 				cleanedObject[key] = "<REDACTED: token>";
-			} else if (value.indexOf("ssword=") !== -1) {
+			} else if (value.indexOf("ssword=") !== -1 || value.indexOf("sswd=") !== -1) {
 				cleanedObject[key] = "<REDACTED: password>";
 			} else if (emailRegex.test(value)) {
 				cleanedObject[key] = "<REDACTED: email>";