Send addConnection telemetry on builder id login (#4579)

Send addConnection telemetry on builder id login
aws · Jun 14, 2024 · 11c88e1 · 11c88e1
1 parent d09a609
commit 11c88e1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/...re/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/LoginUtils.kt b/...re/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/LoginUtils.kt
@@ -40,12 +40,13 @@ sealed interface Login {
     data class BuilderId(
         val scopes: List<String>,
         val onPendingToken: (InteractiveBearerTokenProvider) -> Unit,
-        val onError: (Exception) -> Unit
+        val onError: (Exception) -> Unit,
+        val onSuccess: () -> Unit
     ) : Login {
         override val id: CredentialSourceId = CredentialSourceId.AwsId
 
         fun loginBuilderId(project: Project): Boolean {
-            loginSso(project, SONO_URL, SONO_REGION, scopes, onPendingToken, onError)
+            loginSso(project, SONO_URL, SONO_REGION, scopes, onPendingToken, onError, onSuccess)
             return true
         }
     }

diff --git a/...ains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitAuthManager.kt b/...ains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitAuthManager.kt
@@ -108,7 +108,8 @@ fun loginSso(
     region: String,
     requestedScopes: List<String>,
     onPendingToken: (InteractiveBearerTokenProvider) -> Unit = {},
-    onError: (Exception) -> Unit = {}
+    onError: (Exception) -> Unit = {},
+    onSuccess: () -> Unit = {},
 ): AwsBearerTokenConnection? {
     fun createAndAuthNewConnection(profile: AuthProfile): AwsBearerTokenConnection? {
         val authManager = ToolkitAuthManager.getInstance()
@@ -121,6 +122,10 @@ fun loginSso(
             null
         }
 
+        if (connection != null) {
+            onSuccess()
+        }
+
         ToolkitConnectionManager.getInstance(project).switchConnection(connection)
         return connection
     }

diff --git a/...core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt b/...core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt
@@ -30,6 +30,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.InteractiveBe
 import software.aws.toolkits.jetbrains.core.credentials.ssoErrorMessageFromException
 import software.aws.toolkits.jetbrains.utils.pollFor
 import software.aws.toolkits.resources.message
+import software.aws.toolkits.telemetry.AuthTelemetry
 import software.aws.toolkits.telemetry.AwsTelemetry
 import software.aws.toolkits.telemetry.CredentialSourceId
 import software.aws.toolkits.telemetry.CredentialType
@@ -96,14 +97,21 @@ abstract class LoginBrowser(
                 credentialSourceId = CredentialSourceId.AwsId
             )
         }
-        loginWithBackgroundContext {
-            Login.BuilderId(scopes, onPendingToken, onError).loginBuilderId(project)
+        val onSuccess: () -> Unit = {
             AwsTelemetry.loginWithBrowser(
                 project = null,
                 credentialStartUrl = SONO_URL,
                 result = Result.Succeeded,
                 credentialSourceId = CredentialSourceId.AwsId
             )
+            AuthTelemetry.addConnection(
+                result = Result.Succeeded,
+                credentialSourceId = CredentialSourceId.AwsId
+            )
+        }
+
+        loginWithBackgroundContext {
+            Login.BuilderId(scopes, onPendingToken, onError, onSuccess).loginBuilderId(project)
         }
     }