Merge branch 'feature/cw-proactive-scan' into feature/abtesting

Author: laileni-aws

.changes/next-release/feature-7af4897f-efe2-4b02-b029-f1e9042b1b64.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Connection id is now shown beside CodeCatalyst dropdown"
+}

.gitignore

@@ -4,6 +4,7 @@ target/
 .idea
 !.run/
 build/
+gradle_build/
 *.iml
 .DS_Store
 Build/

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/Session.kt

@@ -5,6 +5,7 @@ package software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session
 
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtil
+import software.aws.toolkits.jetbrains.services.amazonq.FeatureDevSessionContext
 import software.aws.toolkits.jetbrains.services.amazonq.messages.MessagePublisher
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.APPROACH_RETRY_LIMIT
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CODE_GENERATION_RETRY_LIMIT

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/SessionStateTypes.kt

@@ -4,6 +4,7 @@
 package software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session
 
 import com.fasterxml.jackson.annotation.JsonValue
+import software.aws.toolkits.jetbrains.services.amazonq.FeatureDevSessionContext
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.clients.FeatureDevClient
 import software.aws.toolkits.jetbrains.services.cwc.messages.CodeReference
 

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

@@ -10,7 +10,6 @@ import software.amazon.awssdk.services.toolkittelemetry.model.Sentiment
 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.feedback.sendFeedbackWithExperimentsMetadata
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
@@ -21,6 +20,7 @@ import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessage
 import software.aws.toolkits.jetbrains.services.cwc.messages.IncomingCwcMessage
 import software.aws.toolkits.jetbrains.services.cwc.messages.LinkType
 import software.aws.toolkits.jetbrains.services.cwc.storage.ChatSessionStorage
+import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
 import software.aws.toolkits.jetbrains.utils.notifyError
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
@@ -272,7 +272,7 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se
         )
 
         try {
-            sendFeedbackWithExperimentsMetadata(
+            TelemetryService.getInstance().sendFeedback(
                 sentiment = Sentiment.NEGATIVE,
                 comment = ChatController.objectMapper.writeValueAsString(comment),
             )

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareRefinementStateTest.kt

@@ -18,9 +18,10 @@ import org.mockito.kotlin.mock
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
+import software.aws.toolkits.jetbrains.services.amazonq.FeatureDevSessionContext
+import software.aws.toolkits.jetbrains.services.amazonq.ZipCreationResult
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevTestBase
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.clients.FeatureDevClient
-import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.model.ZipCreationResult
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.uploadArtifactToS3
 import java.io.File
 

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/RefinementStateTest.kt

@@ -15,6 +15,7 @@ import org.mockito.kotlin.mock
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
+import software.aws.toolkits.jetbrains.services.amazonq.FeatureDevSessionContext
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevException
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevTestBase
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.clients.FeatureDevClient

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/CodeTransformFeedbackDialog.kt

@@ -4,8 +4,8 @@
 package software.aws.toolkits.jetbrains.ui.feedback
 
 import com.intellij.openapi.project.Project
-import software.aws.toolkits.jetbrains.feedback.sendFeedbackWithExperimentsMetadata
 import software.aws.toolkits.jetbrains.services.codemodernizer.state.CodeModernizerSessionState
+import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
 import software.aws.toolkits.resources.message
 
 class CodeTransformFeedbackDialog(project: Project) : FeedbackDialog(project) {
@@ -21,7 +21,7 @@ class CodeTransformFeedbackDialog(project: Project) : FeedbackDialog(project) {
     override suspend fun sendFeedback() {
         val sessionState = CodeModernizerSessionState.getInstance(project)
         val jobId: String = sessionState.currentJobId?.id ?: "None"
-        sendFeedbackWithExperimentsMetadata(
+        TelemetryService.getInstance().sendFeedback(
             sentiment,
             "Amazon Q onboarding: $commentText",
             mapOf(FEEDBACK_SOURCE to "Amazon Q onboarding", "JobId" to jobId)

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/coroutines/scopes.kt

@@ -19,6 +19,7 @@ import java.util.concurrent.CancellationException
  *
  * Use this if the coroutine needs to live past a project being closed or across projects such as an Application Service
  */
+@Deprecated("Application x plugin intersection scope should not be used https://plugins.jetbrains.com/docs/intellij/coroutine-scopes.html#use-service-scopes")
 fun applicationCoroutineScope(coroutineName: String): CoroutineScope =
     PluginCoroutineScopeTracker.getInstance().applicationThreadPoolScope(coroutineName)
 
@@ -27,6 +28,7 @@ fun applicationCoroutineScope(coroutineName: String): CoroutineScope =
  *
  * Use this if the coroutine needs to live past a UI being closed, or tied to a project's life cycle such as a Project Service.
  */
+@Deprecated("Project x plugin intersection scope should not be used https://plugins.jetbrains.com/docs/intellij/coroutine-scopes.html#use-service-scopes")
 fun projectCoroutineScope(project: Project, coroutineName: String): CoroutineScope =
     PluginCoroutineScopeTracker.getInstance(project).applicationThreadPoolScope(coroutineName)
 
@@ -38,6 +40,9 @@ fun projectCoroutineScope(project: Project, coroutineName: String): CoroutineSco
  * **Note: If a call lives past the closing of a UI such as kicking off a resource creation, use [projectCoroutineScope].
  * Otherwise, the coroutine will be canceled when the UI is closed!**
  */
+@Deprecated(
+    "Coroutine scope should not be shared across entire plugin lifecycle https://plugins.jetbrains.com/docs/intellij/coroutine-scopes.html#use-service-scopes"
+)
 fun disposableCoroutineScope(disposable: Disposable, coroutineName: String): CoroutineScope {
     check(disposable !is Project && disposable !is Application) { "disposable should not be a project or application" }
     return PluginCoroutineScopeTracker.getInstance().applicationThreadPoolScope(coroutineName).also {
@@ -50,18 +55,23 @@ fun disposableCoroutineScope(disposable: Disposable, coroutineName: String): Cor
 /**
  * Version of [applicationCoroutineScope] the class name as the coroutine name.
  */
+@Deprecated("Application x plugin intersection scope should not be used https://plugins.jetbrains.com/docs/intellij/coroutine-scopes.html#use-service-scopes")
 inline fun <reified T : Any> T.applicationCoroutineScope(): CoroutineScope =
     applicationCoroutineScope(T::class.java.name)
 
 /**
  * Version of [projectCoroutineScope] the class name as the coroutine name.
  */
+@Deprecated("Project x plugin intersection scope should not be used https://plugins.jetbrains.com/docs/intellij/coroutine-scopes.html#use-service-scopes")
 inline fun <reified T : Any> T.projectCoroutineScope(project: Project): CoroutineScope =
     projectCoroutineScope(project, T::class.java.name)
 
 /**
  * Version of [disposableCoroutineScope] the class name as the coroutine name.
  */
+@Deprecated(
+    "Coroutine scope should not be shared across entire plugin lifecycle https://plugins.jetbrains.com/docs/intellij/coroutine-scopes.html#use-service-scopes"
+)
 inline fun <reified T : Any> T.disposableCoroutineScope(disposable: Disposable): CoroutineScope =
     disposableCoroutineScope(disposable, T::class.java.name)
 

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

@@ -224,7 +224,7 @@ class DefaultToolkitAuthManager : ToolkitAuthManager, PersistentStateComponent<T
         }
 
         is DetectedDiskSsoSessionProfile -> DetectedDiskSsoSessionConnection(
-            sessionProfileName = profile.profileName,
+            sessionName = profile.profileName,
             startUrl = profile.startUrl,
             region = profile.ssoRegion,
             scopes = profile.scopes