Don't send experiments data for non-toolkit related feedback (#4307)

Experiments service does not exist and is not relevant for Q standalone

Author: rli

.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/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
@@ -271,7 +271,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/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/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/feedback/CodeWhispererFeedbackDialog.kt

@@ -5,7 +5,7 @@ package software.aws.toolkits.jetbrains.ui.feedback
 
 import com.intellij.openapi.project.Project
 import software.aws.toolkits.jetbrains.core.help.HelpIds
-import software.aws.toolkits.jetbrains.feedback.sendFeedbackWithExperimentsMetadata
+import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
 import software.aws.toolkits.resources.message
 
 class CodeWhispererFeedbackDialog(project: Project) : FeedbackDialog(project) {
@@ -14,7 +14,7 @@ class CodeWhispererFeedbackDialog(project: Project) : FeedbackDialog(project) {
     override fun getHelpId() = HelpIds.CODEWHISPERER_TOKEN.id
 
     override suspend fun sendFeedback() {
-        sendFeedbackWithExperimentsMetadata(
+        TelemetryService.getInstance().sendFeedback(
             sentiment,
             "CodeWhisperer onboarding: $commentText",
             mapOf(FEEDBACK_SOURCE to "CodeWhisperer onboarding")

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/feedback/FeatureDevFeedbackDialog.kt

@@ -4,12 +4,16 @@
 package software.aws.toolkits.jetbrains.ui.feedback
 
 import com.intellij.openapi.project.Project
+import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
 import software.aws.toolkits.resources.message
 
 class FeatureDevFeedbackDialog(project: Project) : FeedbackDialog(project) {
     override fun notificationTitle() = message("aws.notification.title.amazonq.feature_dev")
     override fun feedbackPrompt() = message("feedback.comment.textbox.title.amazonq.feature_dev")
     override fun productName() = "Amazon Q FeatureDev"
+    override suspend fun sendFeedback() {
+        TelemetryService.getInstance().sendFeedback(sentiment, commentText)
+    }
 
     init {
         title = message("feedback.title.amazonq.feature_dev")

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/feedback/FeedbackDialog.kt

@@ -48,16 +48,18 @@ class ToolkitFeedbackDialog(project: Project) : FeedbackDialog(project) {
     override fun notificationTitle() = message("aws.notification.title")
 
     override fun getHelpId() = HelpIds.AWS_TOOLKIT_GETTING_STARTED.id
+
+    override suspend fun sendFeedback() {
+        sendFeedbackWithExperimentsMetadata(sentiment, commentText)
+    }
 }
 
 abstract class FeedbackDialog(
     protected val project: Project,
     initialSentiment: Sentiment = Sentiment.POSITIVE,
     initialComment: String = "",
 ) : DialogWrapper(project) {
-    open suspend fun sendFeedback() {
-        sendFeedbackWithExperimentsMetadata(sentiment, commentText)
-    }
+    abstract suspend fun sendFeedback()
 
     protected abstract fun notificationTitle(): String
     protected abstract fun productName(): String

plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/ui/feedback/FeedbackTest.kt

@@ -28,6 +28,7 @@ class FeedbackTest {
         override fun notificationTitle() = "title"
         override fun productName() = "product"
         override fun feedbackPrompt() = "prompt"
+        override suspend fun sendFeedback() {}
     }
 
     @Test