From 31cff6fca6862d7431661f9075a849992bb9a76f Mon Sep 17 00:00:00 2001 From: Roger Zhang Date: Mon, 29 Jul 2024 17:32:18 -0700 Subject: [PATCH 1/8] Telemetry for getting started project --- telemetry/definitions/commonDefinitions.json | 121 +++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index cb5cfb644..899e1925b 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -1659,6 +1659,11 @@ "name": "xrayEnabled", "type": "boolean", "description": "Whether or not AWS X-Ray is enabled" + }, + { + "name": "appTemplateSelected", + "type": "string", + "description": "Identifies the template choosen in the Getting Started Walkthrough." } ], "metrics": [ @@ -6802,6 +6807,122 @@ "type": "result" } ] + }, + { + "name": "app_walkthroughStart", + "description": "Open Getting Started Walkthrough", + "metadata": [ + { + "type": "result", + "required": true + }, + { + "type": "reason", + "required": false + } + ] + }, + { + "name": "app_walkthroughInstallAwsCli", + "description": "Click Install AWS CLI button in Getting Started Walkthrough", + "metadata": [ + { + "type": "result", + "required": true + }, + { + "type": "reason", + "required": false + } + ] + }, + { + "name": "app_walkthroughInstallSamcli", + "description": "Click Install SAM CLI button in Getting Started Walkthrough", + "metadata": [ + { + "type": "result", + "required": true + }, + { + "type": "reason", + "required": false + } + ] + }, + { + "name": "app_walkthroughInstallDocker", + "description": "Click Install Docker button in Getting Started Walkthrough", + "metadata": [ + { + "type": "result", + "required": true + }, + { + "type": "reason", + "required": false + } + ] + }, + { + "name": "app_walkthroughSelectTemplate", + "description": "Select a template and create project in Getting Started Walkthrough", + "metadata": [ + { + "type": "result", + "required": true + }, + { + "type": "reason", + "required": false + }, + { + "type": "appTemplateSelected", + "required": false + } + ] + }, + { + "name": "app_openTemplate", + "description": "Click open template button in Application Builder", + "metadata": [ + { + "type": "result", + "required": true + }, + { + "type": "reason", + "required": false + } + ] + }, + { + "name": "app_openLocalInvokeWebView", + "description": "Click open Local invoke WebView button in Application Builder", + "metadata": [ + { + "type": "result", + "required": true + }, + { + "type": "reason", + "required": false + } + ] + }, + { + "name": "app_openRemoteInvokeWebView", + "description": "Click open Remote invoke WebView button in Application Builder", + "metadata": [ + { + "type": "result", + "required": true + }, + { + "type": "reason", + "required": false + } + ] } ] } \ No newline at end of file From 29246de23d2db346d5d7e80189a9848622f95da9 Mon Sep 17 00:00:00 2001 From: Roger Zhang Date: Tue, 30 Jul 2024 15:02:01 -0700 Subject: [PATCH 2/8] add source --- telemetry/definitions/commonDefinitions.json | 97 +++++++++++++++++++- 1 file changed, 95 insertions(+), 2 deletions(-) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index 899e1925b..2e9b5c988 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -1661,7 +1661,7 @@ "description": "Whether or not AWS X-Ray is enabled" }, { - "name": "appTemplateSelected", + "name": "appTemplateChoice", "type": "string", "description": "Identifies the template choosen in the Getting Started Walkthrough." } @@ -2305,6 +2305,10 @@ "metadata": [ { "type": "hasChatAuth" + }, + { + "type": "source", + "required": false } ] }, @@ -5835,6 +5839,14 @@ "metadata": [ { "type": "result" + }, + { + "type": "reason", + "required": false + }, + { + "type": "source", + "required": false } ] }, @@ -5875,6 +5887,14 @@ { "type": "version", "required": false + }, + { + "type": "reason", + "required": false + }, + { + "type": "source", + "required": false } ] }, @@ -5888,6 +5908,14 @@ { "type": "runtime", "required": false + }, + { + "type": "reason", + "required": false + }, + { + "type": "source", + "required": false } ] }, @@ -6260,6 +6288,10 @@ { "type": "version", "required": false + }, + { + "type": "source", + "required": false } ] }, @@ -6339,6 +6371,35 @@ { "type": "version", "required": false + }, + { + "type": "source", + "required": false + } + ] + }, + { + "name": "sam_build", + "description": "Called when building a SAM application", + "metadata": [ + { + "type": "lambdaPackageType", + "required": false + }, + { + "type": "reason", + "required": false + }, + { + "type": "result" + }, + { + "type": "version", + "required": false + }, + { + "type": "source", + "required": false } ] }, @@ -6819,6 +6880,10 @@ { "type": "reason", "required": false + }, + { + "type": "source", + "required": false } ] }, @@ -6833,6 +6898,10 @@ { "type": "reason", "required": false + }, + { + "type": "source", + "required": false } ] }, @@ -6847,6 +6916,10 @@ { "type": "reason", "required": false + }, + { + "type": "source", + "required": false } ] }, @@ -6861,6 +6934,10 @@ { "type": "reason", "required": false + }, + { + "type": "source", + "required": false } ] }, @@ -6877,7 +6954,11 @@ "required": false }, { - "type": "appTemplateSelected", + "type": "appTemplateChoice", + "required": false + }, + { + "type": "source", "required": false } ] @@ -6893,6 +6974,10 @@ { "type": "reason", "required": false + }, + { + "type": "source", + "required": false } ] }, @@ -6907,6 +6992,10 @@ { "type": "reason", "required": false + }, + { + "type": "source", + "required": false } ] }, @@ -6921,6 +7010,10 @@ { "type": "reason", "required": false + }, + { + "type": "source", + "required": false } ] } From f688e37047b9f1214582ab93acacff5406a877d3 Mon Sep 17 00:00:00 2001 From: Roger Zhang Date: Wed, 14 Aug 2024 10:56:37 -0700 Subject: [PATCH 3/8] add docker in toolid --- telemetry/definitions/commonDefinitions.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index 389d5cdff..6df129afe 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -1617,7 +1617,8 @@ "dotnet-lambda-deploy", "dotnet-deploy-cli", "aws-cli", - "sam-cli" + "sam-cli", + "docker" ] }, { From 098c0f5911ba20849c141bd55c56eb317bb0e6eb Mon Sep 17 00:00:00 2001 From: Roger Zhang Date: Thu, 15 Aug 2024 16:10:42 -0700 Subject: [PATCH 4/8] fix order --- telemetry/definitions/commonDefinitions.json | 388 +++++++++---------- 1 file changed, 194 insertions(+), 194 deletions(-) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index 6df129afe..d85ff1564 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -92,6 +92,11 @@ ], "description": "The current state of the App Runner service" }, + { + "name": "appTemplateChoice", + "type": "string", + "description": "Identifies the template choosen in the Getting Started Walkthrough." + }, { "name": "artifactsUploadDuration", "type": "int", @@ -1665,11 +1670,6 @@ "name": "xrayEnabled", "type": "boolean", "description": "Whether or not AWS X-Ray is enabled" - }, - { - "name": "appTemplateChoice", - "type": "string", - "description": "Identifies the template choosen in the Getting Started Walkthrough." } ], "metrics": [ @@ -2180,6 +2180,154 @@ } ] }, + { + "name": "app_openLocalInvokeWebView", + "description": "Click open Local invoke WebView button in Application Builder", + "metadata": [ + { + "type": "reason", + "required": false + }, + { + "type": "result", + "required": true + }, + { + "type": "source", + "required": false + } + ] + }, + { + "name": "app_openRemoteInvokeWebView", + "description": "Click open Remote invoke WebView button in Application Builder", + "metadata": [ + { + "type": "reason", + "required": false + }, + { + "type": "result", + "required": true + }, + { + "type": "source", + "required": false + } + ] + }, + { + "name": "app_openTemplate", + "description": "Click open template button in Application Builder", + "metadata": [ + { + "type": "reason", + "required": false + }, + { + "type": "result", + "required": true + }, + { + "type": "source", + "required": false + } + ] + }, + { + "name": "app_walkthroughInstallAwsCli", + "description": "Click Install AWS CLI button in Getting Started Walkthrough", + "metadata": [ + { + "type": "reason", + "required": false + }, + { + "type": "result", + "required": true + }, + { + "type": "source", + "required": false + } + ] + }, + { + "name": "app_walkthroughInstallDocker", + "description": "Click Install Docker button in Getting Started Walkthrough", + "metadata": [ + { + "type": "reason", + "required": false + }, + { + "type": "result", + "required": true + }, + { + "type": "source", + "required": false + } + ] + }, + { + "name": "app_walkthroughInstallSamcli", + "description": "Click Install SAM CLI button in Getting Started Walkthrough", + "metadata": [ + { + "type": "reason", + "required": false + }, + { + "type": "result", + "required": true + }, + { + "type": "source", + "required": false + } + ] + }, + { + "name": "app_walkthroughSelectTemplate", + "description": "Select a template and create project in Getting Started Walkthrough", + "metadata": [ + { + "type": "appTemplateChoice", + "required": false + }, + { + "type": "reason", + "required": false + }, + { + "type": "result", + "required": true + }, + { + "type": "source", + "required": false + } + ] + }, + { + "name": "app_walkthroughStart", + "description": "Open Getting Started Walkthrough", + "metadata": [ + { + "type": "reason", + "required": false + }, + { + "type": "result", + "required": true + }, + { + "type": "source", + "required": false + } + ] + }, { "name": "appcomposer_addConnection", "description": "Called when two resources are connected", @@ -5860,13 +6008,13 @@ "name": "lambda_goToHandler", "description": "Jump to a lambda handler from elsewhere", "metadata": [ - { - "type": "result" - }, { "type": "reason", "required": false }, + { + "type": "result" + }, { "type": "source", "required": false @@ -5901,22 +6049,22 @@ "type": "lambdaPackageType" }, { - "type": "result" + "type": "reason", + "required": false }, { - "type": "runtime", - "required": false + "type": "result" }, { - "type": "version", + "type": "runtime", "required": false }, { - "type": "reason", + "type": "source", "required": false }, { - "type": "source", + "type": "version", "required": false } ] @@ -5926,14 +6074,14 @@ "description": "Called when invoking lambdas remotely", "metadata": [ { - "type": "result" + "type": "reason", + "required": false }, { - "type": "runtime", - "required": false + "type": "result" }, { - "type": "reason", + "type": "runtime", "required": false }, { @@ -6302,19 +6450,44 @@ ] }, { - "name": "sam_deploy", - "description": "Called when deploying a SAM application", + "name": "sam_build", + "description": "Called when building a SAM application", "metadata": [ + { + "type": "lambdaPackageType", + "required": false + }, + { + "type": "reason", + "required": false + }, { "type": "result" }, + { + "type": "source", + "required": false + }, { "type": "version", "required": false + } + ] + }, + { + "name": "sam_deploy", + "description": "Called when deploying a SAM application", + "metadata": [ + { + "type": "result" }, { "type": "source", "required": false + }, + { + "type": "version", + "required": false } ] }, @@ -6388,41 +6561,16 @@ { "type": "result" }, - { - "type": "syncedResources" - }, - { - "type": "version", - "required": false - }, { "type": "source", "required": false - } - ] - }, - { - "name": "sam_build", - "description": "Called when building a SAM application", - "metadata": [ - { - "type": "lambdaPackageType", - "required": false - }, - { - "type": "reason", - "required": false }, { - "type": "result" + "type": "syncedResources" }, { "type": "version", "required": false - }, - { - "type": "source", - "required": false } ] }, @@ -6891,154 +7039,6 @@ "type": "result" } ] - }, - { - "name": "app_walkthroughStart", - "description": "Open Getting Started Walkthrough", - "metadata": [ - { - "type": "result", - "required": true - }, - { - "type": "reason", - "required": false - }, - { - "type": "source", - "required": false - } - ] - }, - { - "name": "app_walkthroughInstallAwsCli", - "description": "Click Install AWS CLI button in Getting Started Walkthrough", - "metadata": [ - { - "type": "result", - "required": true - }, - { - "type": "reason", - "required": false - }, - { - "type": "source", - "required": false - } - ] - }, - { - "name": "app_walkthroughInstallSamcli", - "description": "Click Install SAM CLI button in Getting Started Walkthrough", - "metadata": [ - { - "type": "result", - "required": true - }, - { - "type": "reason", - "required": false - }, - { - "type": "source", - "required": false - } - ] - }, - { - "name": "app_walkthroughInstallDocker", - "description": "Click Install Docker button in Getting Started Walkthrough", - "metadata": [ - { - "type": "result", - "required": true - }, - { - "type": "reason", - "required": false - }, - { - "type": "source", - "required": false - } - ] - }, - { - "name": "app_walkthroughSelectTemplate", - "description": "Select a template and create project in Getting Started Walkthrough", - "metadata": [ - { - "type": "result", - "required": true - }, - { - "type": "reason", - "required": false - }, - { - "type": "appTemplateChoice", - "required": false - }, - { - "type": "source", - "required": false - } - ] - }, - { - "name": "app_openTemplate", - "description": "Click open template button in Application Builder", - "metadata": [ - { - "type": "result", - "required": true - }, - { - "type": "reason", - "required": false - }, - { - "type": "source", - "required": false - } - ] - }, - { - "name": "app_openLocalInvokeWebView", - "description": "Click open Local invoke WebView button in Application Builder", - "metadata": [ - { - "type": "result", - "required": true - }, - { - "type": "reason", - "required": false - }, - { - "type": "source", - "required": false - } - ] - }, - { - "name": "app_openRemoteInvokeWebView", - "description": "Click open Remote invoke WebView button in Application Builder", - "metadata": [ - { - "type": "result", - "required": true - }, - { - "type": "reason", - "required": false - }, - { - "type": "source", - "required": false - } - ] } ] } \ No newline at end of file From 69c1d29a4bc8f2d8e1d41f5aef24d0dcbd6e8e80 Mon Sep 17 00:00:00 2001 From: Roger Zhang Date: Fri, 16 Aug 2024 12:00:33 -0700 Subject: [PATCH 5/8] address comments --- telemetry/definitions/commonDefinitions.json | 128 ++----------------- 1 file changed, 12 insertions(+), 116 deletions(-) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index d85ff1564..ed9ef3bc3 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -92,11 +92,6 @@ ], "description": "The current state of the App Runner service" }, - { - "name": "appTemplateChoice", - "type": "string", - "description": "Identifies the template choosen in the Getting Started Walkthrough." - }, { "name": "artifactsUploadDuration", "type": "int", @@ -2181,71 +2176,23 @@ ] }, { - "name": "app_openLocalInvokeWebView", - "description": "Click open Local invoke WebView button in Application Builder", - "metadata": [ - { - "type": "reason", - "required": false - }, - { - "type": "result", - "required": true - }, - { - "type": "source", - "required": false - } - ] - }, - { - "name": "app_openRemoteInvokeWebView", - "description": "Click open Remote invoke WebView button in Application Builder", + "name": "appbuilder_installTool", + "description": "Click Install Docker button in Getting Started Walkthrough", "metadata": [ - { - "type": "reason", - "required": false - }, - { - "type": "result", - "required": true - }, { "type": "source", "required": false - } - ] - }, - { - "name": "app_openTemplate", - "description": "Click open template button in Application Builder", - "metadata": [ - { - "type": "reason", - "required": false }, { - "type": "result", - "required": true - }, - { - "type": "source", + "type": "toolId", "required": false } ] }, { - "name": "app_walkthroughInstallAwsCli", - "description": "Click Install AWS CLI button in Getting Started Walkthrough", + "name": "appbuilder_openLocalInvokeWebView", + "description": "Click open Local invoke WebView button in Application Builder", "metadata": [ - { - "type": "reason", - "required": false - }, - { - "type": "result", - "required": true - }, { "type": "source", "required": false @@ -2253,17 +2200,9 @@ ] }, { - "name": "app_walkthroughInstallDocker", - "description": "Click Install Docker button in Getting Started Walkthrough", + "name": "appbuilder_openRemoteInvokeWebView", + "description": "Click open Remote invoke WebView button in Application Builder", "metadata": [ - { - "type": "reason", - "required": false - }, - { - "type": "result", - "required": true - }, { "type": "source", "required": false @@ -2271,17 +2210,9 @@ ] }, { - "name": "app_walkthroughInstallSamcli", - "description": "Click Install SAM CLI button in Getting Started Walkthrough", + "name": "appbuilder_openTemplate", + "description": "Click open template button in Application Builder", "metadata": [ - { - "type": "reason", - "required": false - }, - { - "type": "result", - "required": true - }, { "type": "source", "required": false @@ -2289,21 +2220,13 @@ ] }, { - "name": "app_walkthroughSelectTemplate", + "name": "appbuilder_selectWalkthroughTemplate", "description": "Select a template and create project in Getting Started Walkthrough", "metadata": [ { - "type": "appTemplateChoice", - "required": false - }, - { - "type": "reason", + "type": "action", "required": false }, - { - "type": "result", - "required": true - }, { "type": "source", "required": false @@ -2311,17 +2234,9 @@ ] }, { - "name": "app_walkthroughStart", + "name": "appbuilder_startWalkthrough", "description": "Open Getting Started Walkthrough", "metadata": [ - { - "type": "reason", - "required": false - }, - { - "type": "result", - "required": true - }, { "type": "source", "required": false @@ -6008,13 +5923,6 @@ "name": "lambda_goToHandler", "description": "Jump to a lambda handler from elsewhere", "metadata": [ - { - "type": "reason", - "required": false - }, - { - "type": "result" - }, { "type": "source", "required": false @@ -6048,10 +5956,6 @@ { "type": "lambdaPackageType" }, - { - "type": "reason", - "required": false - }, { "type": "result" }, @@ -6073,10 +5977,6 @@ "name": "lambda_invokeRemote", "description": "Called when invoking lambdas remotely", "metadata": [ - { - "type": "reason", - "required": false - }, { "type": "result" }, @@ -6457,10 +6357,6 @@ "type": "lambdaPackageType", "required": false }, - { - "type": "reason", - "required": false - }, { "type": "result" }, From 64e9cef6cb340999711b50018d0f879ce107b898 Mon Sep 17 00:00:00 2001 From: Roger Zhang Date: Fri, 16 Aug 2024 12:01:50 -0700 Subject: [PATCH 6/8] remove result --- telemetry/definitions/commonDefinitions.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index ed9ef3bc3..c78f22a66 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -6357,9 +6357,6 @@ "type": "lambdaPackageType", "required": false }, - { - "type": "result" - }, { "type": "source", "required": false From be3fbd46ce6c7a8aabefb14bfd4cab48d9f7e5fa Mon Sep 17 00:00:00 2001 From: Roger Zhang Date: Fri, 16 Aug 2024 13:17:22 -0700 Subject: [PATCH 7/8] change prefix to appBuilder --- telemetry/definitions/commonDefinitions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index c78f22a66..c61399e0c 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -2176,7 +2176,7 @@ ] }, { - "name": "appbuilder_installTool", + "name": "appBuilder_installTool", "description": "Click Install Docker button in Getting Started Walkthrough", "metadata": [ { @@ -2190,7 +2190,7 @@ ] }, { - "name": "appbuilder_openLocalInvokeWebView", + "name": "appBuilder_openLocalInvokeWebView", "description": "Click open Local invoke WebView button in Application Builder", "metadata": [ { @@ -2200,7 +2200,7 @@ ] }, { - "name": "appbuilder_openRemoteInvokeWebView", + "name": "appBuilder_openRemoteInvokeWebView", "description": "Click open Remote invoke WebView button in Application Builder", "metadata": [ { @@ -2210,7 +2210,7 @@ ] }, { - "name": "appbuilder_openTemplate", + "name": "appBuilder_openTemplate", "description": "Click open template button in Application Builder", "metadata": [ { @@ -2220,7 +2220,7 @@ ] }, { - "name": "appbuilder_selectWalkthroughTemplate", + "name": "appBuilder_selectWalkthroughTemplate", "description": "Select a template and create project in Getting Started Walkthrough", "metadata": [ { @@ -2234,7 +2234,7 @@ ] }, { - "name": "appbuilder_startWalkthrough", + "name": "appBuilder_startWalkthrough", "description": "Open Getting Started Walkthrough", "metadata": [ { From 3b1500f77c07186ff27db6d8cdb25b73e23f1160 Mon Sep 17 00:00:00 2001 From: Roger Zhang Date: Mon, 19 Aug 2024 10:12:18 -0700 Subject: [PATCH 8/8] fix nit --- telemetry/definitions/commonDefinitions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index c61399e0c..9a770a624 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -2177,7 +2177,7 @@ }, { "name": "appBuilder_installTool", - "description": "Click Install Docker button in Getting Started Walkthrough", + "description": "Click Install button in Getting Started Walkthrough", "metadata": [ { "type": "source",