From 23b0f27f3ba229a5ab20d988005eab66872addb3 Mon Sep 17 00:00:00 2001
From: Anton Yalyshev <anton.yalyshev@jetbrains.com>
Date: Tue, 15 Jan 2019 10:41:28 +0300
Subject: [PATCH] moved PluginVersion from collector instance to context for
 each trigger()

---
 idea/resources/META-INF/plugin-common.xml     |  1 -
 .../statistics/ProjectScopeStatsReporters.kt  | 27 +++++--------------
 .../ProjectScopeStatsReporters.kt.181         |  6 +----
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/idea/resources/META-INF/plugin-common.xml b/idea/resources/META-INF/plugin-common.xml
index 4d3d79714b7..94583e6ed9f 100644
--- a/idea/resources/META-INF/plugin-common.xml
+++ b/idea/resources/META-INF/plugin-common.xml
@@ -3238,7 +3238,6 @@
     <statistics.applicationUsagesCollector implementation="org.jetbrains.kotlin.statistics.KotlinTargetTrigger"/>
     <statistics.applicationUsagesCollector implementation="org.jetbrains.kotlin.statistics.KotlinIdeRefactoringTrigger"/>
     <statistics.applicationUsagesCollector implementation="org.jetbrains.kotlin.statistics.KotlinIdeNewFileTemplateTrigger"/>
-    <statistics.applicationUsagesCollector implementation="org.jetbrains.kotlin.statistics.KotlinPluginVersionCollector"/>
 
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt
index 3948f1cb3e2..560cd43e78f 100644
--- a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt
+++ b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt
@@ -6,27 +6,24 @@
 package org.jetbrains.kotlin.statistics
 
 import com.intellij.ide.plugins.PluginManager
-import com.intellij.internal.statistic.beans.UsageDescriptor
 import com.intellij.internal.statistic.service.fus.collectors.ApplicationUsageTriggerCollector
-import com.intellij.internal.statistic.service.fus.collectors.ApplicationUsagesCollector
 import com.intellij.internal.statistic.service.fus.collectors.FUSApplicationUsageTrigger
+import com.intellij.internal.statistic.service.fus.collectors.FUSUsageContext
 import com.intellij.openapi.extensions.PluginId
-import java.util.HashSet
 
 open class KotlinStatisticsTrigger(private val groupIdSufix: String) : ApplicationUsageTriggerCollector() {
     override fun getGroupId() = "statistics.kotlin.$groupIdSufix"
 
     companion object {
         public fun trigger(clazz: Class<out KotlinStatisticsTrigger>, event: String) {
-            FUSApplicationUsageTrigger.getInstance().trigger(clazz, event)
+            val plugin = PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin"))
+            val version = plugin?.version ?: "undefined"
+
+            FUSApplicationUsageTrigger.getInstance().trigger(clazz, event, FUSUsageContext.create(version))
         }
     }
 }
 
-abstract class KotlinStatisticsStateCollector(private val groupIdSufix: String) : ApplicationUsagesCollector() {
-    override fun getGroupId(): String = "statistics.kotlin.$groupIdSufix"
-}
-
 open class KotlinIdeStatisticsTrigger(groupIdSufix: String) : KotlinStatisticsTrigger("ide.$groupIdSufix")
 
 open class KotlinGradlePluginStatisticsTrigger(groupIdSufix: String) : KotlinStatisticsTrigger("gradle.$groupIdSufix")
@@ -41,16 +38,4 @@ open class KotlinIdeActionTrigger(groupIdSufix: String? = null) : KotlinIdeStati
 
 class KotlinIdeRefactoringTrigger : KotlinIdeActionTrigger("refactoring")
 
-class KotlinIdeNewFileTemplateTrigger : KotlinIdeStatisticsTrigger("newFileTempl")
-
-class KotlinPluginVersionCollector : KotlinStatisticsStateCollector("pluginVersion") {
-    override fun getUsages(): MutableSet<UsageDescriptor> {
-        val usagesSet = HashSet<UsageDescriptor>()
-
-        val plugin = PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin"))
-        val version = plugin?.version ?: "undefined"
-        usagesSet.add(UsageDescriptor(version, 1))
-
-        return usagesSet
-    }
-}
\ No newline at end of file
+class KotlinIdeNewFileTemplateTrigger : KotlinIdeStatisticsTrigger("newFileTempl")
\ No newline at end of file
diff --git a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.181 b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.181
index c3d57e484d7..c4a12529208 100644
--- a/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.181
+++ b/usage-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/ProjectScopeStatsReporters.kt.181
@@ -13,8 +13,6 @@ open class KotlinStatisticsTrigger(private val groupIdSufix: String) {
     }
 }
 
-abstract class KotlinStatisticsStateCollector(private val groupIdSufix: String)
-
 open class KotlinIdeStatisticsTrigger(groupIdSufix: String) : KotlinStatisticsTrigger("ide.$groupIdSufix")
 
 open class KotlinGradlePluginStatisticsTrigger(groupIdSufix: String) : KotlinStatisticsTrigger("gradle.$groupIdSufix")
@@ -29,6 +27,4 @@ open class KotlinIdeActionTrigger(groupIdSufix: String? = null) : KotlinIdeStati
 
 class KotlinIdeRefactoringTrigger : KotlinIdeActionTrigger("refactoring")
 
-class KotlinIdeNewFileTemplateTrigger : KotlinIdeStatisticsTrigger("newFileTempl")
-
-class KotlinPluginVersionCollector : KotlinStatisticsStateCollector("pluginVersion")
\ No newline at end of file
+class KotlinIdeNewFileTemplateTrigger : KotlinIdeStatisticsTrigger("newFileTempl")
\ No newline at end of file