MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 06:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

[fus] IJPL-156718 Run Configuration was started event: use Service View instead of Services

Browse Source 
GitOrigin-RevId: 551ba0ab0207803a80025a044e4715521003c180
This commit is contained in:
Konstantin Aleev
2024-06-19 14:25:34 +02:00
committed by intellij-monorepo-bot
parent 734d22367f
commit 6ae5a06f0a
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/execution-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.kt
View File

@@ -936,7 +936,7 @@ private fun triggerUsage(environment: ExecutionEnvironment): StructuredIdeActivi
val runConfiguration = environment.runnerAndConfigurationSettings?.configuration
val configurationFactory = runConfiguration?.factory ?: return null
val isRerun = environment.getUserData(ExecutionManagerImpl.REPORT_NEXT_START_AS_RERUN) == true
val isServices = RunDashboardManager.getInstance(environment.project).isShowInDashboard(runConfiguration)
val isServiceView = RunDashboardManager.getInstance(environment.project).isShowInDashboard(runConfiguration)
// The 'Rerun' button in the Run tool window will reuse the same ExecutionEnvironment object again.
// If there are no processes to stop, the REPORT_NEXT_START_AS_RERUN won't be set in restartRunProfile(), so need to set it here.
@@ -947,10 +947,10 @@ private fun triggerUsage(environment: ExecutionEnvironment): StructuredIdeActivi
return when(val parentIdeActivity = environment.getUserData(ExecutionManagerImpl.PARENT_PROFILE_IDE_ACTIVITY)) {
null -> RunConfigurationUsageTriggerCollector
.trigger(environment.project, configurationFactory, environment.executor, runConfiguration, isRerun,
environment.isRunningCurrentFile, isDumb, isServices)
environment.isRunningCurrentFile, isDumb, isServiceView)
else -> RunConfigurationUsageTriggerCollector
.triggerWithParent(parentIdeActivity, environment.project, configurationFactory, environment.executor, runConfiguration, isRerun,
environment.isRunningCurrentFile, isDumb, isServices)
environment.isRunningCurrentFile, isDumb, isServiceView)
}
}

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

@@ -32,7 +32,7 @@ import static com.intellij.execution.impl.statistics.RunConfigurationTypeUsagesC
public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCollector {
public static final String GROUP_NAME = "run.configuration.exec";
private static final EventLogGroup GROUP = new EventLogGroup(GROUP_NAME, 76);
private static final EventLogGroup GROUP = new EventLogGroup(GROUP_NAME, 77);
public static final IntEventField ALTERNATIVE_JRE_VERSION = EventFields.Int("alternative_jre_version");
private static final ObjectEventField ADDITIONAL_FIELD = EventFields.createAdditionalDataField(GROUP_NAME, "started");
@@ -41,7 +41,7 @@ public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCo
private static final BooleanEventField IS_RERUN = EventFields.Boolean("is_rerun");
private static final BooleanEventField IS_RUNNING_CURRENT_FILE = EventFields.Boolean("is_running_current_file");
private static final BooleanEventField IS_DUMB_MODE = EventFields.Boolean("dumb");
private static final BooleanEventField IS_SERVICES = EventFields.Boolean("services");
private static final BooleanEventField IS_SERVICE_VIEW = EventFields.Boolean("serviceView");
/**
* The type of the target the run configuration is being executed with. {@code null} stands for the local machine target.
@@ -69,7 +69,7 @@ public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCo
EventFields.PluginInfo,
ENV_FILES_COUNT,
IS_DUMB_MODE,
IS_SERVICES
IS_SERVICE_VIEW
},
new EventField<?>[]{FINISH_TYPE},
null,
@@ -89,10 +89,10 @@ public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCo
boolean isRerun,
boolean isRunningCurrentFile,
boolean isDumb,
boolean isServices) {
boolean isServiceView) {
return ACTIVITY_GROUP
.startedAsync(project, () -> ReadAction.nonBlocking(
() -> buildContext(project, factory, executor, runConfiguration, isRerun, isRunningCurrentFile, isDumb, isServices)
() -> buildContext(project, factory, executor, runConfiguration, isRerun, isRunningCurrentFile, isDumb, isServiceView)
)
.expireWith(project)
.submit(NonUrgentExecutor.getInstance()));
@@ -106,10 +106,10 @@ public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCo
boolean isRerun,
boolean isRunningCurrentFile,
boolean isDumb,
boolean isServices) {
boolean isServiceView) {
return ACTIVITY_GROUP
.startedAsyncWithParent(project, parentActivity, () -> ReadAction.nonBlocking(
() -> buildContext(project, factory, executor, runConfiguration, isRerun, isRunningCurrentFile, isDumb, isServices)
() -> buildContext(project, factory, executor, runConfiguration, isRerun, isRunningCurrentFile, isDumb, isServiceView)
)
.expireWith(project)
.submit(NonUrgentExecutor.getInstance()));
@@ -122,14 +122,14 @@ public final class RunConfigurationUsageTriggerCollector extends CounterUsagesCo
boolean isRerun,
boolean isRunningCurrentFile,
boolean isDumb,
boolean isServices) {
boolean isServiceView) {
List<EventPair<?>> eventPairs = createFeatureUsageData(factory.getType(), factory);
ExecutorGroup<?> group = ExecutorGroup.getGroupIfProxy(executor);
eventPairs.add(EXECUTOR.with(group != null ? group.getId() : executor.getId()));
eventPairs.add(IS_RERUN.with(isRerun));
eventPairs.add(IS_RUNNING_CURRENT_FILE.with(isRunningCurrentFile));
eventPairs.add(IS_DUMB_MODE.with(isDumb));
eventPairs.add(IS_SERVICES.with(isServices));
eventPairs.add(IS_SERVICE_VIEW.with(isServiceView));
if (runConfiguration instanceof FusAwareRunConfiguration) {
List<EventPair<?>> additionalData = ((FusAwareRunConfiguration)runConfiguration).getAdditionalUsageData();

4
platform/execution-impl/src/com/intellij/execution/multilaunch/MultiLaunchProfileState.kt
View File

@@ -23,12 +23,12 @@ class MultiLaunchProfileState(
) : RunProfileState {
override fun execute(executor: Executor?, runner: ProgramRunner<*>): ExecutionResult? {
val isDumb = DumbService.isDumb(project)
val isServices = RunDashboardManager.getInstance(project).isShowInDashboard(configuration)
val isServiceView = RunDashboardManager.getInstance(project).isShowInDashboard(configuration)
val factory = configuration.factory ?: throw CantRunException("factory is null")
executor ?: throw CantRunException("executor is null")
project.lifetime.launchBackground {
val activity = RunConfigurationUsageTriggerCollector.trigger(project, factory, executor, configuration,
checkRunning(), false, isDumb, isServices)
checkRunning(), false, isDumb, isServiceView)
ExecutionEngine.getInstance(project).execute(configuration, getExecutionMode(executor), activity)
RunConfigurationUsageTriggerCollector.logProcessFinished(activity, RunConfigurationUsageTriggerCollector.RunConfigurationFinishType.UNKNOWN)
}