FIX: updating codeReviewTool metric definitions

Author: mkovelam

telemetry/definitions/commonDefinitions.json

@@ -80,11 +80,6 @@
             "type": "double",
             "description": "Captures the size of the source code"
         },
-        {
-            "name": "artifactType",
-            "type": "string",
-            "description": "type of artifact used in a request"
-        },
         {
             "name": "amazonqTimeToLoadHistory",
             "type": "int",
@@ -129,6 +124,11 @@
             ],
             "description": "The current state of the App Runner service"
         },
+        {
+            "name": "artifactType",
+            "type": "string",
+            "description": "type of artifact used in a request"
+        },
         {
             "name": "artifactsUploadDuration",
             "type": "int",
@@ -2677,7 +2677,7 @@
         },
         {
             "name": "amazonq_codeReviewTool",
-            "description": "Parent metric name for the code review tool.",
+            "description": "This metric is used to evaluate Amazon Q's code review tool",
             "metadata": [
                 {
                     "type": "artifactType",
@@ -2691,10 +2691,6 @@
                     "type": "codewhispererCodeScanSrcZipFileBytes",
                     "required": false
                 },
-                {
-                    "type": "codewhispererCodeScanScope",
-                    "required": false
-                },
                 {
                     "type": "codewhispererCodeScanTotalIssues",
                     "required": false
@@ -2713,6 +2709,10 @@
                 },
                 {
                     "type": "result"
+                },
+                {
+                    "type": "scope",
+                    "required": false
                 }
             ]
         },
@@ -5869,7 +5869,14 @@
                 },
                 {
                     "type": "codewhispererCodeScanScope",
-                    "required": false
+                    "required": false,
+                    "description": "The scope of the security scan being performed",
+                    "allowedValues": [
+                        "FILE",
+                        "FILE_AUTO",
+                        "FILE_ON_DEMAND",
+                        "PROJECT"
+                    ]
                 },
                 {
                     "type": "codewhispererCodeScanSrcPayloadBytes"