Skip to content

Commit f07fc77

Browse files
committed
telemetry: computeEnv reports "wsl" for all remote envs
Problem: 1. `computeEnv` reports "wsl" for all remote envs. 2. `computeEnv` does not report "web" envs. Solution: 1. Only report "wsl" for WSL envs. 2. Report "remote" for other remote envs. 3. Report "web" for unknown web envs.
1 parent 1d79df7 commit f07fc77

File tree

1 file changed

+17
-7
lines changed
  • packages/core/src/shared/telemetry

1 file changed

+17
-7
lines changed

packages/core/src/shared/telemetry/util.ts

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -257,33 +257,39 @@ export function getUserAgent(
257257
}
258258

259259
/**
260-
* All the types of ENVs the extension can run in.
260+
* Kinds of machines/environments the extension can run in.
261261
*
262262
* NOTES:
263-
* - append `-amzn` for any environment internal to Amazon
263+
* - Append `-amzn` for any environment internal to Amazon.
264+
* - Append `-web` for web browser (*without* compute).
264265
*/
265266
export type EnvType =
266267
| 'cloud9'
268+
| 'cloud9-web'
267269
| 'cloudDesktop-amzn'
268270
| 'codecatalyst'
269-
| 'local'
270271
| 'ec2'
271272
| 'ec2-amzn' // ec2 but with an internal Amazon OS
273+
| 'local'
272274
| 'sagemaker'
275+
| 'sagemaker-web'
273276
| 'test'
274-
| 'wsl'
275277
| 'unknown'
278+
| 'remote' // Generic (unknown) remote env.
279+
| 'web' // Generic (unknown) web env.
280+
| 'wsl'
276281

277282
/**
278283
* Returns the identifier for the environment that the extension is running in.
279284
*/
280285
export async function getComputeEnvType(): Promise<EnvType> {
286+
const web = isWeb()
281287
if (isCloud9()) {
282-
return 'cloud9'
288+
return web ? 'cloud9-web' : 'cloud9'
283289
} else if (isInDevEnv()) {
284290
return 'codecatalyst'
285291
} else if (isSageMaker()) {
286-
return 'sagemaker'
292+
return web ? 'sagemaker-web' : 'sagemaker'
287293
} else if (isRemoteWorkspace()) {
288294
if (isAmazonInternalOs()) {
289295
if (await isCloudDesktop()) {
@@ -292,12 +298,16 @@ export async function getComputeEnvType(): Promise<EnvType> {
292298
return 'ec2-amzn'
293299
}
294300
return 'ec2'
295-
} else if (env.remoteName) {
301+
} else if (env.remoteName === 'wsl') {
296302
return 'wsl'
297303
} else if (isAutomation()) {
298304
return 'test'
299305
} else if (!env.remoteName) {
300306
return 'local'
307+
} else if (web) {
308+
return 'web'
309+
} else if (env.remoteName) {
310+
return 'remote'
301311
} else {
302312
return 'unknown'
303313
}

0 commit comments

Comments
 (0)