Merge branch 'main' into samgst/QChatMetrics

Author: samgst-amazon

.changes/3.38.json

@@ -0,0 +1,14 @@
+{
+  "date" : "2024-11-07",
+  "version" : "3.38",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Improve the position that inline chat shortcut hint is shown in editor"
+  }, {
+    "type" : "bugfix",
+    "description" : "Improve `@workspace` index start stop strategy"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fixed an issue where Q inline won't appear in JetBrains remote 2024.2+"
+  } ]
+}

.changes/next-release/bugfix-1b531ca4-5b80-48d9-89e7-ac88adc77ad5.json

@@ -1,3 +1,8 @@
+# _3.38_ (2024-11-07)
+- **(Bug Fix)** Improve the position that inline chat shortcut hint is shown in editor
+- **(Bug Fix)** Improve `@workspace` index start stop strategy
+- **(Bug Fix)** Fixed an issue where Q inline won't appear in JetBrains remote 2024.2+
+
 # _3.37_ (2024-10-31)
 - **(Bug Fix)** Amazon Q /dev: Fix the issue resulting in the first request per conversation to /dev failing
 - **(Bug Fix)** Fix inline chat shortcut hint breaking text selection on remote editors

.changes/next-release/bugfix-4fee3628-1445-40f3-b164-2b0d3c12bd19.json

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

.changes/next-release/bugfix-eb803511-b66c-454e-a832-ca189572d1af.json

@@ -22,17 +22,17 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import software.aws.toolkits.core.utils.createParentDirectories
-import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.deleteIfExists
 import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.inputStreamIfExists
 import software.aws.toolkits.core.utils.outputStream
 import software.aws.toolkits.core.utils.toHexString
 import software.aws.toolkits.core.utils.touch
 import software.aws.toolkits.core.utils.tryDirOp
 import software.aws.toolkits.core.utils.tryFileOp
 import software.aws.toolkits.core.utils.tryOrNull
-import software.aws.toolkits.core.utils.warn
+import software.aws.toolkits.jetbrains.services.telemetry.scrubNames
 import software.aws.toolkits.telemetry.AuthTelemetry
 import software.aws.toolkits.telemetry.Result
 import java.io.InputStream
@@ -97,38 +97,38 @@ class DiskCache(
         }
 
     override fun invalidateClientRegistration(ssoRegion: String) {
-        LOG.debug { "invalidateClientRegistration for $ssoRegion" }
+        LOG.info { "invalidateClientRegistration for $ssoRegion" }
         clientRegistrationCache(ssoRegion).tryDeleteIfExists()
     }
 
     override fun loadClientRegistration(cacheKey: ClientRegistrationCacheKey): ClientRegistration? {
-        LOG.debug { "loadClientRegistration for $cacheKey" }
+        LOG.info { "loadClientRegistration for $cacheKey" }
         val inputStream = clientRegistrationCache(cacheKey).tryInputStreamIfExists()
         if (inputStream == null) {
             val stage = LoadCredentialStage.ACCESS_FILE
-            LOG.warn { "Failed to load Client Registration: cache file does not exist" }
+            LOG.info { "Failed to load Client Registration: cache file does not exist" }
             AuthTelemetry.modifyConnection(
                 action = "Load cache file",
                 source = "loadClientRegistration",
                 result = Result.Failed,
                 reason = "Failed to load Client Registration",
-                reasonDesc = "Load Step:$stage failed. Unable to load file"
+                reasonDesc = "Load Step:$stage failed. Cache file does not exist"
             )
             return null
         }
         return loadClientRegistration(inputStream)
     }
 
     override fun saveClientRegistration(cacheKey: ClientRegistrationCacheKey, registration: ClientRegistration) {
-        LOG.debug { "saveClientRegistration for $cacheKey" }
+        LOG.info { "saveClientRegistration for $cacheKey" }
         val registrationCache = clientRegistrationCache(cacheKey)
         writeKey(registrationCache) {
             objectMapper.writeValue(it, registration)
         }
     }
 
     override fun invalidateClientRegistration(cacheKey: ClientRegistrationCacheKey) {
-        LOG.debug { "invalidateClientRegistration for $cacheKey" }
+        LOG.info { "invalidateClientRegistration for $cacheKey" }
         try {
             clientRegistrationCache(cacheKey).tryDeleteIfExists()
         } catch (e: Exception) {
@@ -137,14 +137,14 @@ class DiskCache(
                 source = "invalidateClientRegistration",
                 result = Result.Failed,
                 reason = "Failed to invalidate Client Registration",
-                reasonDesc = e.message ?: e::class.java.name
+                reasonDesc = e.message?.let { scrubNames(it) } ?: e::class.java.name
             )
             throw e
         }
     }
 
     override fun invalidateAccessToken(ssoUrl: String) {
-        LOG.debug { "invalidateAccessToken for $ssoUrl" }
+        LOG.info { "invalidateAccessToken for $ssoUrl" }
         try {
             accessTokenCache(ssoUrl).tryDeleteIfExists()
         } catch (e: Exception) {
@@ -153,14 +153,14 @@ class DiskCache(
                 source = "invalidateAccessToken",
                 result = Result.Failed,
                 reason = "Failed to invalidate Access Token",
-                reasonDesc = e.message ?: e::class.java.name
+                reasonDesc = e.message?.let { scrubNames(it) } ?: e::class.java.name
             )
             throw e
         }
     }
 
     override fun loadAccessToken(cacheKey: AccessTokenCacheKey): AccessToken? {
-        LOG.debug { "loadAccessToken for $cacheKey" }
+        LOG.info { "loadAccessToken for $cacheKey" }
         val cacheFile = accessTokenCache(cacheKey)
         val inputStream = cacheFile.tryInputStreamIfExists() ?: return null
 
@@ -170,15 +170,15 @@ class DiskCache(
     }
 
     override fun saveAccessToken(cacheKey: AccessTokenCacheKey, accessToken: AccessToken) {
-        LOG.debug { "saveAccessToken for $cacheKey" }
+        LOG.info { "saveAccessToken for $cacheKey" }
         val accessTokenCache = accessTokenCache(cacheKey)
         writeKey(accessTokenCache) {
             objectMapper.writeValue(it, accessToken)
         }
     }
 
     override fun invalidateAccessToken(cacheKey: AccessTokenCacheKey) {
-        LOG.debug { "invalidateAccessToken for $cacheKey" }
+        LOG.info { "invalidateAccessToken for $cacheKey" }
         try {
             accessTokenCache(cacheKey).tryDeleteIfExists()
         } catch (e: Exception) {
@@ -187,7 +187,7 @@ class DiskCache(
                 source = "invalidateAccessToken",
                 result = Result.Failed,
                 reason = "Failed to invalidate Access Token",
-                reasonDesc = e.message ?: e::class.java.name
+                reasonDesc = e.message?.let { scrubNames(it) } ?: e::class.java.name
             )
             throw e
         }
@@ -203,7 +203,7 @@ class DiskCache(
             val sha = sha1(cacheNameMapper.writeValueAsString(it))
 
             cacheDir.resolve("$sha.json").also {
-                LOG.debug { "$cacheKey resolves to $it" }
+                LOG.info { "$cacheKey resolves to $it" }
             }
         }
 
@@ -225,7 +225,7 @@ class DiskCache(
             if (clientRegistration.expiresAt.isNotExpired()) {
                 return clientRegistration
             } else {
-                LOG.warn { "Client Registration is expired" }
+                LOG.info { "Client Registration is expired" }
                 AuthTelemetry.modifyConnection(
                     action = "Validate Credentials",
                     source = "loadClientRegistration",
@@ -236,7 +236,7 @@ class DiskCache(
                 return null
             }
         } catch (e: Exception) {
-            LOG.warn { "Client Registration could not be read" }
+            LOG.info { "Client Registration could not be read" }
             AuthTelemetry.modifyConnection(
                 action = "Validate Credentials",
                 source = "loadClientRegistration",
@@ -269,7 +269,7 @@ class DiskCache(
     }
 
     private fun writeKey(path: Path, consumer: (OutputStream) -> Unit) {
-        LOG.debug { "writing to $path" }
+        LOG.info { "writing to $path" }
         try {
             path.tryDirOp(LOG) { createParentDirectories() }
 
@@ -283,7 +283,7 @@ class DiskCache(
                 source = "writeKey",
                 result = Result.Failed,
                 reason = "Failed to write to cache",
-                reasonDesc = e.message ?: e::class.java.name
+                reasonDesc = e.message?.let { scrubNames(it) } ?: e::class.java.name
             )
             throw e
         }

CHANGELOG.md

@@ -18,11 +18,13 @@ import software.amazon.awssdk.services.ssooidc.model.InvalidClientException
 import software.amazon.awssdk.services.ssooidc.model.InvalidRequestException
 import software.amazon.awssdk.services.ssooidc.model.SlowDownException
 import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_URL
 import software.aws.toolkits.jetbrains.core.credentials.sso.pkce.PKCE_CLIENT_NAME
 import software.aws.toolkits.jetbrains.core.credentials.sso.pkce.ToolkitOAuthService
 import software.aws.toolkits.jetbrains.core.webview.getAuthType
+import software.aws.toolkits.jetbrains.services.telemetry.scrubNames
 import software.aws.toolkits.jetbrains.utils.assertIsNonDispatchThread
 import software.aws.toolkits.jetbrains.utils.sleepWithCancellation
 import software.aws.toolkits.resources.AwsCoreBundle
@@ -182,7 +184,7 @@ class SsoAccessTokenProvider(
                 source = "accessToken",
                 result = Result.Failed,
                 reason = "Failed to write AccessToken to cache",
-                reasonDesc = e.message ?: e::class.java.name,
+                reasonDesc = e.message?.let { scrubNames(it) } ?: e::class.java.name,
             )
             throw e
         }
@@ -224,7 +226,7 @@ class SsoAccessTokenProvider(
                 source = "registerDAGClient",
                 result = Result.Failed,
                 reason = "Failed to write DeviceAuthorizationClientRegistration to cache",
-                reasonDesc = e.message ?: e::class.java.name
+                reasonDesc = e.message?.let { scrubNames(it) } ?: e::class.java.name
             )
             throw e
         }
@@ -276,7 +278,7 @@ class SsoAccessTokenProvider(
                 source = "registerPkceClient",
                 result = Result.Failed,
                 reason = "Failed to write PKCEClientRegistration to cache",
-                reasonDesc = e.message ?: e::class.java.name
+                reasonDesc = e.message?.let { scrubNames(it) } ?: e::class.java.name
             )
             throw e
         }
@@ -498,7 +500,7 @@ class SsoAccessTokenProvider(
                 requestId = requestId,
                 result = Result.Failed
             )
-            LOG.warn { "RefreshAccessTokenFailed: ${e.message}" }
+            LOG.info { "RefreshAccessTokenFailed: ${e.message}" }
             throw e
         }
     }

gradle.properties

@@ -32,6 +32,9 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.PKCEAuthorizationGra
 import software.aws.toolkits.jetbrains.core.credentials.sso.PKCEClientRegistration
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.buildUnmanagedSsoOidcClient
 import software.aws.toolkits.resources.AwsCoreBundle
+import software.aws.toolkits.telemetry.AuthType
+import software.aws.toolkits.telemetry.AwsTelemetry
+import software.aws.toolkits.telemetry.MetricResult
 import java.math.BigInteger
 import java.time.Instant
 import java.util.Base64
@@ -189,13 +192,23 @@ internal class ToolkitOAuthCallbackHandler : OAuthCallbackHandlerBase() {
                 "scopes" to ApplicationNamesInfo.getInstance().fullProductName
             )
         } else {
-            val (error, errorDescription) = (oAuthResult.request as? ToolkitOAuthRequest)?.error ?: OAuthError(null, null)
+            val toolkitRequest = (oAuthResult.request as? ToolkitOAuthRequest)
+            val (error, errorDescription) = toolkitRequest?.error ?: OAuthError(null, null)
             val errorString = if (error != null && errorDescription != null) {
                 "$error: $errorDescription"
             } else {
                 errorDescription ?: error ?: AwsCoreBundle.message("general.unknown_error")
             }
 
+            AwsTelemetry.loginWithBrowser(
+                project = null,
+                credentialStartUrl = toolkitRequest?.registration?.issuerUrl,
+                result = MetricResult.Failed,
+                reason = error,
+                reasonDesc = errorDescription,
+                authType = AuthType.PKCE
+            )
+
             mapOf(
                 "error" to errorString
             )

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/DiskCache.kt

@@ -36,6 +36,7 @@ import software.aws.toolkits.jetbrains.core.credentials.reauthConnectionIfNeeded
 import software.aws.toolkits.jetbrains.core.credentials.sono.CODECATALYST_SCOPES
 import software.aws.toolkits.jetbrains.core.credentials.sono.IDENTITY_CENTER_ROLE_ACCESS_SCOPE
 import software.aws.toolkits.jetbrains.core.credentials.sono.Q_SCOPES
+import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_REGION
 import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_URL
 import software.aws.toolkits.jetbrains.core.credentials.sso.PendingAuthorization
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.InteractiveBearerTokenProvider
@@ -197,7 +198,7 @@ abstract class LoginBrowser(
                 reason = e.message,
                 credentialSourceId = CredentialSourceId.AwsId,
                 isReAuth = isReauth,
-                authType = getAuthType()
+                authType = getAuthType(SONO_REGION)
             )
             AuthTelemetry.addConnection(
                 result = Result.Failed,
@@ -217,7 +218,7 @@ abstract class LoginBrowser(
                 result = Result.Succeeded,
                 credentialSourceId = CredentialSourceId.AwsId,
                 isReAuth = isReauth,
-                authType = getAuthType()
+                authType = getAuthType(SONO_REGION)
             )
             AuthTelemetry.addConnection(
                 result = Result.Succeeded,