Enable SendTelemetryEvent to Builder ID users (#3910)

Only send the telemetry if Builder ID users optin telemetry sharing

Author: andrewyuq

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt

@@ -71,7 +71,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.ISSUE_HIGHLIGHT_TEXT_ATTRIBUTES
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.promptReAuth
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.runIfIamIdentityCenterConnection
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.runIfIdcConnectionOrTelemetryEnabled
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.Result
 import java.time.Duration
@@ -404,7 +404,7 @@ class CodeWhispererCodeScanManager(val project: Project) {
         programmingLanguage: CodeWhispererProgrammingLanguage,
         codeScanJobId: String?
     ) {
-        runIfIamIdentityCenterConnection(project) {
+        runIfIdcConnectionOrTelemetryEnabled(project) {
             try {
                 val response = CodeWhispererClientAdaptor.getInstance(project)
                     .sendCodeScanTelemetry(programmingLanguage, codeScanJobId)

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt

@@ -38,6 +38,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhisp
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.RequestContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.ResponseContext
+import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.isTelemetryEnabled
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.transform
 import software.aws.toolkits.jetbrains.settings.AwsSettings
@@ -76,7 +77,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         isSigv4: Boolean = shouldUseSigv4Client(project)
     ): ListCodeScanFindingsResponse
 
-    fun putUserTriggerDecisionTelemetry(
+    fun sendUserTriggerDecisionTelemetry(
         requestContext: RequestContext,
         responseContext: ResponseContext,
         completionType: CodewhispererCompletionType,
@@ -85,7 +86,7 @@ interface CodeWhispererClientAdaptor : Disposable {
         lineCount: Int
     ): SendTelemetryEventResponse
 
-    fun putCodePercentageTelemetry(
+    fun sendCodePercentageTelemetry(
         language: CodeWhispererProgrammingLanguage,
         acceptedTokenCount: Int,
         totalTokenCount: Int
@@ -180,7 +181,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
             bearerClient().listCodeAnalysisFindings(request.transform()).transform()
         }
 
-    override fun putUserTriggerDecisionTelemetry(
+    override fun sendUserTriggerDecisionTelemetry(
         requestContext: RequestContext,
         responseContext: ResponseContext,
         completionType: CodewhispererCompletionType,
@@ -217,7 +218,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW
         }
     }
 
-    override fun putCodePercentageTelemetry(
+    override fun sendCodePercentageTelemetry(
         language: CodeWhispererProgrammingLanguage,
         acceptedTokenCount: Int,
         totalTokenCount: Int

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererCodeCoverageTracker.kt

@@ -30,7 +30,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispe
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererUserGroupSettings
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.TOTAL_SECONDS_IN_MINUTE
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.runIfIamIdentityCenterConnection
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.runIfIdcConnectionOrTelemetryEnabled
 import software.aws.toolkits.telemetry.CodewhispererTelemetry
 import java.time.Duration
 import java.time.Instant
@@ -203,9 +203,9 @@ abstract class CodeWhispererCodeCoverageTracker(
             }
         }
 
-        runIfIamIdentityCenterConnection(project) {
+        runIfIdcConnectionOrTelemetryEnabled(project) {
             try {
-                val response = CodeWhispererClientAdaptor.getInstance(project).putCodePercentageTelemetry(
+                val response = CodeWhispererClientAdaptor.getInstance(project).sendCodePercentageTelemetry(
                     language,
                     acceptedTokensSize,
                     totalTokensSize

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt

@@ -32,7 +32,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.service.ResponseCo
 import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererSettings
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getConnectionStartUrl
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getGettingStartedTaskType
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.runIfIamIdentityCenterConnection
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.runIfIdcConnectionOrTelemetryEnabled
 import software.aws.toolkits.jetbrains.settings.AwsSettings
 import software.aws.toolkits.telemetry.CodewhispererCompletionType
 import software.aws.toolkits.telemetry.CodewhispererGettingStartedTask
@@ -187,6 +187,7 @@ class CodeWhispererTelemetryService {
         suggestionReferenceCount: Int,
         generatedLineCount: Int
     ) {
+        val project = requestContext.project
         val totalImportCount = recommendationContext.details.fold(0) { grandTotal, detail ->
             grandTotal + detail.recommendation.mostRelevantMissingImports().size
         }
@@ -213,11 +214,11 @@ class CodeWhispererTelemetryService {
         } else CodewhispererCompletionType.Line
 
         // only send if it's a pro tier user
-        projectCoroutineScope(requestContext.project).launch {
-            runIfIamIdentityCenterConnection(requestContext.project) {
+        projectCoroutineScope(project).launch {
+            runIfIdcConnectionOrTelemetryEnabled(project) {
                 try {
-                    val response = CodeWhispererClientAdaptor.getInstance(requestContext.project)
-                        .putUserTriggerDecisionTelemetry(
+                    val response = CodeWhispererClientAdaptor.getInstance(project)
+                        .sendUserTriggerDecisionTelemetry(
                             requestContext,
                             responseContext,
                             completionType,
@@ -238,7 +239,7 @@ class CodeWhispererTelemetryService {
         }
 
         CodewhispererTelemetry.userTriggerDecision(
-            project = requestContext.project,
+            project = project,
             codewhispererSessionId = responseContext.sessionId,
             codewhispererFirstRequestId = requestContext.latencyContext.firstRequestId,
             credentialStartUrl = getConnectionStartUrl(requestContext.connection),

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererUtil.kt

@@ -35,20 +35,24 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhi
 import software.aws.toolkits.jetbrains.services.codewhisperer.learn.LearnCodeWhispererManager.Companion.taskTypeToFilename
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.Chunk
 import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererService
+import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.isTelemetryEnabled
 import software.aws.toolkits.jetbrains.utils.notifyError
 import software.aws.toolkits.jetbrains.utils.notifyInfo
 import software.aws.toolkits.jetbrains.utils.notifyWarn
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.CodewhispererCompletionType
 import software.aws.toolkits.telemetry.CodewhispererGettingStartedTask
 
-fun runIfIamIdentityCenterConnection(project: Project, callback: (connection: ToolkitConnection) -> Unit) =
+// Controls the condition to send telemetry event to CodeWhisperer service, currently:
+// 1. It will be sent for Builder ID users, only if they have optin telemetry sharing.
+// 2. It will be sent for IdC users, regardless of telemetry optout status.
+fun runIfIdcConnectionOrTelemetryEnabled(project: Project, callback: (connection: ToolkitConnection) -> Unit) =
     ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(CodeWhispererConnection.getInstance())?.let {
-        runIfIamIdentityCenterConnection(it, callback)
+        runIfIdcConnectionOrTelemetryEnabled(it, callback)
     }
 
-fun runIfIamIdentityCenterConnection(connection: ToolkitConnection, callback: (connection: ToolkitConnection) -> Unit) {
-    if (connection.isSono()) return
+fun runIfIdcConnectionOrTelemetryEnabled(connection: ToolkitConnection, callback: (connection: ToolkitConnection) -> Unit) {
+    if (connection.isSono() && !isTelemetryEnabled()) return
     callback(connection)
 }
 

jetbrains-core/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererClientAdaptorTest.kt

@@ -255,9 +255,9 @@ class CodeWhispererClientAdaptorTest {
     }
 
     @Test
-    fun `sendTelemetryEvent for userTriggerDecision respects telemetry optin status`() {
+    fun `sendTelemetryEvent for userTriggerDecision respects telemetry optin status, for SSO users`() {
         sendTelemetryEventOptOutCheckHelper {
-            sut.putUserTriggerDecisionTelemetry(
+            sut.sendUserTriggerDecisionTelemetry(
                 aRequestContext(projectRule.project),
                 aResponseContext(),
                 aCompletionType(),
@@ -271,7 +271,7 @@ class CodeWhispererClientAdaptorTest {
     @Test
     fun `sendTelemetryEvent for codePercentage respects telemetry optin status`() {
         sendTelemetryEventOptOutCheckHelper {
-            sut.putCodePercentageTelemetry(aProgrammingLanguage(), 0, 1)
+            sut.sendCodePercentageTelemetry(aProgrammingLanguage(), 0, 1)
         }
     }