Skip to content

Commit 567e638

Browse files
rlirli
committed
fix(amazonq): add metrics for flare/node resolution
We need some visibility on how prevalent failures are
1 parent 5141320 commit 567e638

File tree

5 files changed

+135
-50
lines changed

5 files changed

+135
-50
lines changed

‎plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspService.kt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,12 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.textdocument.TextDoc
7777
import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.WorkspaceFolderUtil.createWorkspaceFolders
7878
import software.aws.toolkits.jetbrains.services.amazonq.lsp.workspace.WorkspaceServiceHandler
7979
import software.aws.toolkits.jetbrains.services.amazonq.profile.QDefaultServiceConfig
80+
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
8081
import software.aws.toolkits.jetbrains.services.telemetry.ClientMetadata
8182
import software.aws.toolkits.jetbrains.settings.LspSettings
8283
import software.aws.toolkits.jetbrains.utils.notifyInfo
8384
import software.aws.toolkits.resources.message
85+
import software.aws.toolkits.telemetry.Telemetry
8486
import java.io.IOException
8587
import java.io.OutputStreamWriter
8688
import java.io.PipedInputStream
@@ -526,20 +528,35 @@ private class AmazonQServerInstance(private val project: Project, private val cs
526528
* may fail to start in that case. The caller should handle potential runtime initialization failures.
527529
*/
528530
private fun getNodeRuntimePath(nodePath: Path): Path {
531+
val resolveNodeMetric = { isBundled: Boolean, success: Boolean ->
532+
Telemetry.languageserver.setup.use {
533+
it.metadata("languageServerSetupStage", "resolveNode")
534+
it.metadata("credentialStartUrl", getStartUrl(project))
535+
it.setAttribute("isBundledNode", isBundled)
536+
it.success(success)
537+
}
538+
}
539+
529540
if (Files.exists(nodePath) && Files.isExecutable(nodePath)) {
541+
resolveNodeMetric(true, true)
530542
return nodePath
531543
}
544+
532545
// use alternative node runtime if it is not found
533546
LOG.warn { "Node Runtime download failed. Fallback to user specified node runtime " }
534547
// attempt to use user provided node runtime path
535548
val nodeRuntime = LspSettings.getInstance().getNodeRuntimePath()
536549
if (!nodeRuntime.isNullOrEmpty()) {
537550
LOG.info { "Using node from $nodeRuntime " }
551+
552+
resolveNodeMetric(false, true)
538553
return Path.of(nodeRuntime)
539554
} else {
540555
val localNode = locateNodeCommand()
541556
if (localNode != null) {
542557
LOG.info { "Using node from ${localNode.toAbsolutePath()}" }
558+
559+
resolveNodeMetric(false, true)
543560
return localNode
544561
}
545562
notifyInfo(
@@ -557,6 +574,8 @@ private class AmazonQServerInstance(private val project: Project, private val cs
557574
) { _, notification -> notification.expire() }
558575
)
559576
)
577+
578+
resolveNodeMetric(false, false)
560579
return nodePath
561580
}
562581
}

‎plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactHelper.kt‎

Lines changed: 45 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ import software.aws.toolkits.core.utils.getLogger
1717
import software.aws.toolkits.core.utils.info
1818
import software.aws.toolkits.core.utils.warn
1919
import software.aws.toolkits.jetbrains.core.saveFileFromUrl
20+
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
2021
import software.aws.toolkits.resources.AwsCoreBundle
22+
import software.aws.toolkits.telemetry.LanguageServerSetupStage
23+
import software.aws.toolkits.telemetry.Telemetry
2124
import java.nio.file.Files
2225
import java.nio.file.Path
2326
import java.nio.file.Paths
@@ -106,33 +109,33 @@ class ArtifactHelper(private val lspArtifactsPath: Path = DEFAULT_ARTIFACT_PATH,
106109
}
107110

108111
suspend fun tryDownloadLspArtifacts(project: Project, targetVersion: Version, target: VersionTarget): Path? {
109-
val temporaryDownloadPath = Files.createTempDirectory("lsp-dl")
110-
val downloadPath = lspArtifactsPath.resolve(targetVersion.serverVersion.toString())
112+
val destinationPath = lspArtifactsPath.resolve(targetVersion.serverVersion.toString())
111113

112114
while (currentAttempt.get() < maxDownloadAttempts) {
113115
currentAttempt.incrementAndGet()
114116
logger.info { "Attempt ${currentAttempt.get()} of $maxDownloadAttempts to download LSP artifacts" }
117+
val temporaryDownloadPath = Files.createTempDirectory("lsp-dl")
115118

116119
try {
117120
return withBackgroundProgress(
118121
project,
119122
AwsCoreBundle.message("amazonqFeatureDev.placeholder.downloading_and_extracting_lsp_artifacts"),
120123
cancellable = true
121124
) {
122-
if (downloadLspArtifacts(temporaryDownloadPath, target) && !target.contents.isNullOrEmpty()) {
123-
moveFilesFromSourceToDestination(temporaryDownloadPath, downloadPath)
125+
if (downloadLspArtifacts(project, temporaryDownloadPath, target) && !target.contents.isNullOrEmpty()) {
126+
moveFilesFromSourceToDestination(temporaryDownloadPath, destinationPath)
124127
target.contents
125128
.mapNotNull { it.filename }
126-
.forEach { filename -> extractZipFile(downloadPath.resolve(filename), downloadPath) }
127-
logger.info { "Successfully downloaded and moved LSP artifacts to $downloadPath" }
129+
.forEach { filename -> extractZipFile(destinationPath.resolve(filename), destinationPath) }
130+
logger.info { "Successfully downloaded and moved LSP artifacts to $destinationPath" }
128131

129132
val thirdPartyLicenses = targetVersion.thirdPartyLicenses
130133
logger.info {
131-
"Installing Amazon Q Language Server v${targetVersion.serverVersion} to: $downloadPath. " +
134+
"Installing Amazon Q Language Server v${targetVersion.serverVersion} to: $destinationPath. " +
132135
if (thirdPartyLicenses == null) "" else "Attribution notice can be found at $thirdPartyLicenses"
133136
}
134137

135-
return@withBackgroundProgress downloadPath
138+
return@withBackgroundProgress destinationPath
136139
}
137140

138141
return@withBackgroundProgress null
@@ -146,15 +149,15 @@ class ArtifactHelper(private val lspArtifactsPath: Path = DEFAULT_ARTIFACT_PATH,
146149
else -> { logger.error(e) { "Failed to download/move LSP artifacts on attempt ${currentAttempt.get()}" } }
147150
}
148151
temporaryDownloadPath.toFile().deleteRecursively()
149-
downloadPath.toFile().deleteRecursively()
152+
destinationPath.toFile().deleteRecursively()
150153
}
151154
}
152155
logger.error { "Failed to download LSP artifacts after $maxDownloadAttempts attempts" }
153156
return null
154157
}
155158

156159
@VisibleForTesting
157-
internal fun downloadLspArtifacts(downloadPath: Path, target: VersionTarget?): Boolean {
160+
internal fun downloadLspArtifacts(project: Project, downloadPath: Path, target: VersionTarget?): Boolean {
158161
if (target == null || target.contents.isNullOrEmpty()) {
159162
logger.warn { "No target contents available for download" }
160163
return false
@@ -171,7 +174,7 @@ class ArtifactHelper(private val lspArtifactsPath: Path = DEFAULT_ARTIFACT_PATH,
171174
logger.warn { "No hash available for ${content.filename}" }
172175
return@forEach
173176
}
174-
downloadAndValidateFile(content.url, filePath, contentHash)
177+
downloadAndValidateFile(project, content.url, filePath, contentHash)
175178
}
176179
validateDownloadedFiles(downloadPath, target.contents)
177180
} catch (e: Exception) {
@@ -182,18 +185,44 @@ class ArtifactHelper(private val lspArtifactsPath: Path = DEFAULT_ARTIFACT_PATH,
182185
return true
183186
}
184187

185-
private fun downloadAndValidateFile(url: String, filePath: Path, expectedHash: String) {
188+
private fun downloadAndValidateFile(project: Project, url: String, filePath: Path, expectedHash: String) {
189+
val recordDownload = { runnable: () -> Unit ->
190+
Telemetry.languageserver.setup.use { telemetry ->
191+
telemetry.languageServerSetupStage(LanguageServerSetupStage.GetServer)
192+
telemetry.metadata("credentialStartUrl", getStartUrl(project))
193+
telemetry.success(true)
194+
195+
try {
196+
runnable()
197+
} catch (t: Throwable) {
198+
telemetry.success(false)
199+
telemetry.recordException(t)
200+
}
201+
}
202+
}
203+
186204
try {
187205
if (!filePath.exists()) {
188206
logger.info { "Downloading file: ${filePath.fileName}" }
189-
saveFileFromUrl(url, filePath, ProgressManager.getInstance().progressIndicator)
207+
recordDownload { saveFileFromUrl(url, filePath, ProgressManager.getInstance().progressIndicator) }
190208
}
191209
if (!validateFileHash(filePath, expectedHash)) {
192210
logger.warn { "Hash mismatch for ${filePath.fileName}, re-downloading" }
193211
filePath.deleteIfExists()
194-
saveFileFromUrl(url, filePath)
195-
if (!validateFileHash(filePath, expectedHash)) {
196-
throw LspException("Hash mismatch after re-download for ${filePath.fileName}", LspException.ErrorCode.HASH_MISMATCH)
212+
recordDownload { saveFileFromUrl(url, filePath) }
213+
214+
Telemetry.languageserver.setup.use {
215+
it.languageServerSetupStage(LanguageServerSetupStage.Validate)
216+
it.metadata("credentialStartUrl", getStartUrl(project))
217+
it.success(true)
218+
219+
if (!validateFileHash(filePath, expectedHash)) {
220+
it.success(false)
221+
222+
val exception = LspException("Hash mismatch after re-download for ${filePath.fileName}", LspException.ErrorCode.HASH_MISMATCH)
223+
it.recordException(exception)
224+
throw exception
225+
}
197226
}
198227
}
199228
} catch (e: Exception) {

‎plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactManager.kt‎

Lines changed: 66 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ import software.aws.toolkits.core.utils.info
1919
import software.aws.toolkits.core.utils.warn
2020
import software.aws.toolkits.jetbrains.AwsPlugin
2121
import software.aws.toolkits.jetbrains.AwsToolkit
22+
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
23+
import software.aws.toolkits.telemetry.LanguageServerSetupStage
24+
import software.aws.toolkits.telemetry.MetricResult
25+
import software.aws.toolkits.telemetry.Telemetry
2226
import java.nio.file.Path
2327

2428
@Service
@@ -57,42 +61,72 @@ class ArtifactManager @NonInjectable internal constructor(private val manifestFe
5761
return mutex.withLock {
5862
coroutineScope {
5963
async {
60-
try {
61-
val manifest = manifestFetcher.fetch() ?: throw LspException(
62-
"Language Support is not available, as manifest is missing.",
63-
LspException.ErrorCode.MANIFEST_FETCH_FAILED
64-
)
65-
val lspVersions = getLSPVersionsFromManifestWithSpecifiedRange(manifest)
66-
67-
artifactHelper.removeDelistedVersions(lspVersions.deListedVersions)
68-
69-
if (lspVersions.inRangeVersions.isEmpty()) {
70-
// No versions are found which are in the given range. Fallback to local lsp artifacts.
71-
val localLspArtifacts = artifactHelper.getAllLocalLspArtifactsWithinManifestRange(DEFAULT_VERSION_RANGE)
72-
if (localLspArtifacts.isNotEmpty()) {
73-
return@async localLspArtifacts.first().first
64+
Telemetry.languageserver.setup.use { all ->
65+
all.languageServerSetupStage(LanguageServerSetupStage.All)
66+
all.metadata("credentialStartUrl", getStartUrl(project))
67+
all.result(MetricResult.Succeeded)
68+
69+
try {
70+
val lspVersions = Telemetry.languageserver.setup.use { telemetry ->
71+
telemetry.languageServerSetupStage(LanguageServerSetupStage.GetManifest)
72+
telemetry.metadata("credentialStartUrl", getStartUrl(project))
73+
74+
val exception = LspException(
75+
"Language Support is not available, as manifest is missing.",
76+
LspException.ErrorCode.MANIFEST_FETCH_FAILED
77+
)
78+
telemetry.recordException(exception)
79+
val manifest = manifestFetcher.fetch() ?: throw exception
80+
81+
getLSPVersionsFromManifestWithSpecifiedRange(manifest)
7482
}
75-
throw LspException("Language server versions not found in manifest.", LspException.ErrorCode.NO_COMPATIBLE_LSP_VERSION)
76-
}
7783

78-
val targetVersion = lspVersions.inRangeVersions.first()
84+
artifactHelper.removeDelistedVersions(lspVersions.deListedVersions)
85+
86+
if (lspVersions.inRangeVersions.isEmpty()) {
87+
// No versions are found which are in the given range. Fallback to local lsp artifacts.
88+
val localLspArtifacts = artifactHelper.getAllLocalLspArtifactsWithinManifestRange(DEFAULT_VERSION_RANGE)
89+
if (localLspArtifacts.isNotEmpty()) {
90+
return@async localLspArtifacts.first().first
91+
}
92+
throw LspException("Language server versions not found in manifest.", LspException.ErrorCode.NO_COMPATIBLE_LSP_VERSION)
93+
}
7994

80-
// If there is an LSP Manifest with the same version
81-
val target = getTargetFromLspManifest(targetVersion)
82-
// Get Local LSP files and check if we can re-use existing LSP Artifacts
83-
val artifactPath: Path = if (artifactHelper.getExistingLspArtifacts(targetVersion, target)) {
84-
artifactHelper.getAllLocalLspArtifactsWithinManifestRange(DEFAULT_VERSION_RANGE).first().first
85-
} else {
86-
artifactHelper.tryDownloadLspArtifacts(project, targetVersion, target)
87-
?: throw LspException("Failed to download LSP artifacts", LspException.ErrorCode.DOWNLOAD_FAILED)
95+
val targetVersion = lspVersions.inRangeVersions.first()
96+
97+
// If there is an LSP Manifest with the same version
98+
val target = getTargetFromLspManifest(targetVersion)
99+
// Get Local LSP files and check if we can re-use existing LSP Artifacts
100+
val artifactPath: Path = if (artifactHelper.getExistingLspArtifacts(targetVersion, target)) {
101+
artifactHelper.getAllLocalLspArtifactsWithinManifestRange(DEFAULT_VERSION_RANGE).first().first
102+
} else {
103+
artifactHelper.tryDownloadLspArtifacts(project, targetVersion, target)
104+
?: throw LspException("Failed to download LSP artifacts", LspException.ErrorCode.DOWNLOAD_FAILED)
105+
}
106+
107+
artifactHelper.deleteOlderLspArtifacts(DEFAULT_VERSION_RANGE)
108+
109+
Telemetry.languageserver.setup.use {
110+
it.languageServerSetupStage(LanguageServerSetupStage.Launch)
111+
it.metadata("credentialStartUrl", getStartUrl(project))
112+
it.setAttribute("isBundledArtifact", false)
113+
}
114+
return@async artifactPath
115+
} catch (e: Exception) {
116+
logger.warn(e) { "Failed to resolve assets from Flare CDN" }
117+
val path = AwsToolkit.PLUGINS_INFO[AwsPlugin.Q]?.path?.resolve("flare") ?: error("not even bundled")
118+
logger.info { "Falling back to bundled assets at $path" }
119+
120+
all.recordException(e)
121+
all.result(MetricResult.Failed)
122+
123+
Telemetry.languageserver.setup.use {
124+
it.languageServerSetupStage(LanguageServerSetupStage.Launch)
125+
it.metadata("credentialStartUrl", getStartUrl(project))
126+
it.setAttribute("isBundledArtifact", true)
127+
}
128+
return@async path
88129
}
89-
artifactHelper.deleteOlderLspArtifacts(DEFAULT_VERSION_RANGE)
90-
return@async artifactPath
91-
} catch (e: Exception) {
92-
logger.warn(e) { "Failed to resolve assets from Flare CDN" }
93-
val path = AwsToolkit.PLUGINS_INFO[AwsPlugin.Q]?.path?.resolve("flare") ?: error("not even bundled")
94-
logger.info { "Falling back to bundled assets at $path" }
95-
return@async path
96130
}
97131
}
98132
}.also {

‎plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ArtifactHelperTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ class ArtifactHelperTest {
199199
val version = Version(serverVersion = "1.0.0")
200200

201201
val spyArtifactHelper = spyk(artifactHelper)
202-
every { spyArtifactHelper.downloadLspArtifacts(any(), any()) } returns false
202+
every { spyArtifactHelper.downloadLspArtifacts(mockProject, any(), any()) } returns false
203203

204204
assertThat(runBlocking { artifactHelper.tryDownloadLspArtifacts(mockProject, version, VersionTarget(contents = contents)) }).isEqualTo(null)
205205
}
@@ -210,7 +210,7 @@ class ArtifactHelperTest {
210210
val target = VersionTarget(contents = contents)
211211
val spyArtifactHelper = spyk(artifactHelper)
212212

213-
every { spyArtifactHelper.downloadLspArtifacts(any(), any()) } returns true
213+
every { spyArtifactHelper.downloadLspArtifacts(mockProject, any(), any()) } returns true
214214
mockkStatic("software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts.LspUtilsKt")
215215
every { moveFilesFromSourceToDestination(any(), any()) } just Runs
216216
every { extractZipFile(any(), any()) } just Runs

‎plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/otel/OtelBase.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,9 @@ abstract class AbstractBaseSpan<SpanType : AbstractBaseSpan<SpanType>>(internal
201201

202202
override fun recordException(exception: Throwable): SpanType {
203203
delegate.recordException(exception)
204+
205+
setAttribute("reason", exception::class.java.canonicalName)
206+
setAttribute("reasonDesc", exception.message)
204207
return this as SpanType
205208
}
206209

0 commit comments

Comments
 (0)