From 2ccc79b53614b3baf3a2e14cdf891dfdbba6cba8 Mon Sep 17 00:00:00 2001 From: Anton Yalyshev Date: Tue, 12 Feb 2019 11:30:27 +0300 Subject: [PATCH] Adapted statistics logging to new FUS API. Removed Context usage. --- gradle/versions.properties.191 | 2 +- idea/resources/META-INF/plugin.xml.191 | 2 +- .../idea/statistics/ProjectScopeStatsReporters.kt.191 | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gradle/versions.properties.191 b/gradle/versions.properties.191 index 99bd81bdd97..bb72a68230a 100644 --- a/gradle/versions.properties.191 +++ b/gradle/versions.properties.191 @@ -1,4 +1,4 @@ -versions.intellijSdk=191.4738.6 +versions.intellijSdk=191.5109.14 versions.androidBuildTools=r23.0.1 versions.idea.NodeJS=181.3494.12 versions.jar.asm-all=7.0 diff --git a/idea/resources/META-INF/plugin.xml.191 b/idea/resources/META-INF/plugin.xml.191 index d4a849e34da..8ba8180a853 100644 --- a/idea/resources/META-INF/plugin.xml.191 +++ b/idea/resources/META-INF/plugin.xml.191 @@ -13,7 +13,7 @@ The Kotlin plugin provides language support in IntelliJ IDEA and Android Studio. @snapshot@ JetBrains - + com.intellij.modules.platform diff --git a/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.191 b/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.191 index ca5cb733169..35f6803dd50 100644 --- a/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.191 +++ b/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.191 @@ -5,19 +5,18 @@ package org.jetbrains.kotlin.idea.statistics -import com.intellij.internal.statistic.service.fus.collectors.FUCounterUsageLogger; -import com.intellij.internal.statistic.eventLog.FeatureUsageData; -import com.intellij.internal.statistic.service.fus.collectors.FUSUsageContext +import com.intellij.internal.statistic.service.fus.collectors.FUCounterUsageLogger +import com.intellij.internal.statistic.eventLog.FeatureUsageData import org.jetbrains.kotlin.idea.KotlinPluginUtil open class KotlinStatisticsTrigger { companion object { private val VERSION = KotlinPluginUtil.getPluginVersion() + private val context = FeatureUsageData().addData("plugin_version", VERSION) - public fun trigger(trigger: KotlinEventTrigger, event: String) { - val context = FeatureUsageData().addFeatureContext(FUSUsageContext.create(VERSION)); - FUCounterUsageLogger.getInstance().logEvent(trigger.GROUP_ID, event, context); + fun trigger(trigger: KotlinEventTrigger, event: String) { + FUCounterUsageLogger.getInstance().logEvent(trigger.GROUP_ID, event, context) } } } \ No newline at end of file