From f91148fb89fa11975fe1661b905b2e7ba2637060 Mon Sep 17 00:00:00 2001
From: chriswang521 <wangpenglong@kylinos.cn>
Date: Fri, 21 Jun 2024 13:43:10 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=E7=A7=BB=E9=99=A4=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E5=91=BD=E4=BB=A4=E8=A1=8C=E5=B7=A5=E5=85=B7=E4=B8=AD?=
 =?UTF-8?q?telemetry=E5=91=BD=E4=BB=A4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/vs/code/node/cli.ts                    | 4 ++--
 src/vs/code/node/cliProcessMain.ts         | 8 ++++----
 src/vs/platform/environment/common/argv.ts | 2 +-
 src/vs/platform/environment/node/argv.ts   | 2 +-
 src/vs/server/node/server.cli.ts           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts
index 2a774c6f..89055719 100644
--- a/src/vs/code/node/cli.ts
+++ b/src/vs/code/node/cli.ts
@@ -32,8 +32,8 @@ function shouldSpawnCliProcess(argv: NativeParsedArgs): boolean {
 		|| !!argv['list-extensions']
 		|| !!argv['install-extension']
 		|| !!argv['uninstall-extension']
-		|| !!argv['locate-extension']
-		|| !!argv['telemetry'];
+		|| !!argv['locate-extension'];
+	// || !!argv['telemetry'];
 }
 
 interface IMainCli {
diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts
index fce9c3fc..82271104 100644
--- a/src/vs/code/node/cliProcessMain.ts
+++ b/src/vs/code/node/cliProcessMain.ts
@@ -54,7 +54,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ITelemetryServiceConfig, TelemetryService } from 'vs/platform/telemetry/common/telemetryService';
 import { supportsTelemetry, NullTelemetryService, getPiiPathsFromEnvironment, isInternalTelemetry, ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
 import { OneDataSystemAppender } from 'vs/platform/telemetry/node/1dsAppender';
-import { buildTelemetryMessage } from 'vs/platform/telemetry/node/telemetry';
+// import { buildTelemetryMessage } from 'vs/platform/telemetry/node/telemetry';
 import { IUriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentity';
 import { UriIdentityService } from 'vs/platform/uriIdentity/common/uriIdentityService';
 import { IUserDataProfile, IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile';
@@ -289,9 +289,9 @@ class CliMain extends Disposable {
 		}
 
 		// Telemetry
-		else if (this.argv['telemetry']) {
-			console.log(await buildTelemetryMessage(environmentService.appRoot, environmentService.extensionsPath));
-		}
+		// else if (this.argv['telemetry']) {
+		// 	console.log(await buildTelemetryMessage(environmentService.appRoot, environmentService.extensionsPath));
+		// }
 	}
 
 	private asExtensionIdOrVSIX(inputs: string[]): (string | URI)[] {
diff --git a/src/vs/platform/environment/common/argv.ts b/src/vs/platform/environment/common/argv.ts
index e7f6c02d..91b4d4cc 100644
--- a/src/vs/platform/environment/common/argv.ts
+++ b/src/vs/platform/environment/common/argv.ts
@@ -29,7 +29,7 @@ export interface NativeParsedArgs {
 	_urls?: string[];
 	help?: boolean;
 	version?: boolean;
-	telemetry?: boolean;
+	// telemetry?: boolean;
 	status?: boolean;
 	wait?: boolean;
 	waitMarkerFilePath?: string;
diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts
index eb635f9b..655cf06f 100644
--- a/src/vs/platform/environment/node/argv.ts
+++ b/src/vs/platform/environment/node/argv.ts
@@ -122,7 +122,7 @@ export const OPTIONS: OptionDescriptions<Required<NativeParsedArgs>> = {
 	'disable-gpu': { type: 'boolean', cat: 't', description: localize('disableGPU', "Disable GPU hardware acceleration.") },
 	'disable-chromium-sandbox': { type: 'boolean', cat: 't', description: localize('disableChromiumSandbox', "Use this option only when there is requirement to launch the application as sudo user on Linux or when running as an elevated user in an applocker environment on Windows.") },
 	'ms-enable-electron-run-as-node': { type: 'boolean', global: true },
-	'telemetry': { type: 'boolean', cat: 't', description: localize('telemetry', "Shows all telemetry events which VS code collects.") },
+	// 'telemetry': { type: 'boolean', cat: 't', description: localize('telemetry', "Shows all telemetry events which VS code collects.") },
 
 	'remote': { type: 'string', allowEmptyValue: true },
 	'folder-uri': { type: 'string[]', cat: 'o', args: 'uri' },
diff --git a/src/vs/server/node/server.cli.ts b/src/vs/server/node/server.cli.ts
index 5d55665e..07f81cdd 100644
--- a/src/vs/server/node/server.cli.ts
+++ b/src/vs/server/node/server.cli.ts
@@ -44,7 +44,7 @@ const isSupportedForCmd = (optionId: keyof RemoteParsedArgs) => {
 		case 'enable-smoke-test-driver':
 		case 'extensions-download-dir':
 		case 'builtin-extensions-dir':
-		case 'telemetry':
+			// case 'telemetry':
 			return false;
 		default:
 			return true;