Merge remote-tracking branch 'upstream/main'

aws · Feb 17, 2024 · 57811b7 · 57811b7
2 parents fa5a729 + ba25dfe
commit 57811b7
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 17 deletions.
diff --git a/...olkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj b/...olkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj
@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Tests/AwsToolkit.Telemetry.Events.Tests.csproj b/telemetry/csharp/AwsToolkit.Telemetry.Events.Tests/AwsToolkit.Telemetry.Events.Tests.csproj
@@ -12,8 +12,8 @@
 	</ItemGroup>
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json
@@ -944,7 +944,8 @@
             "description": "Allowed Java versions to transform from",
             "allowedValues": [
                 "JDK_1_8",
-                "JDK_11"
+                "JDK_11",
+                "Other"
             ]
         },
         {
@@ -968,7 +969,7 @@
         {
             "name": "codeTransformRequestId",
             "type": "string",
-            "description": "A string id for the API request"
+            "description": "The API request ID"
         },
         {
             "name": "codeTransformTotalByteSize",
@@ -1077,6 +1078,7 @@
                 "NoJavaProject",
                 "MixedLanguages",
                 "UnsupportedJavaVersion",
+                "ProjectJDKDiffersFromMavenJDK",
                 "NonMavenProject",
                 "EmptyProject",
                 "NonSsoLogin",
@@ -1088,8 +1090,9 @@
             "type": "string",
             "description": "Type of maven command",
             "allowedValues": [
-                "mvn",
+                "mvnw.cmd",
                 "mvnw",
+                "mvn",
                 "IDEBundledMaven"
             ]
         }
@@ -2783,12 +2786,6 @@
             ],
             "passive": true
         },
-        {
-            "name": "amazonq_startChat",
-            "description": "Number of times the user have triggered /dev and started the chat",
-            "unit": "Count",
-            "metadata": [{ "type": "amazonqConversationId" }]
-        },
         {
             "name": "amazonq_endChat",
             "description": "Captures end of the conversation with amazonq /dev",
@@ -3452,6 +3449,21 @@
                 }
             ]
         },
+        {
+            "name": "codewhisperer_enabled",
+            "description": "Whether or not CodeWhisperer is enabled",
+            "passive": true,
+            "metadata": [
+                {
+                    "type": "source",
+                    "required": true
+                },
+                {
+                    "type": "enabled",
+                    "required": true
+                }
+            ]
+        },
         {
             "name": "codecatalyst_createDevEnvironment",
             "description": "Create an Amazon CodeCatalyst Dev Environment",
@@ -3655,6 +3667,32 @@
                 }
             ]
         },
+        {
+            "name": "codeTransform_projectDetails",
+            "description": "Transform initiates project validation before user interaction and we want to gather project details then.",
+            "metadata" : [
+                {
+                    "type": "codeTransformSessionId",
+                    "required": true
+                },
+                {
+                    "type": "result",
+                    "required": true
+                },
+                {
+                    "type": "reason",
+                    "required": false
+                },
+                {
+                    "type": "codeTransformPreValidationError",
+                    "required": false
+                },
+                {
+                    "type": "codeTransformLocalJavaVersion",
+                    "required": false
+                }
+            ]
+        },
         {
             "name": "codeTransform_jobStatusChanged",
             "passive": true,
@@ -3797,6 +3835,10 @@
                 {
                     "type": "codeTransformJobId",
                     "required": false
+                },
+                {
+                    "type": "codeTransformStatus",
+                    "required": true
                 }
             ]
         },
@@ -3811,6 +3853,10 @@
                 {
                     "type": "codeTransformJobId",
                     "required": false
+                },
+                {
+                    "type": "codeTransformStatus",
+                    "required": true
                 }
             ]
         },

diff --git a/telemetry/service/service-model.json b/telemetry/service/service-model.json
@@ -186,7 +186,7 @@
         "AWSProductVersion":{"shape":"AWSProductVersion"},
         "OS":{"shape":"Value"},
         "OSVersion":{"shape":"Value"},
-        "CommputeEnv": {"shape":"ComputeEnv"},
+        "ComputeEnv": {"shape":"ComputeEnv"},
         "ParentProduct":{"shape":"Value"},
         "ParentProductVersion":{"shape":"Value"},
         "Metadata":{"shape":"Metadata"},
@@ -209,7 +209,7 @@
         "OS":{"shape":"Value"},
         "OSArchitecture":{"shape":"Value"},
         "OSVersion":{"shape":"Value"},
-        "CommputeEnv": {"shape":"ComputeEnv"},
+        "ComputeEnv": {"shape":"ComputeEnv"},
         "ParentProduct":{"shape":"Value"},
         "ParentProductVersion":{"shape":"Value"},
         "MetricData":{"shape":"MetricData"}

diff --git a/version b/version
@@ -1 +1 @@
-1.0.185
+1.0.189