From 9dc839886d88dfb985efdfb7eba5ed14e8b10e53 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 03:02:23 +0000 Subject: [PATCH 01/13] deps: bump Microsoft.NET.Test.Sdk in /telemetry/csharp Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.8.0 to 17.9.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.8.0...v17.9.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../AwsToolkit.Telemetry.Events.Generator.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj index 11db603b..3f007af6 100644 --- a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj +++ b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj @@ -11,7 +11,7 @@ - + all From 17bef8563c1604b34797b5fb4096785375e94e44 Mon Sep 17 00:00:00 2001 From: David Hasani <60020664+dhasani23@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:43:55 -0800 Subject: [PATCH 02/13] telemetry(CodeTransform): add status field to vcs metrics (#691) * telemetry(CodeTransform): add status field to vcs metrics * revert grammer change --------- Co-authored-by: David Hasani --- telemetry/definitions/commonDefinitions.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index 5b8428bc..3ae68118 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -968,7 +968,7 @@ { "name": "codeTransformRequestId", "type": "string", - "description": "A string id for the API request" + "description": "The API request ID" }, { "name": "codeTransformTotalByteSize", @@ -3797,6 +3797,10 @@ { "type": "codeTransformJobId", "required": false + }, + { + "type": "codeTransformStatus", + "required": true } ] }, @@ -3811,6 +3815,10 @@ { "type": "codeTransformJobId", "required": false + }, + { + "type": "codeTransformStatus", + "required": true } ] }, From 3e8a4e24a3e6ebcc197aae3e1de3a388dba75060 Mon Sep 17 00:00:00 2001 From: dhruvigajjar <50885351+dhruvigajjar@users.noreply.github.com> Date: Fri, 9 Feb 2024 12:39:34 -0800 Subject: [PATCH 03/13] Gajjardh/add computeEnv field to metric events (#692) * added ComputeEnv as type with dev, local, test, web, cc, cloud9, wsl, ssh as env * Update telemetry/service/service-model.json Co-authored-by: Justin M. Keyes * added cloud9-codecatalyst * fixed a typo --------- Co-authored-by: Justin M. Keyes --- telemetry/service/service-model.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telemetry/service/service-model.json b/telemetry/service/service-model.json index 8998812b..35d7d973 100644 --- 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"} From dda0833510d3a4cae8761b385b8b814c0b0b2d1f Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Fri, 9 Feb 2024 21:39:48 +0000 Subject: [PATCH 04/13] Release version 1.0.186 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index d1b85071..309a6e28 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.185 +1.0.186 From 1c39ac4601ad442f270a9c55436c2b9ed4b464ec Mon Sep 17 00:00:00 2001 From: Diana Abitova <144136687+dianaabv16@users.noreply.github.com> Date: Tue, 13 Feb 2024 18:35:08 +0100 Subject: [PATCH 05/13] telemetry: remove redundant amazonq_startChat metric #693 --- telemetry/definitions/commonDefinitions.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index 3ae68118..3a8abbe1 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -2783,12 +2783,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", From 600fd5ee0e1b4084fb15daa82fe5d51fcba25dd1 Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Tue, 13 Feb 2024 17:39:49 +0000 Subject: [PATCH 06/13] Release version 1.0.187 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 309a6e28..53faade9 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.186 +1.0.187 From b6e75ace7d59231ac814d0a91ba6fc284674b9fc Mon Sep 17 00:00:00 2001 From: Nick Ardecky <38665452+damntrecky@users.noreply.github.com> Date: Fri, 16 Feb 2024 01:19:44 -0800 Subject: [PATCH 07/13] pre validation project details (#695) * Feature - add shared telemetry metrics for AmazonQ Transform * Chore - remove type codeTransformConfigurationFilePath * Chore - update metric description definitions text * Chore - remove isVisibleToUser field * Chore - add newline character to file * Chore - update description for total runtime * Chore - fix build isssue to replace allowedValues spaces with underscores * Chore - follow up with jetbrains underscore conversion * Chore - update descriptions --------- Co-authored-by: Nick Ardecky --- telemetry/definitions/commonDefinitions.json | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index 3a8abbe1..a1661c2c 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -3649,6 +3649,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, From e09a7ca4bddf1cff7729b960886a179119c91db6 Mon Sep 17 00:00:00 2001 From: David Hasani <60020664+dhasani23@users.noreply.github.com> Date: Fri, 16 Feb 2024 01:21:17 -0800 Subject: [PATCH 08/13] telemetry(CodeTransform): enhance metrics (#698) * telemetry(CodeTransform): enhance metrics * remove special char --------- Co-authored-by: David Hasani --- telemetry/definitions/commonDefinitions.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index a1661c2c..f12412c3 100644 --- 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" ] }, { @@ -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" ] } From 40a5124d1f43adf3e8d035f3e5e86b5a1fa1f8e3 Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Fri, 16 Feb 2024 09:39:47 +0000 Subject: [PATCH 09/13] Release version 1.0.188 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 53faade9..f3f8b218 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.187 +1.0.188 From f181eb0cd76dfb99ef2d836679dd57255df1a44d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 02:27:44 +0000 Subject: [PATCH 10/13] deps: bump the xunit group in /telemetry/csharp with 1 update Bumps the xunit group in /telemetry/csharp with 1 update: [xunit](https://github.com/xunit/xunit). Updates `xunit` from 2.6.6 to 2.7.0 - [Commits](https://github.com/xunit/xunit/compare/2.6.6...2.7.0) --- updated-dependencies: - dependency-name: xunit dependency-type: direct:production update-type: version-update:semver-minor dependency-group: xunit ... Signed-off-by: dependabot[bot] --- .../AwsToolkit.Telemetry.Events.Generator.Tests.csproj | 2 +- .../AwsToolkit.Telemetry.Events.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj index 3f007af6..bc068e10 100644 --- a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj +++ b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj @@ -12,7 +12,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 index fbd8da6a..cb7aa40b 100644 --- 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,7 +12,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From d27338f762e7d59abf2a68d88fd4a8d7449c8ab6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 16:35:41 +0000 Subject: [PATCH 11/13] deps: bump xunit.runner.visualstudio in /telemetry/csharp Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 2.5.6 to 2.5.7. - [Release notes](https://github.com/xunit/visualstudio.xunit/releases) - [Commits](https://github.com/xunit/visualstudio.xunit/compare/2.5.6...2.5.7) --- updated-dependencies: - dependency-name: xunit.runner.visualstudio dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../AwsToolkit.Telemetry.Events.Generator.Tests.csproj | 2 +- .../AwsToolkit.Telemetry.Events.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj index bc068e10..78db7903 100644 --- a/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj +++ b/telemetry/csharp/AwsToolkit.Telemetry.Events.Generator.Tests/AwsToolkit.Telemetry.Events.Generator.Tests.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 index cb7aa40b..accf7fc6 100644 --- a/telemetry/csharp/AwsToolkit.Telemetry.Events.Tests/AwsToolkit.Telemetry.Events.Tests.csproj +++ b/telemetry/csharp/AwsToolkit.Telemetry.Events.Tests/AwsToolkit.Telemetry.Events.Tests.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 5163b79ab7d1201819cc2d78aa724801e918b4ad Mon Sep 17 00:00:00 2001 From: Christopher Christou <39839589+awschristou@users.noreply.github.com> Date: Fri, 16 Feb 2024 13:24:06 -0800 Subject: [PATCH 12/13] Measure whether CodeWhisperer is enabled or not (#699) --- telemetry/definitions/commonDefinitions.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/telemetry/definitions/commonDefinitions.json b/telemetry/definitions/commonDefinitions.json index f12412c3..ca90f765 100644 --- a/telemetry/definitions/commonDefinitions.json +++ b/telemetry/definitions/commonDefinitions.json @@ -3449,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", From ba25dfe8e5b5ced5c784fa9c965dc90105776bca Mon Sep 17 00:00:00 2001 From: aws-toolkit-automation <> Date: Fri, 16 Feb 2024 21:39:48 +0000 Subject: [PATCH 13/13] Release version 1.0.189 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index f3f8b218..da0f58aa 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.188 +1.0.189