From ca66d1bba97a282e887e41f185b14647ac4cba17 Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Wed, 12 Feb 2025 08:50:14 -0800 Subject: [PATCH 1/3] fix(telemetry): fix region warning when initializing telemetry with no user-selected region --- .../jetbrains/services/telemetry/TelemetryService.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 index 3d008e50eb2..ccc07b65a41 100644 --- 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 { From 88a7148b0478b41dc886562e1ea9fce561e3da08 Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Wed, 12 Feb 2025 09:30:58 -0800 Subject: [PATCH 2/3] Update TelemetryService.kt --- .../toolkits/jetbrains/services/telemetry/TelemetryService.kt | 1 - 1 file changed, 1 deletion(-) 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 index ccc07b65a41..dcf2f741c9b 100644 --- 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 @@ -13,7 +13,6 @@ import software.aws.toolkits.core.telemetry.MetricEvent import software.aws.toolkits.core.telemetry.TelemetryBatcher import software.aws.toolkits.core.telemetry.TelemetryPublisher import software.aws.toolkits.core.utils.tryOrNull -import software.aws.toolkits.jetbrains.core.credentials.activeRegion import software.aws.toolkits.jetbrains.core.credentials.getConnectionSettings import software.aws.toolkits.jetbrains.core.getResourceIfPresent import software.aws.toolkits.jetbrains.services.sts.StsResources From d4de13a333841880da8ebf49dfc35e710ece3aa5 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Wed, 12 Feb 2025 16:24:09 -0800 Subject: [PATCH 3/3] tst --- .../jetbrains/services/telemetry/TelemetryServiceTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/TelemetryServiceTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/TelemetryServiceTest.kt index 6e6ef046712..e1640451024 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/TelemetryServiceTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/TelemetryServiceTest.kt @@ -152,7 +152,7 @@ class TelemetryServiceTest { verify(batcher).enqueue(eventCaptor.capture()) - assertMetricEventsContains(eventCaptor.allValues, "Foo", METADATA_NOT_SET, "us-east-1") + assertMetricEventsContains(eventCaptor.allValues, "Foo", METADATA_NOT_SET, METADATA_NOT_SET) } @Test