Skip to content

Commit 924a2b0

Browse files
committed
Replace userState function with direct TelemetryService record function to capture authScopes
1 parent f0d455d commit 924a2b0

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/GettingStartedAuthUtils.kt

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
package software.aws.toolkits.jetbrains.core.gettingstarted
55

66
import com.intellij.openapi.project.Project
7+
import migration.software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
8+
import software.amazon.awssdk.services.toolkittelemetry.model.Unit
79
import software.aws.toolkits.core.utils.tryOrNull
810
import software.aws.toolkits.jetbrains.core.credentials.LegacyManagedBearerSsoConnection
911
import software.aws.toolkits.jetbrains.core.credentials.ManagedBearerSsoConnection
@@ -27,6 +29,7 @@ import software.aws.toolkits.resources.AwsCoreBundle
2729
import software.aws.toolkits.telemetry.AuthTelemetry
2830
import software.aws.toolkits.telemetry.FeatureId
2931
import software.aws.toolkits.telemetry.Result
32+
import java.time.Instant
3033

3134
fun requestCredentialsForCodeWhisperer(
3235
project: Project,
@@ -231,7 +234,6 @@ fun reauthenticateWithQ(project: Project) {
231234

232235
fun emitUserState(project: Project) {
233236

234-
// for each connection, add scopes to a list
235237
val scopes = ToolkitAuthManager.getInstance().listConnections().flatMap { connection ->
236238
when (connection) {
237239
is ProfileSsoManagedBearerSsoConnection -> connection.scopes
@@ -240,16 +242,17 @@ fun emitUserState(project: Project) {
240242
}
241243
}.toSet()
242244

243-
AuthTelemetry.userState(
244-
project,
245-
source = getStartupState().toString(),
246-
authEnabledConnections = getEnabledConnections(project),
247-
authStatus = getAuthStatus(project),
248-
passive = true,
249-
metadata = mapOf(
250-
"authScopes" to scopes.joinToString(",")
251-
)
252-
)
245+
TelemetryService.getInstance().record(project) {
246+
datum("auth_userState"){
247+
createTime(Instant.now())
248+
unit(Unit.NONE)
249+
passive(true)
250+
metadata("source", getStartupState().toString())
251+
metadata("authStatus", getAuthStatus(project).toString())
252+
metadata("authEnabledConnections", getEnabledConnections(project))
253+
metadata("authScopes", scopes.joinToString(", "))
254+
}
255+
}
253256
}
254257

255258
const val CODEWHISPERER_AUTH_LEARN_MORE_LINK = "https://docs.aws.amazon.com/codewhisperer/latest/userguide/codewhisperer-auth.html"

0 commit comments

Comments
 (0)