project instance from call site

Author: samgst-amazon

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowListener.kt

@@ -12,7 +12,7 @@ class AmazonQToolWindowListener : ToolWindowManagerListener {
 
     override fun toolWindowShown(toolWindow: ToolWindow) {
         if (toolWindow.id == AmazonQToolWindowFactory.WINDOW_ID) {
-            TelemetryHelper.recordOpenChat()
+            TelemetryHelper.recordOpenChat(toolWindow.project)
         }
     }
 
@@ -26,7 +26,7 @@ class AmazonQToolWindowListener : ToolWindowManagerListener {
         }
 
         if (changeType == ToolWindowManagerListener.ToolWindowManagerEventType.HideToolWindow) {
-            TelemetryHelper.recordCloseChat()
+            TelemetryHelper.recordCloseChat(toolWindow.project)
         }
     }
 }

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

@@ -4,7 +4,6 @@
 package software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry
 
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.project.ProjectManager
 import org.jetbrains.annotations.VisibleForTesting
 import software.amazon.awssdk.services.codewhispererruntime.model.ChatInteractWithMessageEvent
 import software.amazon.awssdk.services.codewhispererruntime.model.ChatMessageInteractionType
@@ -415,20 +414,21 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:
     companion object {
         private val logger = getLogger<TelemetryHelper>()
 
-        fun getQConnection(): ToolkitConnection? = ToolkitConnectionManager.getInstance(
-            ProjectManager.getInstance().openProjects.first()
-        ).activeConnectionForFeature(QConnection.getInstance())
+        fun getQConnection(project: Project): ToolkitConnection? {
+            return ToolkitConnectionManager.getInstance(project)
+                .activeConnectionForFeature(QConnection.getInstance())
+        }
 
-        fun recordOpenChat() {
+        fun recordOpenChat(project: Project) {
             Telemetry.amazonq.openChat.use { it.passive(true) }
-            if (getQConnection() == null) {
+            if (getQConnection(project) == null) {
                 AuthTelemetry.signInPageOpened()
             }
         }
 
-        fun recordCloseChat() {
+        fun recordCloseChat(project: Project) {
             Telemetry.amazonq.closeChat.use { it.passive(true) }
-            if (getQConnection() == null) {
+            if (getQConnection(project) == null) {
                 AuthTelemetry.signInPageClosed()
             }
         }