From f5144009dd1d270f61c10a2978e9914b40c3d0f8 Mon Sep 17 00:00:00 2001
From: Laxman Reddy <141967714+laileni-aws@users.noreply.github.com>
Date: Mon, 11 Nov 2024 14:27:25 -0800
Subject: [PATCH] Addressing comments

---
 telemetry/definitions/commonDefinitions.json | 94 ++++++++------------
 1 file changed, 37 insertions(+), 57 deletions(-)

diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json
index cb2478fc..41b1996b 100644
--- a/telemetry/definitions/commonDefinitions.json
+++ b/telemetry/definitions/commonDefinitions.json
@@ -1,5 +1,10 @@
 {
     "types": [
+        {
+            "name": "acceptedCount",
+            "type": "int",
+            "description": "The number of accepted cases"
+        },
         {
             "name": "action",
             "type": "string",
@@ -178,16 +183,6 @@
             "type": "int",
             "description": "The amount of time required for the build to complete (in seconds)."
         },
-        {
-            "name": "buildStatus",
-            "type": "string",
-            "allowedValues": [
-                "SUCCESS",
-                "FAILED",
-                "CANCELLED"
-            ],
-            "description": "The amount of time required for the build to complete (in seconds)."
-        },
         {
             "name": "buildSystemVersion",
             "type": "string",
@@ -1227,6 +1222,11 @@
             "type": "string",
             "description": "The name of the EventBridge Schema used in the operation"
         },
+        {
+            "name": "executedCount",
+            "type": "int",
+            "description": "The number of executed operations"
+        },
         {
             "name": "experimentId",
             "type": "string",
@@ -1293,6 +1293,11 @@
             "type": "string",
             "description": "Application framework being used"
         },
+        {
+            "name": "generatedCount",
+            "type": "int",
+            "description": "The number of generated cases"
+        },
         {
             "name": "generateFailure",
             "type": "string",
@@ -1497,31 +1502,6 @@
             "type": "int",
             "description": "Number of generations before the user accepted or rejected"
         },
-        {
-            "name": "numberOfBuildExecuted",
-            "type": "int",
-            "description": "Number of build executed in unit test generation build loop"
-        },
-        {
-            "name": "numberOfBuildFailed",
-            "type": "int",
-            "description": "Number of build failures in unit test generation build loop"
-        },
-        {
-            "name": "numberOfBuildPassed",
-            "type": "int",
-            "description": "Number of build succeeded in unit test generation build loop"
-        },
-        {
-            "name": "numberOfUnitTestCasesAccepted",
-            "type": "int",
-            "description": "Number of unit test cases accepted"
-        },
-        {
-            "name": "numberOfUnitTestCasesGenerated",
-            "type": "int",
-            "description": "Number of unit test cases generated"
-        },
         {
             "name": "oldVersion",
             "type": "string",
@@ -2318,6 +2298,10 @@
             "name": "amazonq_unitTestGeneration",
             "description": "Client side metrics of AmazonQ Unit Test Generation",
             "metadata": [
+                {
+                    "type": "acceptedCount",
+                    "required": false
+                },
                 {
                     "type": "charsOfCodeAccepted",
                     "required": false
@@ -2334,31 +2318,27 @@
                     "type": "cwsprChatProgrammingLanguage"
                 },
                 {
-                    "type": "linesOfCodeAccepted",
-                    "required": false
-                },
-                {
-                    "type": "linesOfCodeGenerated",
+                    "type": "executedCount",
                     "required": false
                 },
                 {
-                    "type": "numberOfBuildExecuted",
+                    "type": "failedCount",
                     "required": false
                 },
                 {
-                    "type": "numberOfBuildFailed",
+                    "type": "generatedCount",
                     "required": false
                 },
                 {
-                    "type": "numberOfBuildPassed",
+                    "type": "linesOfCodeAccepted",
                     "required": false
                 },
                 {
-                    "type": "numberOfUnitTestCasesAccepted",
+                    "type": "linesOfCodeGenerated",
                     "required": false
                 },
                 {
-                    "type": "numberOfUnitTestCasesGenerated",
+                    "type": "successCount",
                     "required": false
                 },
                 {
@@ -2377,10 +2357,6 @@
             "name": "amazonq_utg_buildLoop",
             "description": "Client side invocation of the AmazonQ Unit Test Generation build loop",
             "metadata": [
-                {
-                    "type": "buildStatus",
-                    "required": false
-                },
                 {
                     "type": "credentialStartUrl",
                     "required": false
@@ -2392,6 +2368,10 @@
                     "type": "latencyOfClientSideBuild",
                     "required": false
                 },
+                {
+                    "type": "result",
+                    "required": false
+                },
                 {
                     "type": "source",
                     "required": false
@@ -2416,6 +2396,10 @@
             "name": "amazonq_utg_generateTests",
             "description": "Client side invocation of the AmazonQ Unit Test Generation",
             "metadata": [
+                {
+                    "type": "acceptedCount",
+                    "required": false
+                },
                 {
                     "type": "artifactsUploadDuration",
                     "required": false
@@ -2436,23 +2420,19 @@
                     "type": "cwsprChatProgrammingLanguage"
                 },
                 {
-                    "type": "latencyOfGeneratingTests",
+                    "type": "generatedCount",
                     "required": false
                 },
                 {
-                    "type": "linesOfCodeAccepted",
-                    "required": false
-                },
-                {
-                    "type": "linesOfCodeGenerated",
+                    "type": "latencyOfGeneratingTests",
                     "required": false
                 },
                 {
-                    "type": "numberOfUnitTestCasesAccepted",
+                    "type": "linesOfCodeAccepted",
                     "required": false
                 },
                 {
-                    "type": "numberOfUnitTestCasesGenerated",
+                    "type": "linesOfCodeGenerated",
                     "required": false
                 },
                 {