From e77e226e434f042de4921ae92b0856b8ca48676b Mon Sep 17 00:00:00 2001 From: Anastasia Ivanova Date: Tue, 13 Apr 2021 12:52:43 +0700 Subject: [PATCH] IDEA-265654: code cleanup, rename IdeActivityGroup to IdeActivityDefinition GitOrigin-RevId: ac44faf7752f1d3aeacc4e0bb804b25b315dc4ec --- ...RunConfigurationUsageTriggerCollector.java | 16 ++++++------- .../statistics/ExternalSystemTaskCollector.kt | 11 ++++----- .../statistics/ProjectImportCollector.kt | 4 ++-- .../ProjectTaskManagerStatisticsCollector.kt | 4 ++-- .../project/IndexingStatisticsCollector.kt | 4 ++-- .../internal/statistic/IdeActivity.kt | 2 +- .../statistic/StructuredIdeActivity.kt | 24 +++++++++---------- .../changes/actions/VcsStatisticsCollector.kt | 8 +++---- 8 files changed, 35 insertions(+), 38 deletions(-) diff --git a/platform/execution-impl/src/com/intellij/execution/impl/statistics/RunConfigurationUsageTriggerCollector.java b/platform/execution-impl/src/com/intellij/execution/impl/statistics/RunConfigurationUsageTriggerCollector.java index e4c980eca737..b1c08a73ae1e 100644 --- a/platform/execution-impl/src/com/intellij/execution/impl/statistics/RunConfigurationUsageTriggerCollector.java +++ b/platform/execution-impl/src/com/intellij/execution/impl/statistics/RunConfigurationUsageTriggerCollector.java @@ -10,7 +10,7 @@ import com.intellij.execution.target.TargetEnvironmentAwareRunProfile; import com.intellij.execution.target.TargetEnvironmentConfiguration; import com.intellij.execution.target.TargetEnvironmentType; import com.intellij.execution.target.TargetEnvironmentsManager; -import com.intellij.internal.statistic.IdeActivityGroup; +import com.intellij.internal.statistic.IdeActivityDefinition; import com.intellij.internal.statistic.StructuredIdeActivity; import com.intellij.internal.statistic.eventLog.EventLogGroup; import com.intellij.internal.statistic.eventLog.events.*; @@ -42,13 +42,13 @@ public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCo private static final EnumEventField FINISH_TYPE = EventFields.Enum("finish_type", RunConfigurationFinishType.class); - private static final IdeActivityGroup ACTIVITY_GROUP = new IdeActivityGroup(GROUP, null, - new EventField[]{ADDITIONAL_FIELD, EXECUTOR, - TARGET, - RunConfigurationTypeUsagesCollector.FACTORY_FIELD, - RunConfigurationTypeUsagesCollector.ID_FIELD, - EventFields.PluginInfo}, - new EventField[]{FINISH_TYPE}); + private static final IdeActivityDefinition ACTIVITY_GROUP = new IdeActivityDefinition(GROUP, null, + new EventField[]{ADDITIONAL_FIELD, EXECUTOR, + TARGET, + RunConfigurationTypeUsagesCollector.FACTORY_FIELD, + RunConfigurationTypeUsagesCollector.ID_FIELD, + EventFields.PluginInfo}, + new EventField[]{FINISH_TYPE}); public static final VarargEventId UI_SHOWN_STAGE = ACTIVITY_GROUP.registerStage("ui.shown"); diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/statistics/ExternalSystemTaskCollector.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/statistics/ExternalSystemTaskCollector.kt index 957a823183cb..882d6eb4a172 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/statistics/ExternalSystemTaskCollector.kt +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/statistics/ExternalSystemTaskCollector.kt @@ -2,7 +2,7 @@ package com.intellij.openapi.externalSystem.statistics import com.intellij.execution.impl.statistics.RunConfigurationUsageTriggerCollector -import com.intellij.internal.statistic.IdeActivityGroup +import com.intellij.internal.statistic.IdeActivityDefinition import com.intellij.internal.statistic.eventLog.EventLogGroup import com.intellij.internal.statistic.eventLog.events.EventFields import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector @@ -20,12 +20,9 @@ class ExternalSystemTaskCollector : CounterUsagesCollector() { @JvmField - val EXTERNAL_TASK_ACTIVITY = IdeActivityGroup(GROUP, startEventAdditionalFields = arrayOf(TASK_ID_FIELD, - TARGET_FIELD, - EXTERNAL_SYSTEM_ID)) - - //@JvmField - //val INDEXING_STAGE = INDEXING_ACTIVITY.registerStage("stage", arrayOf(STAGE_CLASS)) + val EXTERNAL_TASK_ACTIVITY = IdeActivityDefinition(GROUP, startEventAdditionalFields = arrayOf(TASK_ID_FIELD, + TARGET_FIELD, + EXTERNAL_SYSTEM_ID)) } override fun getGroup(): EventLogGroup { diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/statistics/ProjectImportCollector.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/statistics/ProjectImportCollector.kt index dfcaa0aeed65..c6a80826f99c 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/statistics/ProjectImportCollector.kt +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/statistics/ProjectImportCollector.kt @@ -1,7 +1,7 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.externalSystem.statistics -import com.intellij.internal.statistic.IdeActivityGroup +import com.intellij.internal.statistic.IdeActivityDefinition import com.intellij.internal.statistic.eventLog.EventLogGroup import com.intellij.internal.statistic.eventLog.events.EventFields import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector @@ -15,7 +15,7 @@ class ProjectImportCollector : CounterUsagesCollector() { val TASK_CLASS = EventFields.Class("task_class") @JvmField - val IMPORT_ACTIVITY = IdeActivityGroup(GROUP, startEventAdditionalFields=arrayOf(EXTERNAL_SYSTEM_ID, TASK_CLASS, EventFields.PluginInfo)) + val IMPORT_ACTIVITY = IdeActivityDefinition(GROUP, null, startEventAdditionalFields=arrayOf(EXTERNAL_SYSTEM_ID, TASK_CLASS, EventFields.PluginInfo)) } override fun getGroup(): EventLogGroup { diff --git a/platform/lang-impl/src/com/intellij/task/impl/ProjectTaskManagerStatisticsCollector.kt b/platform/lang-impl/src/com/intellij/task/impl/ProjectTaskManagerStatisticsCollector.kt index af098a516de8..c1235b024c18 100644 --- a/platform/lang-impl/src/com/intellij/task/impl/ProjectTaskManagerStatisticsCollector.kt +++ b/platform/lang-impl/src/com/intellij/task/impl/ProjectTaskManagerStatisticsCollector.kt @@ -1,7 +1,7 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.task.impl -import com.intellij.internal.statistic.IdeActivityGroup +import com.intellij.internal.statistic.IdeActivityDefinition import com.intellij.internal.statistic.eventLog.EventLogGroup import com.intellij.internal.statistic.eventLog.events.EventFields import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector @@ -14,7 +14,7 @@ class ProjectTaskManagerStatisticsCollector : CounterUsagesCollector() { val TASK_RUNNER = EventFields.StringListValidatedByCustomRule("task_runner_class","class_name") @JvmField - val BUILD_ACTIVITY = IdeActivityGroup(GROUP, startEventAdditionalFields = arrayOf(TASK_RUNNER, EventFields.PluginInfo)) + val BUILD_ACTIVITY = IdeActivityDefinition(GROUP, null, startEventAdditionalFields = arrayOf(TASK_RUNNER, EventFields.PluginInfo)) } override fun getGroup(): EventLogGroup { diff --git a/platform/platform-impl/src/com/intellij/openapi/project/IndexingStatisticsCollector.kt b/platform/platform-impl/src/com/intellij/openapi/project/IndexingStatisticsCollector.kt index 2864c9c31cf7..3b1e41f00665 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/IndexingStatisticsCollector.kt +++ b/platform/platform-impl/src/com/intellij/openapi/project/IndexingStatisticsCollector.kt @@ -1,7 +1,7 @@ // Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.project -import com.intellij.internal.statistic.IdeActivityGroup +import com.intellij.internal.statistic.IdeActivityDefinition import com.intellij.internal.statistic.eventLog.EventLogGroup import com.intellij.internal.statistic.eventLog.events.EventFields import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector @@ -14,7 +14,7 @@ class IndexingStatisticsCollector : CounterUsagesCollector() { val STAGE_CLASS = EventFields.Class("stage_class") @JvmField - val INDEXING_ACTIVITY = IdeActivityGroup(GROUP, startEventAdditionalFields = arrayOf(EventFields.PluginInfo)) + val INDEXING_ACTIVITY = IdeActivityDefinition(GROUP, null, startEventAdditionalFields = arrayOf(EventFields.PluginInfo)) @JvmField val INDEXING_STAGE = INDEXING_ACTIVITY.registerStage("stage", arrayOf(STAGE_CLASS)) diff --git a/platform/statistics/src/com/intellij/internal/statistic/IdeActivity.kt b/platform/statistics/src/com/intellij/internal/statistic/IdeActivity.kt index bfd4067b0361..b700950bae50 100644 --- a/platform/statistics/src/com/intellij/internal/statistic/IdeActivity.kt +++ b/platform/statistics/src/com/intellij/internal/statistic/IdeActivity.kt @@ -14,7 +14,7 @@ import java.util.function.Consumer private val LOG = Logger.getInstance(IdeActivity::class.java) -enum class IdeActivityState { NOT_STARTED, STARTED, FINISHED } +internal enum class IdeActivityState { NOT_STARTED, STARTED, FINISHED } @Deprecated("Use com.intellij.internal.statistic.StructuredIdeActivity instead") @ApiStatus.Internal diff --git a/platform/statistics/src/com/intellij/internal/statistic/StructuredIdeActivity.kt b/platform/statistics/src/com/intellij/internal/statistic/StructuredIdeActivity.kt index 9a4bcc97bf3b..921f67c9b064 100644 --- a/platform/statistics/src/com/intellij/internal/statistic/StructuredIdeActivity.kt +++ b/platform/statistics/src/com/intellij/internal/statistic/StructuredIdeActivity.kt @@ -17,7 +17,7 @@ private val LOG = Logger.getInstance(StructuredIdeActivity::class.java) @ApiStatus.Internal class StructuredIdeActivity constructor(private val projectOrNullForApplication: Project?, - private val ideActivityGroup: IdeActivityGroup) { + private val ideActivityDefinition: IdeActivityDefinition) { private val id = counter.incrementAndGet() private var state = IdeActivityState.NOT_STARTED @@ -28,13 +28,13 @@ class StructuredIdeActivity constructor(private val projectOrNullForApplication: if (!LOG.assertTrue(state == IdeActivityState.NOT_STARTED, state.name)) return this state = IdeActivityState.STARTED - val data: MutableList> = mutableListOf(IdeActivityGroup.activityId.with(id)) + val data: MutableList> = mutableListOf(IdeActivityDefinition.activityId.with(id)) if (dataSupplier != null) { data.addAll(dataSupplier()) } startedTimestamp = System.nanoTime() - ideActivityGroup.started.log(projectOrNullForApplication, data) + ideActivityDefinition.started.log(projectOrNullForApplication, data) return this } @@ -43,11 +43,11 @@ class StructuredIdeActivity constructor(private val projectOrNullForApplication: state = IdeActivityState.STARTED startedTimestamp = System.nanoTime() - val data: MutableList> = mutableListOf(IdeActivityGroup.activityId.with(id)) + val data: MutableList> = mutableListOf(IdeActivityDefinition.activityId.with(id)) dataSupplier().then { additionalData -> data.addAll(additionalData) - ideActivityGroup.started.log(projectOrNullForApplication, data) + ideActivityDefinition.started.log(projectOrNullForApplication, data) } return this @@ -57,7 +57,7 @@ class StructuredIdeActivity constructor(private val projectOrNullForApplication: fun stageStarted(stage: VarargEventId, dataSupplier: (() -> List>)? = null): StructuredIdeActivity { if (!LOG.assertTrue(state == IdeActivityState.STARTED, state.name)) return this - val data: MutableList> = mutableListOf(IdeActivityGroup.activityId.with(id)) + val data: MutableList> = mutableListOf(IdeActivityDefinition.activityId.with(id)) if (dataSupplier != null) { data.addAll(dataSupplier()) } @@ -71,13 +71,13 @@ class StructuredIdeActivity constructor(private val projectOrNullForApplication: if (!LOG.assertTrue(state == IdeActivityState.STARTED, state.name)) return this state = IdeActivityState.FINISHED - val data: MutableList> = mutableListOf(IdeActivityGroup.activityId.with(id)) + val data: MutableList> = mutableListOf(IdeActivityDefinition.activityId.with(id)) if (dataSupplier != null) { data.addAll(dataSupplier()) } data.add(EventFields.DurationMs.with(TimeoutUtil.getDurationMillis(startedTimestamp))) - ideActivityGroup.finished.log(projectOrNullForApplication, data) + ideActivityDefinition.finished.log(projectOrNullForApplication, data) return this } @@ -86,10 +86,10 @@ class StructuredIdeActivity constructor(private val projectOrNullForApplication: } } -class IdeActivityGroup @JvmOverloads constructor(val group: EventLogGroup, - val activityName: String? = null, - startEventAdditionalFields: Array> = emptyArray(), - finishEventAdditionalFields: Array> = emptyArray()) { +class IdeActivityDefinition @JvmOverloads constructor(val group: EventLogGroup, + val activityName: String?, + startEventAdditionalFields: Array> = emptyArray(), + finishEventAdditionalFields: Array> = emptyArray()) { val started = group.registerVarargEvent(appendActivityName(activityName, "started"), activityId, *startEventAdditionalFields) val finished = group.registerVarargEvent(appendActivityName(activityName, "finished"), activityId, EventFields.DurationMs, *finishEventAdditionalFields) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/VcsStatisticsCollector.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/VcsStatisticsCollector.kt index 7c9968752e38..4b80361a1f06 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/VcsStatisticsCollector.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/VcsStatisticsCollector.kt @@ -1,7 +1,7 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.vcs.changes.actions -import com.intellij.internal.statistic.IdeActivityGroup +import com.intellij.internal.statistic.IdeActivityDefinition import com.intellij.internal.statistic.eventLog.EventLogGroup import com.intellij.internal.statistic.eventLog.events.EventFields import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector @@ -15,13 +15,13 @@ class VcsStatisticsCollector : CounterUsagesCollector() { val GROUP = EventLogGroup("vcs", 8) @JvmField - val UPDATE_ACTIVITY = IdeActivityGroup(GROUP, "update") + val UPDATE_ACTIVITY = IdeActivityDefinition(GROUP, "update") @JvmField - val FETCH_ACTIVITY = IdeActivityGroup(GROUP, "fetch") + val FETCH_ACTIVITY = IdeActivityDefinition(GROUP, "fetch") @JvmField - val COMMIT_ACTIVITY = IdeActivityGroup(GROUP, "commit") + val COMMIT_ACTIVITY = IdeActivityDefinition(GROUP, "commit") private val WAS_UPDATING_BEFORE = EventFields.Boolean("wasUpdatingBefore") private val CHANGES_DELTA = EventFields.Int("changesDelta")