-
Notifications
You must be signed in to change notification settings - Fork 272
feat(amazonq): LSP telemetry/event messages trigger client side telemetry service calls #5511
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.
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
Changes from 24 commits
841947a
d660a3c
c880e8d
4831a5c
085e456
c3cd86f
6d97ddc
792b087
0e22516
37a0193
e97eb33
3219b41
e4309da
f2507f2
e6083d3
f3f6f6f
b698c0b
c545757
a0881c2
75c1a01
666437e
6b30379
1058210
ea52630
ac06230
ff7f920
3652c52
cab6460
77457f2
7d82d95
d8c3f12
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,12 +46,15 @@ | |
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ShowSaveFileDialogResult | ||
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.ConnectionMetadata | ||
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.SsoProfileData | ||
import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.TelemetryParsingUtil | ||
import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator | ||
import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService | ||
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings | ||
import software.aws.toolkits.resources.message | ||
import java.io.File | ||
import java.nio.file.Files | ||
import java.nio.file.Paths | ||
import java.time.Instant | ||
import java.util.UUID | ||
import java.util.concurrent.CompletableFuture | ||
import java.util.concurrent.TimeUnit | ||
|
@@ -60,8 +63,40 @@ | |
* Concrete implementation of [AmazonQLanguageClient] to handle messages sent from server | ||
*/ | ||
class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageClient { | ||
|
||
private fun handleTelemetryMap(telemetryMap: Map<*, *>) { | ||
try { | ||
Check warning on line 68 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt
|
||
val name = telemetryMap["name"] as? String ?: return | ||
|
||
@Suppress("UNCHECKED_CAST") | ||
Check warning on line 71 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt
|
||
val data = telemetryMap["data"] as? Map<String, Any> ?: return | ||
|
||
TelemetryService.getInstance().record(project) { | ||
datum(name) { | ||
createTime(Instant.now()) | ||
|
||
unit(TelemetryParsingUtil.parseMetricUnit(telemetryMap["unit"])) | ||
Check warning on line 77 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt
|
||
value(telemetryMap["value"] as? Double ?: 1.0) | ||
passive(telemetryMap["passive"] as? Boolean ?: false) | ||
|
||
telemetryMap["result"]?.let { result -> | ||
metadata("result", result.toString()) | ||
Check warning on line 82 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt
|
||
} | ||
|
||
data.forEach { (key, value) -> | ||
metadata(key, value.toString()) | ||
} | ||
} | ||
} | ||
} catch (e: Exception) { | ||
LOG.warn(e) { "Failed to process telemetry event: $telemetryMap" } | ||
Check warning on line 91 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt
|
||
} | ||
} | ||
Check warning on line 93 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt
|
||
|
||
override fun telemetryEvent(`object`: Any) { | ||
println(`object`) | ||
when (`object`) { | ||
Check warning on line 96 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt
|
||
is Map<*, *> -> handleTelemetryMap(`object`) | ||
else -> LOG.warn { "Unexpected telemetry event: $`object`" } | ||
Check warning on line 98 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt
|
||
} | ||
} | ||
|
||
override fun publishDiagnostics(diagnostics: PublishDiagnosticsParams) { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat | ||
|
||
class TelemetryEventNotification( | ||
override val command: String = TELEMETRY_EVENT, | ||
override val params: Map<String, Any?>, | ||
) : ChatNotification<Map<String, Any?>> | ||
Check warning on line 9 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/TelemetryEventNotification.kt
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
// SPDX-License-Identifier: Apache-2.0 | ||
|
||
package software.aws.toolkits.jetbrains.services.amazonq.lsp.util | ||
|
||
import software.amazon.awssdk.services.toolkittelemetry.model.MetricUnit | ||
|
||
object TelemetryParsingUtil { | ||
|
||
fun parseMetricUnit(value: Any?): MetricUnit = | ||
when (value) { | ||
Check warning on line 11 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/TelemetryParsingUtil.kt
|
||
is String -> MetricUnit.fromValue(value) ?: MetricUnit.NONE | ||
is MetricUnit -> value | ||
else -> MetricUnit.NONE | ||
} | ||
Check warning on line 15 in plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/TelemetryParsingUtil.kt
|
||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this the correct action here? are there any telemetry events we want to be emitting that would have no data?