Skip to content

Commit 0625472

Browse files
authored
fix(telemetry): fix region warning when initializing telemetry with no user-selected region (#5365)
WARN - software.aws.toolkits.jetbrains.core.credentials.AwsConnectionManager - Using activeRegion when region is null, calling code needs to be migrated to handle null java.lang.IllegalStateException at software.aws.toolkits.jetbrains.core.credentials.AwsConnectionManager.getActiveRegion(AwsConnectionManager.kt:224) at software.aws.toolkits.jetbrains.core.credentials.AwsConnectionManagerKt.activeRegion(AwsConnectionManager.kt:370) at migration.software.aws.toolkits.jetbrains.services.telemetry.TelemetryService.record(TelemetryService.kt:59) at software.aws.toolkits.telemetry.SessionTelemetry.start(SessionTelemetry.kt:287) at software.aws.toolkits.telemetry.SessionTelemetry.start$default(SessionTelemetry.kt:271) at software.aws.toolkits.jetbrains.services.telemetry.AwsToolkitStartupMetrics.execute$lambda$0(AwsToolkitStartupMetrics.kt:14) at com.intellij.ide.util.RunOnceUtilKt.doRunOnce(RunOnceUtil.kt:68) at com.intellij.ide.util.RunOnceUtilKt.access$doRunOnce(RunOnceUtil.kt:1)
1 parent 3d9586d commit 0625472

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

plugins/core/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/services/telemetry/TelemetryService.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import software.aws.toolkits.core.telemetry.MetricEvent
1313
import software.aws.toolkits.core.telemetry.TelemetryBatcher
1414
import software.aws.toolkits.core.telemetry.TelemetryPublisher
1515
import software.aws.toolkits.core.utils.tryOrNull
16-
import software.aws.toolkits.jetbrains.core.credentials.activeRegion
1716
import software.aws.toolkits.jetbrains.core.credentials.getConnectionSettings
1817
import software.aws.toolkits.jetbrains.core.getResourceIfPresent
1918
import software.aws.toolkits.jetbrains.services.sts.StsResources
@@ -54,9 +53,10 @@ abstract class TelemetryService(private val publisher: TelemetryPublisher, prote
5453
awsRegion = DefaultMetricEvent.METADATA_INVALID
5554
)
5655
} else {
56+
val connectionSettings = project.getConnectionSettings()
5757
MetricEventMetadata(
58-
awsAccount = project.getConnectionSettings()?.activeAwsAccountIfKnown() ?: DefaultMetricEvent.METADATA_NOT_SET,
59-
awsRegion = project.activeRegion().id
58+
awsAccount = connectionSettings?.activeAwsAccountIfKnown() ?: DefaultMetricEvent.METADATA_NOT_SET,
59+
awsRegion = connectionSettings?.region?.id ?: DefaultMetricEvent.METADATA_NOT_SET
6060
)
6161
}
6262
} else {

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/TelemetryServiceTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class TelemetryServiceTest {
152152

153153
verify(batcher).enqueue(eventCaptor.capture())
154154

155-
assertMetricEventsContains(eventCaptor.allValues, "Foo", METADATA_NOT_SET, "us-east-1")
155+
assertMetricEventsContains(eventCaptor.allValues, "Foo", METADATA_NOT_SET, METADATA_NOT_SET)
156156
}
157157

158158
@Test

0 commit comments

Comments
 (0)