From dd819552ade3ff3a8e7859ee8e3e93cd10f45ae5 Mon Sep 17 00:00:00 2001 From: Sergei Vorobyov Date: Fri, 2 Aug 2024 12:31:49 +0200 Subject: [PATCH] FUS-2534 [Gradle|FUS] fix: doesn't register twice the same new project wizard stat collector group GitOrigin-RevId: 59e6dc5ffeb80d077afe47567d58a9d454c0a273 --- .../intellij/ide/projectWizard/NewProjectWizardCollector.kt | 2 +- plugins/gradle/java/resources/META-INF/plugin.xml | 1 - .../wizard/statistics/GradleNewProjectWizardCollector.kt | 6 +----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/projectWizard/NewProjectWizardCollector.kt b/platform/platform-impl/src/com/intellij/ide/projectWizard/NewProjectWizardCollector.kt index f3724e0be635..13af37bed2c3 100644 --- a/platform/platform-impl/src/com/intellij/ide/projectWizard/NewProjectWizardCollector.kt +++ b/platform/platform-impl/src/com/intellij/ide/projectWizard/NewProjectWizardCollector.kt @@ -33,7 +33,7 @@ object NewProjectWizardCollector : CounterUsagesCollector() { override fun getGroup(): EventLogGroup = GROUP - val GROUP: EventLogGroup = EventLogGroup("new.project.wizard.interactions", 32) + val GROUP: EventLogGroup = EventLogGroup("new.project.wizard.interactions", 33) private val LANGUAGES = listOf( NewProjectWizardConstants.Language.JAVA, NewProjectWizardConstants.Language.KOTLIN, diff --git a/plugins/gradle/java/resources/META-INF/plugin.xml b/plugins/gradle/java/resources/META-INF/plugin.xml index 102a21a6df4e..34a6f23217d8 100644 --- a/plugins/gradle/java/resources/META-INF/plugin.xml +++ b/plugins/gradle/java/resources/META-INF/plugin.xml @@ -107,7 +107,6 @@ - diff --git a/plugins/gradle/java/src/service/project/wizard/statistics/GradleNewProjectWizardCollector.kt b/plugins/gradle/java/src/service/project/wizard/statistics/GradleNewProjectWizardCollector.kt index 018f11edc2b1..a19e86a93f10 100644 --- a/plugins/gradle/java/src/service/project/wizard/statistics/GradleNewProjectWizardCollector.kt +++ b/plugins/gradle/java/src/service/project/wizard/statistics/GradleNewProjectWizardCollector.kt @@ -5,21 +5,17 @@ import com.intellij.ide.projectWizard.NewProjectWizardCollector.GROUP import com.intellij.ide.projectWizard.NewProjectWizardCollector.buildSystemFields import com.intellij.ide.projectWizard.NewProjectWizardCollector.logBuildSystemEvent import com.intellij.ide.wizard.NewProjectWizardStep -import com.intellij.internal.statistic.eventLog.EventLogGroup import com.intellij.internal.statistic.eventLog.events.EventFields import com.intellij.internal.statistic.eventLog.validator.ValidationResultType import com.intellij.internal.statistic.eventLog.validator.rules.EventContext import com.intellij.internal.statistic.eventLog.validator.rules.impl.CustomValidationRule -import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector import org.gradle.util.GradleVersion import org.jetbrains.annotations.ApiStatus import org.jetbrains.plugins.gradle.service.project.wizard.GradleNewProjectWizardStep.GradleDsl import org.jetbrains.plugins.gradle.settings.DistributionType @ApiStatus.Internal -internal object GradleNewProjectWizardCollector : CounterUsagesCollector() { - - override fun getGroup(): EventLogGroup = GROUP +internal object GradleNewProjectWizardCollector { private val gradleDslField = EventFields.Enum("gradle_dsl") private val gradleDistributionField = EventFields.Enum("gradle_distribution")