added Compute Env to Post metrics

Author: dhruvigajjar

package-lock.json

@@ -4270,7 +4270,7 @@
     },
     "devDependencies": {
         "@aws-sdk/types": "^3.13.1",
-        "@aws-toolkits/telemetry": "^1.0.176",
+        "@aws-toolkits/telemetry": "^1.0.180",
         "@aws/fully-qualified-names": "^2.1.1",
         "@cspotcode/source-map-support": "^0.8.1",
         "@sinonjs/fake-timers": "^10.0.2",

package.json

@@ -64,6 +64,23 @@
       "type":"string",
       "max":2000
     },
+    "ComputeEnv":{
+      "type":"string",
+      "enum":[
+        "cloud9",
+        "cloud9-codecatalyst",
+        "cloud9-ec2",
+        "codecatalyst",
+        "ec2",
+        "local",
+        "sagemaker",
+        "ssh",
+        "test",
+        "web",
+        "wsl",
+        "other"
+      ]
+    },
     "Datapoint":{
       "type":"double",
       "min":0
@@ -169,6 +186,7 @@
         "AWSProductVersion":{"shape":"AWSProductVersion"},
         "OS":{"shape":"Value"},
         "OSVersion":{"shape":"Value"},
+        "CommputeEnv": {"shape":"ComputeEnv"},
         "ParentProduct":{"shape":"Value"},
         "ParentProductVersion":{"shape":"Value"},
         "Metadata":{"shape":"Metadata"},
@@ -190,6 +208,7 @@
         "ClientID":{"shape":"ClientID"},
         "OS":{"shape":"Value"},
         "OSVersion":{"shape":"Value"},
+        "CommputeEnv": {"shape":"ComputeEnv"},
         "ParentProduct":{"shape":"Value"},
         "ParentProductVersion":{"shape":"Value"},
         "MetricData":{"shape":"MetricData"}

src/shared/telemetry/service-2.json

@@ -17,6 +17,7 @@ import { ServiceConfigurationOptions } from 'aws-sdk/lib/service'
 import globals from '../extensionGlobals'
 import { DevSettings } from '../settings'
 import { ClassToInterfaceType } from '../utilities/tsUtils'
+import { getComputeEnvType } from './util'
 
 export const accountMetadataKey = 'awsAccount'
 export const regionKey = 'awsRegion'
@@ -91,6 +92,7 @@ export class DefaultTelemetryClient implements TelemetryClient {
                         ClientID: this.clientId,
                         OS: os.platform(),
                         OSVersion: os.release(),
+                        CommputeEnv: getComputeEnvType(),
                         ParentProduct: vscode.env.appName,
                         ParentProductVersion: vscode.version,
                         MetricData: batch,
@@ -117,6 +119,7 @@ export class DefaultTelemetryClient implements TelemetryClient {
                     AWSProductVersion: extensionVersion,
                     OS: os.platform(),
                     OSVersion: os.release(),
+                    CommputeEnv: getComputeEnvType(),
                     ParentProduct: vscode.env.appName,
                     ParentProductVersion: vscode.version,
                     Comment: feedback.comment,

src/shared/telemetry/telemetryClient.ts

@@ -15,6 +15,8 @@ import { mapMetadata } from './telemetryLogger'
 import { Result } from './telemetry.gen'
 import { MetricDatum } from './clienttelemetry'
 import { isValidationExemptMetric } from './exemptMetrics'
+import { isCloud9, isSageMaker, isCn } from '../../shared/extensionUtilities'
+import { isInDevEnv } from '../../codecatalyst/utils'
 
 const legacySettingsTelemetryValueDisable = 'Disable'
 const legacySettingsTelemetryValueEnable = 'Enable'
@@ -90,6 +92,33 @@ export async function getUserAgent(
     return pairs.join(' ')
 }
 
+// Although this is similair to getEnvType() in authUtil files, added new.
+// auth util can be upadate to get ComputeEnv
+
+export function getComputeEnvType() {
+    // Compute ENV could be one of the following
+    // "cloud9"|"cloud9-codecatalyst"|"cloud9-ec2"|"codecatalyst"|"ec2"|"local"|"sagemaker"|"ssh"|"test"|"web"|"wsl"|"other"|string;
+
+    if (isCloud9('classic')) return 'cloud9'
+
+    if (isCloud9('codecatalyst')) return 'cloud9-codecatalyst'
+
+    if (isInDevEnv()) return 'codecatalyst' // should it be codecatalyst devEnv?
+
+    if (isCn()) return 'amazon-cloud9' // name better
+
+    if (isSageMaker()) return 'sagemaker'
+
+    if (env.remoteName == 'ssh-remote' && !isInDevEnv()) return 'ec2'
+
+    if (isAutomation()) return 'test'
+
+    if (!env.remoteName)
+        // use isDevenvVscode instead?
+        return 'local'
+    else return 'other'
+}
+
 /**
  * Validates that emitted telemetry metrics
  * 1. contain a result property and