Merge branch 'main' into feature/q-hil-updates

aws · Apr 23, 2024 · 59dec50 · 59dec50
2 parents 63d8f08 + c20a5db
commit 59dec50
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 11 deletions.
diff --git a/telemetry/README.md b/telemetry/README.md
@@ -1,7 +1,7 @@
 # Telemetry
 
 `telemetry` contains code generators and definitions files to generate telemetry calls for the various
-AWS Toolkits.
+AWS IDE Extensions.
 
 ## Adding Telemetry
 

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
@@ -12,8 +12,8 @@
 
   <ItemGroup>
     <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">
+    <PackageReference Include="xunit" Version="2.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
       <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.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="xunit" Version="2.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json
@@ -425,6 +425,15 @@
             "type": "double",
             "description": "The total size in bytes of customer project to perform security scan on"
         },
+        {
+            "name": "codewhispererCodeScanScope",
+            "type": "string",
+            "description": "The scope of the security scan being performed",
+            "allowedValues": [
+                "FILE",
+                "PROJECT"
+            ]
+        },
         {
             "name": "codewhispererCodeScanSrcPayloadBytes",
             "type": "int",
@@ -1058,6 +1067,11 @@
             "type": "boolean",
             "description": "Whether this was an individual point or an aggregation of points."
         },
+        {
+            "name": "isReAuth",
+            "type": "boolean",
+            "description": "If this was performed as part of the reauthentication flow."
+        },
         {
             "name": "lambdaArchitecture",
             "allowedValues": [
@@ -1980,10 +1994,18 @@
                     "type": "credentialSourceId",
                     "required": false
                 },
+                {
+                    "type": "credentialStartUrl",
+                    "required": false
+                },
                 {
                     "type": "credentialType",
                     "required": false
                 },
+                {
+                    "type": "isReAuth",
+                    "required": false
+                },
                 {
                     "type": "result"
                 }
@@ -2975,6 +2997,10 @@
                 {
                     "type": "codeTransformSessionId",
                     "required": true
+                },
+                {
+                    "type": "credentialSourceId",
+                    "required": false
                 }
             ]
         },
@@ -3564,6 +3590,10 @@
                     "type": "codewhispererCodeScanProjectBytes",
                     "required": false
                 },
+                {
+                    "type": "codewhispererCodeScanScope",
+                    "required": false
+                },
                 {
                     "type": "codewhispererCodeScanSrcPayloadBytes"
                 },

diff --git a/telemetry/jetbrains/build.gradle.kts b/telemetry/jetbrains/build.gradle.kts
@@ -103,7 +103,7 @@ publishing {
             from(components["java"])
             pom {
                 name.set(project.name)
-                description.set("Telemetry generation for AWS Toolkit for JetBrains")
+                description.set("Telemetry generation for AWS Toolkit and Amazon Q for JetBrains")
                 url.set("https://github.com/aws/aws-toolkit-common")
                 licenses {
                     license {

diff --git a/telemetry/service/service-model.json b/telemetry/service/service-model.json
@@ -45,7 +45,9 @@
         "AWS Toolkit For JetBrains",
         "AWS Toolkit For Eclipse",
         "AWS Toolkit For VisualStudio",
-        "AWS Toolkit For VS Code"
+        "AWS Toolkit For VS Code",
+        "Amazon Q For JetBrains",
+        "Amazon Q For VS Code"
       ]
     },
     "AWSProductVersion":{

diff --git a/telemetry/vscode/README.md b/telemetry/vscode/README.md
@@ -1,6 +1,8 @@
-# AWS Toolkit for VSCode Telemetry
+# AWS Toolkit/Amazon Q for VSCode Telemetry
 
-This package contains scripts and files to generate telemetry calls for the [AWS Toolkit for VS Code](https://github.com/aws/aws-toolkit-vscode).
+This package contains scripts and files to generate telemetry calls for:
+- [AWS Toolkit for VS Code](https://github.com/aws/aws-toolkit-vscode/tree/master/packages/toolkit)
+- [Amazon Q for VS Code](https://github.com/aws/aws-toolkit-vscode/tree/master/packages/amazonq).
 
 ## Usage
 

diff --git a/telemetry/vscode/package.json b/telemetry/vscode/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@aws-toolkits/telemetry",
     "version": "0.0.2",
-    "description": "A library used by the AWS Toolkit for VSCode to provide telemetry",
+    "description": "A library used by the AWS Toolkit, Amazon Q for VSCode to provide telemetry",
     "main": "./lib/generateTelemetry.js",
     "scripts": {
         "build": "ts-node ./scripts/setUpPackage.ts && tsc -p ./",

diff --git a/version b/version
@@ -1 +1 @@
-1.0.197
+1.0.203