fix(telemetry): fix region warning when initializing telemetry with no user-selected region

rli · web-flow · commit ca66d1bba97a · 2025-02-12T08:50:14.000-08:00
diff --git a/plugins/core/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/services/telemetry/TelemetryService.kt b/plugins/core/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/services/telemetry/TelemetryService.kt
@@ -54,9 +54,10 @@ abstract class TelemetryService(private val publisher: TelemetryPublisher, prote
                     awsRegion = DefaultMetricEvent.METADATA_INVALID
                 )
             } else {
+                val connectionSettings = project.getConnectionSettings()
                 MetricEventMetadata(
-                    awsAccount = project.getConnectionSettings()?.activeAwsAccountIfKnown() ?: DefaultMetricEvent.METADATA_NOT_SET,
-                    awsRegion = project.activeRegion().id
+                    awsAccount = connectionSettings?.activeAwsAccountIfKnown() ?: DefaultMetricEvent.METADATA_NOT_SET,
+                    awsRegion = connectionSettings?.region?.id ?: DefaultMetricEvent.METADATA_NOT_SET
                 )
             }
         } else {

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,10 @@ abstract class TelemetryService(private val publisher: TelemetryPublisher, prote`
`54`	`54`	`awsRegion = DefaultMetricEvent.METADATA_INVALID`
`55`	`55`	`)`
`56`	`56`	`} else {`
	`57`	`+ val connectionSettings = project.getConnectionSettings()`
`57`	`58`	`MetricEventMetadata(`
`58`		`- awsAccount = project.getConnectionSettings()?.activeAwsAccountIfKnown() ?: DefaultMetricEvent.METADATA_NOT_SET,`
`59`		`- awsRegion = project.activeRegion().id`
	`59`	`+ awsAccount = connectionSettings?.activeAwsAccountIfKnown() ?: DefaultMetricEvent.METADATA_NOT_SET,`
	`60`	`+ awsRegion = connectionSettings?.region?.id ?: DefaultMetricEvent.METADATA_NOT_SET`
`60`	`61`	`)`
`61`	`62`	`}`
`62`	`63`	`} else {`