fix(telemetry): lift local defs into aws-toolkit-common #2676

aws/aws-toolkit-common#324

Author: justinmk3

package-lock.json

@@ -2938,7 +2938,7 @@
         "report": "nyc report --reporter=html --reporter=json"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "1.0.49",
+        "@aws-toolkits/telemetry": "^1.0.54",
         "@sinonjs/fake-timers": "^8.1.0",
         "@types/adm-zip": "^0.4.34",
         "@types/async-lock": "^1.1.3",

package.json

@@ -107,13 +107,14 @@ export async function resumeCreateNewSamApp(
         getLogger().error('Error resuming new SAM Application: %O', err as Error)
     } finally {
         activationReloadState.clearSamInitState()
+        const arch = samInitState?.architecture as telemetry.LambdaArchitecture
         telemetry.recordSamInit({
             lambdaPackageType: samInitState?.isImage ? 'Image' : 'Zip',
+            lambdaArchitecture: arch,
             result: createResult,
             reason: reason,
             runtime: samInitState?.runtime as telemetry.Runtime,
             version: samVersion,
-            architecture: samInitState?.architecture as telemetry.Architecture,
         })
     }
 }
@@ -340,11 +341,11 @@ export async function createNewSamApplication(
     } finally {
         telemetry.recordSamInit({
             lambdaPackageType: lambdaPackageType,
+            lambdaArchitecture: initArguments?.architecture,
             result: createResult,
             reason: reason,
             runtime: createRuntime as telemetry.Runtime,
             version: samVersion,
-            architecture: initArguments?.architecture,
         })
     }
 }

src/lambda/commands/createNewSamApp.ts

@@ -218,7 +218,7 @@ async function invokeLambdaHandler(
                 runtime: config.runtime as telemetry.Runtime,
                 debug: !config.noDebug,
                 httpMethod: config.api?.httpMethod,
-                architecture: config.architecture,
+                lambdaArchitecture: config.architecture,
             })
         }
 
@@ -305,11 +305,11 @@ async function invokeLambdaHandler(
             }
             telemetry.recordLambdaInvokeLocal({
                 lambdaPackageType: isImageLambdaConfig(config) ? 'Image' : 'Zip',
+                lambdaArchitecture: config.architecture,
                 result: invokeResult,
                 runtime: config.runtime as telemetry.Runtime,
                 debug: !config.noDebug,
                 version: samVersion,
-                architecture: config.architecture,
             })
         }
 
@@ -402,11 +402,11 @@ export async function runLambdaFunction(
             onRecordAttachDebuggerMetric: (attachResult: boolean | undefined, attempts: number): void => {
                 telemetry.recordSamAttachDebugger({
                     lambdaPackageType: isImageLambdaConfig(config) ? 'Image' : 'Zip',
+                    lambdaArchitecture: config.architecture,
                     runtime: config.runtime as telemetry.Runtime,
                     result: attachResult ? 'Succeeded' : 'Failed',
                     attempts: attempts,
                     duration: timer.elapsedTime,
-                    architecture: config.architecture,
                 })
             },
         })

src/shared/sam/localLambdaRunner.ts

@@ -16,12 +16,6 @@
             "name": "starterTemplate",
             "type": "string",
             "description": "Starter template chosen during create document"
-        },
-        {
-            "name": "architecture",
-            "type": "string",
-            "description": "SAM Application architecture",
-            "allowedValues": ["x86_64", "arm64"]
         }
     ],
     "metrics": [
@@ -145,55 +139,6 @@
                     "type": "result"
                 }
             ]
-        },
-        {
-            "name": "sam_init",
-            "description": "Called when initing a sam application",
-            "metadata": [
-                { "type": "result" },
-                { "type": "runtime", "required": false },
-                { "type": "templateName", "required": false },
-                { "type": "version", "required": false },
-                { "type": "lambdaPackageType", "required": false },
-                { "type": "reason", "required": false },
-                { "type": "eventBridgeSchema", "required": false },
-                { "type": "architecture", "required": false }
-            ]
-        },
-        {
-            "name": "apigateway_invokeLocal",
-            "description": "Invoking one simulated API Gateway call using the SAM cli",
-            "metadata": [
-                { "type": "runtime", "required": false },
-                { "type": "httpMethod", "required": false },
-                { "type": "result" },
-                { "type": "debug" },
-                { "type": "architecture", "required": false }
-            ]
-        },
-        {
-            "name": "lambda_invokeLocal",
-            "description": "Called when invoking lambdas locally (with SAM in most toolkits)",
-            "metadata": [
-                { "type": "runtime", "required": false },
-                { "type": "version", "required": false },
-                { "type": "lambdaPackageType" },
-                { "type": "result" },
-                { "type": "debug" },
-                { "type": "architecture", "required": false }
-            ]
-        },
-        {
-            "name": "sam_attachDebugger",
-            "description": "Called after trying to attach a debugger to a local sam invoke",
-            "metadata": [
-                { "type": "result" },
-                { "type": "lambdaPackageType" },
-                { "type": "runtime" },
-                { "type": "attempts" },
-                { "type": "duration" },
-                { "type": "architecture", "required": false }
-            ]
         }
     ]
 }