Skip to content

fix(amazonq): fix warnings when metrics fields are null #5762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 29, 2025
Merged

fix(amazonq): fix warnings when metrics fields are null #5762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ity/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
val name = telemetryMap["name"] as? String ?: return

@Suppress("UNCHECKED_CAST")
val data = telemetryMap["data"] as? Map<String, Any> ?: return
val data = telemetryMap["data"] as? Map<String, Any?> ?: return

TelemetryService.getInstance().record(project) {
datum(name) {
Expand All @@ -90,7 +90,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
}

data.forEach { (key, value) ->
metadata(key, value.toString())
metadata(key, value?.toString() ?: "null")
}
}
}
Expand Down
30 changes: 30 additions & 0 deletions ...tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImplTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,36 @@ class AmazonQLanguageClientImplTest {
)
}

@Test
fun `telemetryEvent handles null`() {
val telemetryService = mockk<TelemetryService>(relaxed = true)
mockkObject(TelemetryService)
every { TelemetryService.getInstance() } returns telemetryService

val builderCaptor = slot<MetricEvent.Builder.() -> Unit>()
every { telemetryService.record(project, capture(builderCaptor)) } returns Unit

val event = mapOf(
"name" to "test_event",
"data" to mapOf(
"key1" to null,
)
)

sut.telemetryEvent(event)

val builder = DefaultMetricEvent.builder()
builderCaptor.captured.invoke(builder)

val metricEvent = builder.build()
val datum = metricEvent.data.first()

assertThat(datum.name).isEqualTo("test_event")
assertThat(datum.metadata).contains(
entry("key1", "null"),
)
}

@Test
fun `telemetryEvent handles event with result field`() {
val telemetryService = mockk<TelemetryService>(relaxed = true)
Expand Down
Loading