MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

[fus] Collect downloaded JDK vendor info in JdkDownloaderLogger

Browse Source 
#IDEA-355741

GitOrigin-RevId: 18059130dc898b969c764b06e3a16f6c381d01f0
This commit is contained in:
Louis Vignier
2024-08-08 16:08:24 +02:00
committed by intellij-monorepo-bot
parent 38f9c9a542
commit fc7d46d5c0
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/idea-ui/src/com/intellij/ide/projectWizard/JdkComboBoxCollector.kt
View File

@@ -37,8 +37,8 @@ internal object JdkComboBoxCollector: CounterUsagesCollector() {
}
fun jdkDownloaded(item: JdkItem) {
val vendor = JdkVersionDetector.VENDORS.firstOrNull { item.fullPresentationText.contains(it) } ?: JdkVersionDetector.Variant.Unknown.displayName
JDK_DOWNLOADED.log(vendor, findSdkVersion(item.presentableMajorVersionString))
val variant = item.detectVariant()
JDK_DOWNLOADED.log(variant.displayName, findSdkVersion(item.presentableMajorVersionString))
}
fun noJdkSelected() {

12
platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkDownloaderLogger.kt
View File

@@ -18,7 +18,8 @@ internal object JdkDownloaderLogger : CounterUsagesCollector() {
private val DETECTED_SDK: EventId2<String?, Int> = GROUP.registerEvent("detected",
EventFields.String("product", JdkVersionDetector.VENDORS),
EventFields.Int("version"))
private val SELECTED_SDK: EventId2<String?, Int> = GROUP.registerEvent("selected",
private val DOWNLOADED_SDK: EventId2<String?, Int> = GROUP.registerEvent("jdk.downloaded",
EventFields.String("product", JdkVersionDetector.VENDORS),
EventFields.Int("version"))
@@ -33,6 +34,15 @@ internal object JdkDownloaderLogger : CounterUsagesCollector() {
DOWNLOAD.log(success)
}
fun logDownload(success: Boolean, item: JdkItem) {
DOWNLOAD.log(success)
if (success) {
val variant = item.detectVariant()
DOWNLOADED_SDK.log(variant.displayName, item.jdkMajorVersion)
}
}
fun logFailed(failure: DownloadFailure) {
FAILURE.log(failure)
}

2
platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/jdkDownloader/JdkInstaller.kt
View File

@@ -298,7 +298,7 @@ abstract class JdkInstallerBase {
}
runCatching { writeMarkerFile(request) }
JdkDownloaderLogger.logDownload(true)
JdkDownloaderLogger.logDownload(true, item)
}
catch (t: Throwable) {
if (t is ControlFlowException) throw t