From 23fa21d37e8b291344523d27d74cee014e8f191a Mon Sep 17 00:00:00 2001
From: Alexander Podkhalyuzin <alexander.podkhalyuzin@jetbrains.com>
Date: Wed, 15 Jan 2020 12:57:16 +0100
Subject: [PATCH] getUsages -> getMetrics in FUSCollectors

#KT-35918 Comment
---
 .../idea/statistics/IDESettingsFUSCollector.kt       | 12 ++++++------
 .../idea/statistics/ProjectConfigurationCollector.kt | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt
index 6ec4f95b598..2169cbb434c 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/IDESettingsFUSCollector.kt
@@ -5,6 +5,7 @@
 
 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.eventLog.FeatureUsageData
 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
 
 class IDESettingsFUSCollector : ProjectUsagesCollector() {
-
-    override fun getUsages(project: Project): Set<UsageDescriptor> {
-        val usages = mutableSetOf<UsageDescriptor>()
+    override fun getMetrics(project: Project): Set<MetricEvent> {
+        val metrics = mutableSetOf<MetricEvent>()
 
         @Suppress("DEPRECATION")
         val inferenceState = NewInferenceForIDEAnalysisComponent.isEnabledForV1(project)
-        usages.add(UsageDescriptor("newInference", flagUsage(inferenceState)))
+        metrics.add(MetricEvent("newInference", flagUsage(inferenceState)))
 
         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 {
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/ProjectConfigurationCollector.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/ProjectConfigurationCollector.kt
index 41fb977b5b4..0a23d80c16d 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/ProjectConfigurationCollector.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/ProjectConfigurationCollector.kt
@@ -6,7 +6,7 @@
 package org.jetbrains.kotlin.idea.statistics
 
 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.service.fus.collectors.ProjectUsagesCollector
 import com.intellij.openapi.module.Module
@@ -24,8 +24,8 @@ import org.jetbrains.kotlin.platform.konan.isNative
 
 class ProjectConfigurationCollector : ProjectUsagesCollector() {
 
-    override fun getUsages(project: Project): Set<UsageDescriptor> {
-        val usages = mutableSetOf<UsageDescriptor>()
+    override fun getMetrics(project: Project): Set<MetricEvent> {
+        val metrics = mutableSetOf<MetricEvent>()
         val modulesWithFacet = ProjectFacetManager.getInstance(project).getModulesWithFacet(KotlinFacetType.TYPE_ID)
 
         if (modulesWithFacet.isNotEmpty()) {
@@ -41,11 +41,11 @@ class ProjectConfigurationCollector : ProjectUsagesCollector() {
                     .addData("system", buildSystem)
                     .addData("platform", platform)
                     .addData("languageVersion", languageVersion)
-                val usageDescriptor = UsageDescriptor("Build", data)
-                usages.add(usageDescriptor)
+                val usageDescriptor = MetricEvent("Build", data)
+                metrics.add(usageDescriptor)
             }
         }
-        return usages
+        return metrics
     }
 
     private fun getPlatform(it: Module): String {