Merge remote-tracking branch 'origin/main' into rli/243

Author: rli

.changes/3.30.json

@@ -0,0 +1,11 @@
+{
+  "date" : "2024-09-27",
+  "version" : "3.30",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q Code Transformation: notify users when no JDK is set in Project Structure settings"
+  }, {
+    "type" : "bugfix",
+    "description" : "Automatically terminate orphaned process for `@workspace` helper"
+  } ]
+}

.changes/next-release/bugfix-79dc3ea8-07f6-4eff-ae0f-0ea0a02db7f7.json

@@ -1,3 +1,7 @@
+# _3.30_ (2024-09-27)
+- **(Bug Fix)** Amazon Q Code Transformation: notify users when no JDK is set in Project Structure settings
+- **(Bug Fix)** Automatically terminate orphaned process for `@workspace` helper
+
 # _3.29_ (2024-09-19)
 - **(Feature)** Support `@workspace` queries for specific files like "`@workspace` what does test.ts do?".
 - **(Bug Fix)** Amazon Q Feature Dev: fix iteration count messaging during code insertion

CHANGELOG.md

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.30-SNAPSHOT
+toolkitVersion=3.31-SNAPSHOT
 
 # Publish Settings
 publishToken=

gradle.properties

@@ -25,7 +25,7 @@ mockitoKotlin = "5.4.0"
 mockk = "1.13.10"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.259"
+telemetryGenerator = "1.0.262"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime

gradle/libs.versions.toml

@@ -62,7 +62,8 @@ class QGettingStartedContent(val project: Project) : Disposable {
                     AmazonQToolWindow.getStarted(project)
                 }
             }
-            null
+
+            JBCefJSQuery.Response(null)
         }
         receiveMessageQuery.addHandler(handler)
     }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt

@@ -8,9 +8,6 @@ import com.intellij.openapi.util.Disposer
 import com.intellij.ui.jcef.JBCefJSQuery
 import org.cef.CefApp
 import software.aws.toolkits.jetbrains.services.amazonq.util.createBrowser
-import java.util.function.Function
-
-typealias MessageReceiver = Function<String, JBCefJSQuery.Response>
 
 /*
 Displays the web view for the Amazon Q tool window

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt

@@ -77,7 +77,7 @@ class BrowserConnector(
     private fun addMessageHook(browser: Browser) = callbackFlow {
         val handler = Function<String, Response> {
             trySend(it)
-            null
+            Response(null)
         }
 
         browser.receiveMessageQuery.addHandler(handler)

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

@@ -102,18 +102,18 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se
             cwsprChatUserIntent = data.userIntent?.let { getTelemetryUserIntent(it) },
             cwsprChatHasCodeSnippet = data.activeFileContext.focusAreaContext?.codeSelection?.isNotEmpty() ?: false,
             cwsprChatProgrammingLanguage = data.activeFileContext.fileContext?.fileLanguage,
-            cwsprChatActiveEditorTotalCharacters = data.activeFileContext.focusAreaContext?.codeSelection?.length,
-            cwsprChatActiveEditorImportCount = data.activeFileContext.focusAreaContext?.codeNames?.fullyQualifiedNames?.used?.size,
-            cwsprChatResponseCodeSnippetCount = numberOfCodeBlocks,
-            cwsprChatResponseCode = statusCode,
-            cwsprChatSourceLinkCount = response.relatedSuggestions?.size,
+            cwsprChatActiveEditorTotalCharacters = data.activeFileContext.focusAreaContext?.codeSelection?.length?.toLong(),
+            cwsprChatActiveEditorImportCount = data.activeFileContext.focusAreaContext?.codeNames?.fullyQualifiedNames?.used?.size?.toLong(),
+            cwsprChatResponseCodeSnippetCount = numberOfCodeBlocks.toLong(),
+            cwsprChatResponseCode = statusCode.toLong(),
+            cwsprChatSourceLinkCount = response.relatedSuggestions?.size?.toLong(),
             cwsprChatReferencesCount = 0, // TODO
-            cwsprChatFollowUpCount = response.followUps?.size,
-            cwsprChatTimeToFirstChunk = getResponseStreamTimeToFirstChunk(response.tabId).toInt(),
+            cwsprChatFollowUpCount = response.followUps?.size?.toLong(),
+            cwsprChatTimeToFirstChunk = getResponseStreamTimeToFirstChunk(response.tabId).toLong(),
             cwsprChatTimeBetweenChunks = "[${getResponseStreamTimeBetweenChunks(response.tabId).joinToString(",")}]",
-            cwsprChatFullResponseLatency = responseStreamTotalTime[response.tabId] ?: 0,
-            cwsprChatRequestLength = data.message.length,
-            cwsprChatResponseLength = responseLength,
+            cwsprChatFullResponseLatency = responseStreamTotalTime[response.tabId]?.toLong() ?: 0,
+            cwsprChatRequestLength = data.message.length.toLong(),
+            cwsprChatResponseLength = responseLength.toLong(),
             cwsprChatConversationType = CwsprChatConversationType.Chat,
             credentialStartUrl = getStartUrl(context.project),
             codewhispererCustomizationArn = data.customization?.arn,
@@ -152,10 +152,10 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se
             cwsprChatUserIntent = data.userIntent?.let { getTelemetryUserIntent(it) },
             cwsprChatHasCodeSnippet = data.activeFileContext.focusAreaContext?.codeSelection?.isNotEmpty() ?: false,
             cwsprChatProgrammingLanguage = data.activeFileContext.fileContext?.fileLanguage,
-            cwsprChatActiveEditorTotalCharacters = data.activeFileContext.focusAreaContext?.codeSelection?.length,
-            cwsprChatActiveEditorImportCount = data.activeFileContext.focusAreaContext?.codeNames?.fullyQualifiedNames?.used?.size,
-            cwsprChatResponseCode = responseCode,
-            cwsprChatRequestLength = data.message.length,
+            cwsprChatActiveEditorTotalCharacters = data.activeFileContext.focusAreaContext?.codeSelection?.length?.toLong(),
+            cwsprChatActiveEditorImportCount = data.activeFileContext.focusAreaContext?.codeNames?.fullyQualifiedNames?.used?.size?.toLong(),
+            cwsprChatResponseCode = responseCode.toLong(),
+            cwsprChatRequestLength = data.message.length.toLong(),
             cwsprChatConversationType = CwsprChatConversationType.Chat,
             credentialStartUrl = getStartUrl(context.project)
         )
@@ -210,13 +210,14 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se
                 AmazonqTelemetry.interactWithMessage(
                     cwsprChatConversationId = getConversationId(message.tabId).orEmpty(),
                     cwsprChatMessageId = message.messageId,
+                    cwsprChatUserIntent = message.userIntent?.let { getTelemetryUserIntent(it) },
                     cwsprChatInteractionType = CwsprChatInteractionType.CopySnippet,
-                    cwsprChatAcceptedCharactersLength = message.code.length,
+                    cwsprChatAcceptedCharactersLength = message.code.length.toLong(),
                     cwsprChatInteractionTarget = message.insertionTargetType,
                     cwsprChatHasReference = null,
                     credentialStartUrl = getStartUrl(context.project),
-                    cwsprChatCodeBlockIndex = message.codeBlockIndex,
-                    cwsprChatTotalCodeBlocks = message.totalCodeBlocks,
+                    cwsprChatCodeBlockIndex = message.codeBlockIndex?.toLong(),
+                    cwsprChatTotalCodeBlocks = message.totalCodeBlocks?.toLong(),
                     cwsprChatHasProjectContext = getMessageHasProjectContext(message.messageId)
                 )
                 ChatInteractWithMessageEvent.builder().apply {
@@ -233,14 +234,15 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se
                 AmazonqTelemetry.interactWithMessage(
                     cwsprChatConversationId = getConversationId(message.tabId).orEmpty(),
                     cwsprChatMessageId = message.messageId,
+                    cwsprChatUserIntent = message.userIntent?.let { getTelemetryUserIntent(it) },
                     cwsprChatInteractionType = CwsprChatInteractionType.InsertAtCursor,
-                    cwsprChatAcceptedCharactersLength = message.code.length,
-                    cwsprChatAcceptedNumberOfLines = message.code.lines().size,
+                    cwsprChatAcceptedCharactersLength = message.code.length.toLong(),
+                    cwsprChatAcceptedNumberOfLines = message.code.lines().size.toLong(),
                     cwsprChatInteractionTarget = message.insertionTargetType,
                     cwsprChatHasReference = null,
                     credentialStartUrl = getStartUrl(context.project),
-                    cwsprChatCodeBlockIndex = message.codeBlockIndex,
-                    cwsprChatTotalCodeBlocks = message.totalCodeBlocks,
+                    cwsprChatCodeBlockIndex = message.codeBlockIndex?.toLong(),
+                    cwsprChatTotalCodeBlocks = message.totalCodeBlocks?.toLong(),
                     cwsprChatHasProjectContext = getMessageHasProjectContext(message.messageId)
                 )
                 ChatInteractWithMessageEvent.builder().apply {
@@ -422,11 +424,11 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se
             AmazonqTelemetry.indexWorkspace(
                 project = null,
                 duration = duration,
-                amazonqIndexFileCount = fileCount,
-                amazonqIndexFileSizeInMB = fileSize,
+                amazonqIndexFileCount = fileCount.toLong(),
+                amazonqIndexFileSizeInMB = fileSize.toLong(),
                 success = isSuccess,
-                amazonqIndexMemoryUsageInMB = memoryUsage,
-                amazonqIndexCpuUsagePercentage = cpuUsage,
+                amazonqIndexMemoryUsageInMB = memoryUsage?.toLong(),
+                amazonqIndexCpuUsagePercentage = cpuUsage?.toLong(),
                 credentialStartUrl = startUrl
             )
         }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

@@ -15,7 +15,7 @@ import software.aws.toolkits.jetbrains.core.getTextFromUrl
 
 class ManifestManager {
     private val cloudFrontUrl = "https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json"
-    val currentVersion = "0.1.9"
+    val currentVersion = "0.1.10"
     val currentOs = getOs()
     private val arch = CpuArch.CURRENT
     private val mapper = jacksonObjectMapper()