From bce9bd2b8251ecdc27223e7d1984823011c288f3 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 3 Jun 2022 11:39:31 -0700 Subject: [PATCH 1/3] telemetry: lift definitions out of aws-toolkit-vscode - Lift vscode metrics defs from https://github.com/aws/aws-toolkit-vscode/pull/2102 - Backwards-compatible change: add redundant `lambdaArchitecture` field to metrics with `architecture` field --- telemetry/definitions/commonDefinitions.json | 19 +++++++++++++++---- telemetry/definitions/vscodeDefinitions.json | 9 ++++++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index dda4ed53b..d7bb1b0bd 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -65,10 +65,15 @@ "allowedValues": ["Zip", "Image"], "description": "The Lambda Package type of the function" }, + { + "name": "architecture", + "allowedValues": ["x86_64", "arm64"], + "description": "DEPRECATED. Use lambdaArchitecture instead." + }, { "name": "lambdaArchitecture", "allowedValues": ["x86_64", "arm64"], - "description": "The Lambda Architecture of the function" + "description": "Lambda architecture identifier" }, { "name": "serviceType", @@ -379,7 +384,9 @@ { "type": "runtime", "required": false }, { "type": "httpMethod", "required": false }, { "type": "result" }, - { "type": "debug" } + { "type": "debug" }, + { "type": "architecture", "required": false }, + { "type": "lambdaArchitecture", "required": false } ] }, { @@ -959,7 +966,9 @@ { "type": "version", "required": false }, { "type": "lambdaPackageType" }, { "type": "result" }, - { "type": "debug" } + { "type": "debug" }, + { "type": "architecture", "required": false }, + { "type": "lambdaArchitecture", "required": false } ] }, { @@ -1047,7 +1056,9 @@ { "type": "version", "required": false }, { "type": "lambdaPackageType", "required": false }, { "type": "reason", "required": false }, - { "type": "eventBridgeSchema", "required": false } + { "type": "eventBridgeSchema", "required": false }, + { "type": "architecture", "required": false }, + { "type": "lambdaArchitecture", "required": false } ] }, { diff --git a/telemetry/definitions/vscodeDefinitions.json b/telemetry/definitions/vscodeDefinitions.json index f972b59c0..5dcb6974e 100644 --- a/telemetry/definitions/vscodeDefinitions.json +++ b/telemetry/definitions/vscodeDefinitions.json @@ -56,7 +56,14 @@ { "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" }] + "metadata": [ + { "type": "result" }, + { "type": "lambdaPackageType" }, + { "type": "runtime" }, + { "type": "attempts" }, + { "type": "duration" }, + { "type": "lambdaArchitecture", "required": false } + ] }, { "name": "sam_openConfigUi", From a403865e1b764cd6688c8f38e34817b005279a02 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 3 Jun 2022 15:34:46 -0700 Subject: [PATCH 2/3] fixup! telemetry: lift definitions out of aws-toolkit-vscode --- telemetry/definitions/vscodeDefinitions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/telemetry/definitions/vscodeDefinitions.json b/telemetry/definitions/vscodeDefinitions.json index 5dcb6974e..7837afeb4 100644 --- a/telemetry/definitions/vscodeDefinitions.json +++ b/telemetry/definitions/vscodeDefinitions.json @@ -62,6 +62,7 @@ { "type": "runtime" }, { "type": "attempts" }, { "type": "duration" }, + { "type": "architecture", "required": false }, { "type": "lambdaArchitecture", "required": false } ] }, From f39b1172b140b8b48dc05ffdc3766d90864a33cf Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Wed, 8 Jun 2022 13:48:32 -0700 Subject: [PATCH 3/3] fixup! fixup! telemetry: lift definitions out of aws-toolkit-vscode --- telemetry/definitions/commonDefinitions.json | 8 -------- telemetry/definitions/vscodeDefinitions.json | 1 - 2 files changed, 9 deletions(-) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index d7bb1b0bd..3d376fb4c 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -65,11 +65,6 @@ "allowedValues": ["Zip", "Image"], "description": "The Lambda Package type of the function" }, - { - "name": "architecture", - "allowedValues": ["x86_64", "arm64"], - "description": "DEPRECATED. Use lambdaArchitecture instead." - }, { "name": "lambdaArchitecture", "allowedValues": ["x86_64", "arm64"], @@ -385,7 +380,6 @@ { "type": "httpMethod", "required": false }, { "type": "result" }, { "type": "debug" }, - { "type": "architecture", "required": false }, { "type": "lambdaArchitecture", "required": false } ] }, @@ -967,7 +961,6 @@ { "type": "lambdaPackageType" }, { "type": "result" }, { "type": "debug" }, - { "type": "architecture", "required": false }, { "type": "lambdaArchitecture", "required": false } ] }, @@ -1057,7 +1050,6 @@ { "type": "lambdaPackageType", "required": false }, { "type": "reason", "required": false }, { "type": "eventBridgeSchema", "required": false }, - { "type": "architecture", "required": false }, { "type": "lambdaArchitecture", "required": false } ] }, diff --git a/telemetry/definitions/vscodeDefinitions.json b/telemetry/definitions/vscodeDefinitions.json index 7837afeb4..5dcb6974e 100644 --- a/telemetry/definitions/vscodeDefinitions.json +++ b/telemetry/definitions/vscodeDefinitions.json @@ -62,7 +62,6 @@ { "type": "runtime" }, { "type": "attempts" }, { "type": "duration" }, - { "type": "architecture", "required": false }, { "type": "lambdaArchitecture", "required": false } ] },