execution-impl: remove collector-related code from exposed API

GitOrigin-RevId: 498970fcefbe0bcbe1ac2ad03dbfd16bf948f56d

platform/execution-impl/api-dump-unreviewed.txt

@@ -1359,71 +1359,16 @@ com.intellij.execution.impl.statistics.FusAwareRunConfiguration
 - a:getAdditionalUsageData():java.util.List
 com.intellij.execution.impl.statistics.FusCollectSettingChangesRunConfiguration
 - a:collectSettingChangesOnApply(com.intellij.execution.impl.statistics.FusCollectSettingChangesRunConfiguration):V
-f:com.intellij.execution.impl.statistics.MacroNameValidationRule
-- com.intellij.internal.statistic.eventLog.validator.rules.FUSRule
-- com.intellij.internal.statistic.eventLog.validator.rules.PerformanceCareRule
-- com.intellij.internal.statistic.eventLog.validator.rules.impl.UtilValidationRule
-- <init>():V
-f:com.intellij.execution.impl.statistics.MacroUsageCollector
-- sf:INSTANCE:com.intellij.execution.impl.statistics.MacroUsageCollector
-- getGroup():com.intellij.internal.statistic.eventLog.EventLogGroup
-- sf:logMacroExpanded(com.intellij.ide.macro.Macro,Z):V
 f:com.intellij.execution.impl.statistics.RunConfigurationTypeLanguageExtension
 - <init>():V
 - getEventId():java.lang.String
 - getExtensionFields():java.util.List
 - getGroupId():java.lang.String
-f:com.intellij.execution.impl.statistics.RunConfigurationTypeUsagesCollector
-- sf:CONFIGURED_IN_PROJECT:java.lang.String
-- sf:FACTORY_FIELD:com.intellij.internal.statistic.eventLog.events.StringEventField
-- sf:GROUP:com.intellij.internal.statistic.eventLog.EventLogGroup
-- sf:ID_FIELD:com.intellij.internal.statistic.eventLog.events.StringEventField
-- <init>():V
-- s:createFeatureUsageData(com.intellij.execution.configurations.ConfigurationType,com.intellij.execution.configurations.ConfigurationFactory):java.util.List
-- getGroup():com.intellij.internal.statistic.eventLog.EventLogGroup
-- getMetrics(com.intellij.openapi.project.Project):java.util.Set
-f:com.intellij.execution.impl.statistics.RunConfigurationTypeUsagesCollector$RunConfigurationUtilValidator
-- com.intellij.internal.statistic.eventLog.validator.rules.FUSRule
-- com.intellij.internal.statistic.eventLog.validator.rules.PerformanceCareRule
-- com.intellij.internal.statistic.eventLog.validator.rules.impl.UtilValidationRule
-- <init>():V
-- acceptRuleId(java.lang.String):Z
-- getRuleId():java.lang.String
 f:com.intellij.execution.impl.statistics.RunConfigurationUsageLanguageExtension
 - <init>():V
 - getEventId():java.lang.String
 - getExtensionFields():java.util.List
 - getGroupId():java.lang.String
-f:com.intellij.execution.impl.statistics.RunConfigurationUsageTriggerCollector
-- sf:ALTERNATIVE_JRE_VERSION:com.intellij.internal.statistic.eventLog.events.IntEventField
-- sf:GROUP_NAME:java.lang.String
-- sf:UI_SHOWN_STAGE:com.intellij.internal.statistic.eventLog.events.VarargEventId
-- <init>():V
-- getGroup():com.intellij.internal.statistic.eventLog.EventLogGroup
-- s:logProcessFinished(com.intellij.internal.statistic.StructuredIdeActivity,com.intellij.execution.impl.statistics.RunConfigurationUsageTriggerCollector$RunConfigurationFinishType):V
-- s:trigger(com.intellij.openapi.project.Project,com.intellij.execution.configurations.ConfigurationFactory,com.intellij.execution.Executor,com.intellij.execution.configurations.RunConfiguration,Z,Z,Z,Z):com.intellij.internal.statistic.StructuredIdeActivity
-- s:triggerWithParent(com.intellij.internal.statistic.StructuredIdeActivity,com.intellij.openapi.project.Project,com.intellij.execution.configurations.ConfigurationFactory,com.intellij.execution.Executor,com.intellij.execution.configurations.RunConfiguration,Z,Z,Z,Z):com.intellij.internal.statistic.StructuredIdeActivity
-f:com.intellij.execution.impl.statistics.RunConfigurationUsageTriggerCollector$RunConfigurationExecutorUtilValidator
-- com.intellij.internal.statistic.eventLog.validator.rules.FUSRule
-- com.intellij.internal.statistic.eventLog.validator.rules.PerformanceCareRule
-- com.intellij.internal.statistic.eventLog.validator.rules.impl.UtilValidationRule
-- <init>():V
-- getRuleId():java.lang.String
-e:com.intellij.execution.impl.statistics.RunConfigurationUsageTriggerCollector$RunConfigurationFinishType
-- java.lang.Enum
-- sf:FAILED_TO_START:com.intellij.execution.impl.statistics.RunConfigurationUsageTriggerCollector$RunConfigurationFinishType
-- sf:TERMINATED_BY_STOP:com.intellij.execution.impl.statistics.RunConfigurationUsageTriggerCollector$RunConfigurationFinishType
-- sf:TERMINATED_DUE_TO_RERUN:com.intellij.execution.impl.statistics.RunConfigurationUsageTriggerCollector$RunConfigurationFinishType
-- sf:UNKNOWN:com.intellij.execution.impl.statistics.RunConfigurationUsageTriggerCollector$RunConfigurationFinishType
-- s:valueOf(java.lang.String):com.intellij.execution.impl.statistics.RunConfigurationUsageTriggerCollector$RunConfigurationFinishType
-- s:values():com.intellij.execution.impl.statistics.RunConfigurationUsageTriggerCollector$RunConfigurationFinishType[]
-f:com.intellij.execution.impl.statistics.RunConfigurationUsageTriggerCollector$RunTargetValidator
-- com.intellij.internal.statistic.eventLog.validator.rules.FUSRule
-- com.intellij.internal.statistic.eventLog.validator.rules.PerformanceCareRule
-- com.intellij.internal.statistic.eventLog.validator.rules.impl.UtilValidationRule
-- sf:RULE_ID:java.lang.String
-- <init>():V
-- getRuleId():java.lang.String
 f:com.intellij.execution.lineMarker.ExecutorAction
 - com.intellij.openapi.actionSystem.ActionGroup
 - com.intellij.openapi.actionSystem.ActionWithDelegate
@@ -2339,40 +2284,6 @@ f:com.intellij.execution.multilaunch.state.MultiLaunchConfigurationSnapshot
 - f:getActivateToolWindows():Z
 - f:getRows():java.util.List
 - f:setActivateToolWindows(Z):V
-f:com.intellij.execution.multilaunch.statistics.ConditionTypeIdValidationRule
-- com.intellij.internal.statistic.eventLog.validator.rules.FUSRule
-- com.intellij.internal.statistic.eventLog.validator.rules.PerformanceCareRule
-- com.intellij.internal.statistic.eventLog.validator.rules.impl.UtilValidationRule
-- <init>():V
-- acceptRuleId(java.lang.String):Z
-- getRuleId():java.lang.String
-f:com.intellij.execution.multilaunch.statistics.CreatedOrigin
-- sf:INSTANCE:com.intellij.execution.multilaunch.statistics.CreatedOrigin
-- f:getCREATED_FIELD():com.intellij.internal.statistic.eventLog.events.BooleanEventField
-- f:getORIGIN_FIELD():com.intellij.internal.statistic.eventLog.events.EnumEventField
-f:com.intellij.execution.multilaunch.statistics.ExecutableTypeIdValidationRule
-- com.intellij.internal.statistic.eventLog.validator.rules.FUSRule
-- com.intellij.internal.statistic.eventLog.validator.rules.PerformanceCareRule
-- com.intellij.internal.statistic.eventLog.validator.rules.impl.UtilValidationRule
-- <init>():V
-- acceptRuleId(java.lang.String):Z
-- getRuleId():java.lang.String
-f:com.intellij.execution.multilaunch.statistics.FusCondition
-- sf:Companion:com.intellij.execution.multilaunch.statistics.FusCondition$Companion
-- <init>():V
-- f:getTypeId():java.lang.String
-- f:setTypeId(java.lang.String):V
-f:com.intellij.execution.multilaunch.statistics.FusCondition$Companion
-- f:createData(java.lang.String):com.intellij.internal.statistic.eventLog.events.ObjectEventData
-f:com.intellij.execution.multilaunch.statistics.FusExecutable
-- sf:Companion:com.intellij.execution.multilaunch.statistics.FusExecutable$Companion
-- <init>():V
-- f:getKind():com.intellij.execution.multilaunch.statistics.FusExecutableKind
-- f:getTypeId():java.lang.String
-- f:setKind(com.intellij.execution.multilaunch.statistics.FusExecutableKind):V
-- f:setTypeId(java.lang.String):V
-f:com.intellij.execution.multilaunch.statistics.FusExecutable$Companion
-- f:createData(com.intellij.execution.multilaunch.statistics.FusExecutableKind,java.lang.String):com.intellij.internal.statistic.eventLog.events.ObjectEventData
 e:com.intellij.execution.multilaunch.statistics.FusExecutableKind
 - java.lang.Enum
 - sf:RUN_CONFIGURATION:com.intellij.execution.multilaunch.statistics.FusExecutableKind
@@ -2381,25 +2292,6 @@ e:com.intellij.execution.multilaunch.statistics.FusExecutableKind
 - s:getEntries():kotlin.enums.EnumEntries
 - s:valueOf(java.lang.String):com.intellij.execution.multilaunch.statistics.FusExecutableKind
 - s:values():com.intellij.execution.multilaunch.statistics.FusExecutableKind[]
-f:com.intellij.execution.multilaunch.statistics.FusExecutableRows
-- sf:INSTANCE:com.intellij.execution.multilaunch.statistics.FusExecutableRows
-- f:getFIELD():com.intellij.internal.statistic.eventLog.events.ObjectListEventField
-f:com.intellij.execution.multilaunch.statistics.FusExecutionRow
-- sf:Companion:com.intellij.execution.multilaunch.statistics.FusExecutionRow$Companion
-- <init>():V
-- f:getCondition():com.intellij.internal.statistic.eventLog.events.ObjectEventData
-- f:getDisableDebugging():java.lang.Boolean
-- f:getExecutable():com.intellij.internal.statistic.eventLog.events.ObjectEventData
-- f:setCondition(com.intellij.internal.statistic.eventLog.events.ObjectEventData):V
-- f:setDisableDebugging(java.lang.Boolean):V
-- f:setExecutable(com.intellij.internal.statistic.eventLog.events.ObjectEventData):V
-f:com.intellij.execution.multilaunch.statistics.FusExecutionRow$Companion
-- f:createData(com.intellij.internal.statistic.eventLog.events.ObjectEventData,com.intellij.internal.statistic.eventLog.events.ObjectEventData,Z):com.intellij.internal.statistic.eventLog.events.ObjectEventData
-f:com.intellij.execution.multilaunch.statistics.MultiLaunchConfigurationTypeCollectorExtension
-- <init>():V
-- getEventId():java.lang.String
-- getExtensionFields():java.util.List
-- getGroupId():java.lang.String
 f:com.intellij.execution.multilaunch.statistics.MultiLaunchConfigurationUsageCollectorExtension
 - <init>():V
 - getEventId():java.lang.String
@@ -2419,14 +2311,6 @@ e:com.intellij.execution.multilaunch.statistics.MultiLaunchCreationOrigin
 - s:getEntries():kotlin.enums.EnumEntries
 - s:valueOf(java.lang.String):com.intellij.execution.multilaunch.statistics.MultiLaunchCreationOrigin
 - s:values():com.intellij.execution.multilaunch.statistics.MultiLaunchCreationOrigin[]
-f:com.intellij.execution.multilaunch.statistics.MultiLaunchEventFields
-- sf:INSTANCE:com.intellij.execution.multilaunch.statistics.MultiLaunchEventFields
-- f:getACTIVATE_TOOL_WINDOWS_FIELD():com.intellij.internal.statistic.eventLog.events.BooleanEventField
-f:com.intellij.execution.multilaunch.statistics.MultiLaunchUsageCollector
-- sf:INSTANCE:com.intellij.execution.multilaunch.statistics.MultiLaunchUsageCollector
-- getGroup():com.intellij.internal.statistic.eventLog.EventLogGroup
-- f:logActivated(com.intellij.execution.multilaunch.MultiLaunchConfiguration):V
-- f:logCreated(com.intellij.execution.multilaunch.MultiLaunchConfiguration):V
 a:com.intellij.execution.options.LifetimedSettingsEditor
 - com.intellij.openapi.options.SettingsEditor
 - <init>():V
@@ -2854,12 +2738,6 @@ f:com.intellij.execution.target.RunTargetsEnabled
 - <init>():V
 - s:forceEnable(com.intellij.openapi.Disposable):V
 - s:get():Z
-f:com.intellij.execution.target.TargetCounterUsagesCollector
-- <init>():V
-- getGroup():com.intellij.internal.statistic.eventLog.EventLogGroup
-- s:reportTargetCreationBegan(com.intellij.openapi.project.Project,java.lang.String):V
-- s:reportTargetCreationCancelled(com.intellij.openapi.project.Project,java.lang.String,I):V
-- s:reportTargetCreationSucceeded(com.intellij.openapi.project.Project,java.lang.String):V
 f:com.intellij.execution.target.TargetCustomToolPanel
 - <init>(com.intellij.openapi.project.Project,com.intellij.execution.target.TargetEnvironmentType,java.util.function.Supplier,com.intellij.execution.target.LanguageRuntimeConfiguration,com.intellij.execution.target.LanguageRuntimeType$Introspectable):V
 - f:applyAll():V

platform/execution-impl/exposed-private-api.txt

@@ -1,11 +1,4 @@
 com/intellij/configurationStore/StreamProvider
 com/intellij/execution/RunProfileStarter
 com/intellij/internal/statistic/StructuredIdeActivity
-com/intellij/internal/statistic/eventLog/events/BooleanEventField
-com/intellij/internal/statistic/eventLog/events/EnumEventField
-com/intellij/internal/statistic/eventLog/events/IntEventField
-com/intellij/internal/statistic/eventLog/events/ObjectEventData
-com/intellij/internal/statistic/eventLog/events/ObjectListEventField
-com/intellij/internal/statistic/eventLog/events/StringEventField
-com/intellij/internal/statistic/eventLog/events/VarargEventId
 com/intellij/openapi/actionSystem/remoting/ActionRemoteBehavior

platform/execution-impl/exposed-third-party-api.txt

@@ -1,6 +1,3 @@
-com/intellij/internal/statistic/eventLog/validator/rules/FUSRule
-com/intellij/internal/statistic/eventLog/validator/rules/PerformanceCareRule
-com/intellij/internal/statistic/eventLog/validator/rules/impl/UtilValidationRule
 com/jediterm/core/Color
 com/jediterm/core/util/TermSize
 com/jediterm/terminal/CursorShape

platform/execution-impl/src/com/intellij/execution/impl/statistics/MacroUsageCollector.kt

@@ -8,7 +8,7 @@ import com.intellij.internal.statistic.eventLog.events.EventFields
 import com.intellij.internal.statistic.eventLog.validator.rules.impl.ExtensionIdValidationRule
 import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector
 
-object MacroUsageCollector: CounterUsagesCollector() {
+internal object MacroUsageCollector : CounterUsagesCollector() {
   override fun getGroup(): EventLogGroup = GROUP
 
   private val GROUP = EventLogGroup("execution.macro", 1)
@@ -23,7 +23,7 @@ object MacroUsageCollector: CounterUsagesCollector() {
   }
 }
 
-class MacroNameValidationRule: ExtensionIdValidationRule<Macro>(Macro.EP_NAME, { macro -> macro.name }) {
+internal class MacroNameValidationRule : ExtensionIdValidationRule<Macro>(Macro.EP_NAME, { macro -> macro.name }) {
   override val extensions: Iterable<Macro>
     get() = MacroManager.getInstance().macros
 }

platform/execution-impl/src/com/intellij/execution/impl/statistics/RunConfigurationTypeUsagesCollector.java

@@ -28,11 +28,13 @@ import com.intellij.openapi.util.text.StringUtil;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntMaps;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
+@ApiStatus.Internal
 public final class RunConfigurationTypeUsagesCollector extends ProjectUsagesCollector {
   public static final String CONFIGURED_IN_PROJECT = "configured.in.project";
   public static final EventLogGroup GROUP = new EventLogGroup("run.configuration.type", 17);

platform/execution-impl/src/com/intellij/execution/impl/statistics/RunConfigurationUsageTriggerCollector.java

@@ -21,6 +21,7 @@ import com.intellij.openapi.application.ReadAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.concurrency.NonUrgentExecutor;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -30,6 +31,7 @@ import java.util.List;
 import static com.intellij.execution.impl.statistics.RunConfigurationTypeUsagesCollector.LOCAL_TYPE_ID;
 import static com.intellij.execution.impl.statistics.RunConfigurationTypeUsagesCollector.createFeatureUsageData;
 
+@ApiStatus.Internal
 public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCollector {
   public static final String GROUP_NAME = "run.configuration.exec";
   private static final EventLogGroup GROUP = new EventLogGroup(GROUP_NAME, 78);
@@ -171,6 +173,7 @@ public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCo
     }
   }
 
+  @ApiStatus.Internal
   public static final class RunConfigurationExecutorUtilValidator extends CustomValidationRule {
     @Override
     public @NotNull String getRuleId() {
@@ -189,6 +192,7 @@ public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCo
     }
   }
 
+  @ApiStatus.Internal
   public static final class RunTargetValidator extends CustomValidationRule {
     public static final String RULE_ID = "run_target";
 
@@ -212,5 +216,6 @@ public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCo
     }
   }
 
+  @ApiStatus.Internal
   public enum RunConfigurationFinishType {FAILED_TO_START, UNKNOWN, TERMINATED_BY_STOP, TERMINATED_DUE_TO_RERUN}
 }

platform/execution-impl/src/com/intellij/execution/multilaunch/statistics/ConditionTypeIdValidationRule.kt

@@ -5,7 +5,9 @@ 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.utils.getPluginInfo
+import org.jetbrains.annotations.ApiStatus
 
+@ApiStatus.Internal
 @Suppress("UnstableApiUsage")
 class ConditionTypeIdValidationRule : CustomValidationRule() {
   override fun getRuleId() = "multirun_condition_type_id"

platform/execution-impl/src/com/intellij/execution/multilaunch/statistics/ExecutableTypeIdValidationRule.kt

@@ -6,7 +6,9 @@ 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.utils.getPluginInfo
+import org.jetbrains.annotations.ApiStatus
 
+@ApiStatus.Internal
 @Suppress("UnstableApiUsage")
 class ExecutableTypeIdValidationRule : CustomValidationRule() {
   override fun getRuleId() = "multirun_executable_type_id"

platform/execution-impl/src/com/intellij/execution/multilaunch/statistics/MultiLaunchConfigurationTypeCollectorExtension.kt

@@ -4,7 +4,7 @@ import com.intellij.execution.impl.statistics.RunConfigurationTypeUsagesCollecto
 import com.intellij.internal.statistic.eventLog.events.EventField
 import com.intellij.internal.statistic.service.fus.collectors.FeatureUsageCollectorExtension
 
-class MultiLaunchConfigurationTypeCollectorExtension : FeatureUsageCollectorExtension {
+internal class MultiLaunchConfigurationTypeCollectorExtension : FeatureUsageCollectorExtension {
   override fun getGroupId() = RunConfigurationTypeUsagesCollector.GROUP.id
 
   override fun getEventId() = RunConfigurationTypeUsagesCollector.CONFIGURED_IN_PROJECT

platform/execution-impl/src/com/intellij/execution/multilaunch/statistics/MultiLaunchEventFields.kt

@@ -1,16 +1,17 @@
 package com.intellij.execution.multilaunch.statistics
 
 import com.intellij.internal.statistic.eventLog.events.*
+import org.jetbrains.annotations.ApiStatus
 
-object MultiLaunchEventFields {
+internal object MultiLaunchEventFields {
   val ACTIVATE_TOOL_WINDOWS_FIELD = EventFields.Boolean("activate_tool_windows")
 }
 
-object FusExecutableRows {
+internal object FusExecutableRows {
   val FIELD = ObjectListEventField("rows", FusExecutionRow())
 }
 
-class FusExecutionRow: ObjectDescription() {
+internal class FusExecutionRow : ObjectDescription() {
   var executable by field(ObjectEventField("executable", FusExecutable()))
   var condition by field(ObjectEventField("condition", FusCondition()))
   var disableDebugging by field(EventFields.Boolean("disable_debugging"))
@@ -26,7 +27,7 @@ class FusExecutionRow: ObjectDescription() {
   }
 }
 
-class FusExecutable: ObjectDescription() {
+internal class FusExecutable : ObjectDescription() {
   var kind by field(EventFields.Enum<FusExecutableKind>("kind"))
   var typeId by field(EventFields.StringValidatedByCustomRule<ExecutableTypeIdValidationRule>("type_id"))
 
@@ -40,7 +41,8 @@ class FusExecutable: ObjectDescription() {
   }
 }
 
-class FusCondition: ObjectDescription() {
+@ApiStatus.Internal
+class FusCondition : ObjectDescription() {
   var typeId by field(EventFields.StringValidatedByCustomRule<ConditionTypeIdValidationRule>("type_id"))
 
   companion object {
@@ -52,6 +54,7 @@ class FusCondition: ObjectDescription() {
   }
 }
 
+@ApiStatus.Internal
 object CreatedOrigin {
   val CREATED_FIELD = EventFields.Boolean("is_created")
   val ORIGIN_FIELD = EventFields.Enum<MultiLaunchCreationOrigin>("origin")

platform/execution-impl/src/com/intellij/execution/multilaunch/statistics/MultiLaunchUsageCollector.kt

@@ -3,7 +3,9 @@ package com.intellij.execution.multilaunch.statistics
 import com.intellij.execution.multilaunch.MultiLaunchConfiguration
 import com.intellij.internal.statistic.eventLog.EventLogGroup
 import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector
+import org.jetbrains.annotations.ApiStatus
 
+@ApiStatus.Internal
 object MultiLaunchUsageCollector : CounterUsagesCollector() {
   private val GROUP = EventLogGroup("run.configuration.multilaunch", 1)
   private val CREATED_ORIGIN = GROUP.registerEvent("configuration.activated",

platform/execution-impl/src/com/intellij/execution/target/TargetCounterUsagesCollector.java

@@ -11,7 +11,7 @@ import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesColle
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
-public final class TargetCounterUsagesCollector extends CounterUsagesCollector {
+final class TargetCounterUsagesCollector extends CounterUsagesCollector {
   private static final EventLogGroup GROUP;
   private static final EventId1<String> TARGET_CREATION_BEGAN_EVENT;
   private static final EventId2<String, Integer> TARGET_CREATION_CANCELLED_EVENT;