azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

getUsages -> getMetrics in FUSCollectors

Browse Source 
#KT-35918 Comment
This commit is contained in:
Alexander Podkhalyuzin
2020-01-15 12:57:16 +01:00
committed by Vladimir Dolzhenko
parent 8bb59e31e0
commit 23fa21d37e
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt
+6 -6
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.idea.statistics package org.jetbrains.kotlin.idea.statistics
import com.intellij.internal.statistic.beans.MetricEvent
import com.intellij.internal.statistic.beans.UsageDescriptor import com.intellij.internal.statistic.beans.UsageDescriptor
import com.intellij.internal.statistic.eventLog.FeatureUsageData import com.intellij.internal.statistic.eventLog.FeatureUsageData
import com.intellij.internal.statistic.service.fus.collectors.ProjectUsagesCollector import com.intellij.internal.statistic.service.fus.collectors.ProjectUsagesCollector
@@ -14,18 +15,17 @@ import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings
import org.jetbrains.kotlin.idea.project.NewInferenceForIDEAnalysisComponent import org.jetbrains.kotlin.idea.project.NewInferenceForIDEAnalysisComponent
class IDESettingsFUSCollector : ProjectUsagesCollector() { class IDESettingsFUSCollector : ProjectUsagesCollector() {
override fun getMetrics(project: Project): Set<MetricEvent> {
override fun getUsages(project: Project): Set<UsageDescriptor> { val metrics = mutableSetOf<MetricEvent>()
val usages = mutableSetOf<UsageDescriptor>()
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
val inferenceState = NewInferenceForIDEAnalysisComponent.isEnabledForV1(project) val inferenceState = NewInferenceForIDEAnalysisComponent.isEnabledForV1(project)
usages.add(UsageDescriptor("newInference", flagUsage(inferenceState))) metrics.add(MetricEvent("newInference", flagUsage(inferenceState)))
val scriptingAutoReloadEnabled = KotlinScriptingSettings.getInstance(project).isAutoReloadEnabled val scriptingAutoReloadEnabled = KotlinScriptingSettings.getInstance(project).isAutoReloadEnabled
usages.add(UsageDescriptor("scriptingAutoReloadEnabled", flagUsage(scriptingAutoReloadEnabled))) metrics.add(MetricEvent("scriptingAutoReloadEnabled", flagUsage(scriptingAutoReloadEnabled)))
return usages return metrics
} }
private fun flagUsage(enabled: Boolean): FeatureUsageData { private fun flagUsage(enabled: Boolean): FeatureUsageData {
idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/ProjectConfigurationCollector.kt
+6 -6
View File
@@ -6,7 +6,7 @@
package org.jetbrains.kotlin.idea.statistics package org.jetbrains.kotlin.idea.statistics
import com.intellij.facet.ProjectFacetManager import com.intellij.facet.ProjectFacetManager
import com.intellij.internal.statistic.beans.UsageDescriptor import com.intellij.internal.statistic.beans.MetricEvent
import com.intellij.internal.statistic.eventLog.FeatureUsageData import com.intellij.internal.statistic.eventLog.FeatureUsageData
import com.intellij.internal.statistic.service.fus.collectors.ProjectUsagesCollector import com.intellij.internal.statistic.service.fus.collectors.ProjectUsagesCollector
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
@@ -24,8 +24,8 @@ import org.jetbrains.kotlin.platform.konan.isNative
class ProjectConfigurationCollector : ProjectUsagesCollector() { class ProjectConfigurationCollector : ProjectUsagesCollector() {
override fun getUsages(project: Project): Set<UsageDescriptor> { override fun getMetrics(project: Project): Set<MetricEvent> {
val usages = mutableSetOf<UsageDescriptor>() val metrics = mutableSetOf<MetricEvent>()
val modulesWithFacet = ProjectFacetManager.getInstance(project).getModulesWithFacet(KotlinFacetType.TYPE_ID) val modulesWithFacet = ProjectFacetManager.getInstance(project).getModulesWithFacet(KotlinFacetType.TYPE_ID)
if (modulesWithFacet.isNotEmpty()) { if (modulesWithFacet.isNotEmpty()) {
@@ -41,11 +41,11 @@ class ProjectConfigurationCollector : ProjectUsagesCollector() {
.addData("system", buildSystem) .addData("system", buildSystem)
.addData("platform", platform) .addData("platform", platform)
.addData("languageVersion", languageVersion) .addData("languageVersion", languageVersion)
val usageDescriptor = UsageDescriptor("Build", data) val usageDescriptor = MetricEvent("Build", data)
usages.add(usageDescriptor) metrics.add(usageDescriptor)
} }
} }
return usages return metrics
} }
private fun getPlatform(it: Module): String { private fun getPlatform(it: Module): String {