Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class AmazonQToolWindowListener : ToolWindowManagerListener {

override fun toolWindowShown(toolWindow: ToolWindow) {
if (toolWindow.id == AmazonQToolWindowFactory.WINDOW_ID) {
TelemetryHelper.recordOpenChat()
TelemetryHelper.recordOpenChat(toolWindow.project)
}
}

Expand All @@ -26,7 +26,7 @@ class AmazonQToolWindowListener : ToolWindowManagerListener {
}

if (changeType == ToolWindowManagerListener.ToolWindowManagerEventType.HideToolWindow) {
TelemetryHelper.recordCloseChat()
TelemetryHelper.recordCloseChat(toolWindow.project)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
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.ToolkitConnection
import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererCustomization
import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
Expand All @@ -29,6 +32,7 @@
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
import software.aws.toolkits.jetbrains.utils.notifyError
import software.aws.toolkits.resources.message
import software.aws.toolkits.telemetry.AuthTelemetry

Check warning on line 35 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Usage of redundant or deprecated syntax or deprecated symbols

Remove deprecated symbol import

Check warning on line 35 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Usage of redundant or deprecated syntax or deprecated symbols

'AuthTelemetry' is deprecated. Use type-safe metric builders

Check warning

Code scanning / QDJVMC

Usage of redundant or deprecated syntax or deprecated symbols Warning

Remove deprecated symbol import

Check warning

Code scanning / QDJVMC

Usage of redundant or deprecated syntax or deprecated symbols Warning

'AuthTelemetry' is deprecated. Use type-safe metric builders
import software.aws.toolkits.telemetry.CwsprChatCommandType
import software.aws.toolkits.telemetry.CwsprChatConversationType
import software.aws.toolkits.telemetry.CwsprChatInteractionType
Expand Down Expand Up @@ -410,20 +414,30 @@
companion object {
private val logger = getLogger<TelemetryHelper>()

fun recordOpenChat() {
Telemetry.amazonq.openChat.use { it.passive(true) }
private fun getQConnection(project: Project): ToolkitConnection? = ToolkitConnectionManager.getInstance(
project
).activeConnectionForFeature(QConnection.getInstance())
}

fun recordOpenChat(project: Project) {

Check warning on line 422 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Unused symbol

Function "recordOpenChat" is never used
Telemetry.amazonq.openChat.use { it.passive(true) }
if (getQConnection(project) == null) {
AuthTelemetry.signInPageOpened()

Check warning on line 425 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Usage of redundant or deprecated syntax or deprecated symbols

'AuthTelemetry' is deprecated. Use type-safe metric builders
}
}

fun recordCloseChat() {
Telemetry.amazonq.closeChat.use { it.passive(true) }
fun recordCloseChat(project: Project) {

Check warning on line 429 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Unused symbol

Function "recordCloseChat" is never used
Telemetry.amazonq.closeChat.use { it.passive(true) }
if (getQConnection(project) == null) {
AuthTelemetry.signInPageClosed()

Check warning on line 432 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Usage of redundant or deprecated syntax or deprecated symbols

'AuthTelemetry' is deprecated. Use type-safe metric builders
}
}

fun recordTelemetryChatRunCommand(type: CwsprChatCommandType, name: String? = null, startUrl: String? = null) {
Telemetry.amazonq.runCommand.use {
it.cwsprChatCommandType(type)
.cwsprChatCommandName(name)
.credentialStartUrl(startUrl)
}
fun recordTelemetryChatRunCommand(type: CwsprChatCommandType, name: String? = null, startUrl: String? = null) {

Check warning on line 436 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt

View workflow job for this annotation

GitHub Actions / Qodana Community for JVM

Unused symbol

Function "recordTelemetryChatRunCommand" is never used
Telemetry.amazonq.runCommand.use {
it.cwsprChatCommandType(type)
.cwsprChatCommandName(name)
.credentialStartUrl(startUrl)
}
}
}
Expand Down
Loading