From 229d04ea33ecdb35cda7a5f2d8ffae995985ed1c Mon Sep 17 00:00:00 2001 From: Dmitry Kichinsky Date: Fri, 2 Jun 2023 11:59:13 +0200 Subject: [PATCH] [maven] IDEA-313767 refactoring: fix IDE activity reporting for MavenProjectsProcessorReadingTask GitOrigin-RevId: d0787f8f2f151b7196cfcfccce36b43d4127ba19 --- .../idea/maven/project/MavenProjectsProcessor.java | 8 -------- .../MavenProjectsProcessorDeltaReadingTask.java | 10 ++++++++++ .../project/MavenProjectsProcessorReadingTask.java | 9 +++++++++ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessor.java index 52f733d544b9..2ba10e33875e 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessor.java @@ -15,13 +15,10 @@ */ package org.jetbrains.idea.maven.project; -import com.intellij.internal.statistic.StructuredIdeActivity; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.diagnostic.ControlFlowException; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.externalSystem.issue.BuildIssueException; -import com.intellij.openapi.externalSystem.statistics.ExternalSystemStatUtilKt; -import com.intellij.openapi.externalSystem.statistics.ProjectImportCollector; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.NlsContexts; @@ -33,7 +30,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.maven.execution.BTWMavenConsole; import org.jetbrains.idea.maven.utils.*; -import java.util.Collections; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicBoolean; @@ -143,9 +139,6 @@ public class MavenProjectsProcessor { } private void processTask(MavenProgressIndicator indicator, MavenProjectsProcessorTask task) throws MavenProcessCanceledException { - StructuredIdeActivity activity = ExternalSystemStatUtilKt.importActivityStarted(myProject, MavenUtil.SYSTEM_ID, () -> - Collections.singletonList(ProjectImportCollector.TASK_CLASS.with(task.getClass())) - ); long startTime = System.currentTimeMillis(); try { final MavenGeneralSettings mavenGeneralSettings = MavenProjectsManager.getInstance(myProject).getGeneralSettings(); @@ -160,7 +153,6 @@ public class MavenProjectsProcessor { logImportErrorIfNotControlFlow(e); } finally { - activity.finished(); long duration = System.currentTimeMillis() - startTime; if (duration > 10) { LOG.info("[maven import] " + StringUtil.getShortName(task.getClass()) + " took " + duration + "ms"); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessorDeltaReadingTask.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessorDeltaReadingTask.java index ac741d3b2f89..2e0888fff929 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessorDeltaReadingTask.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessorDeltaReadingTask.java @@ -1,13 +1,18 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.idea.maven.project; +import com.intellij.internal.statistic.StructuredIdeActivity; +import com.intellij.openapi.externalSystem.statistics.ExternalSystemStatUtilKt; +import com.intellij.openapi.externalSystem.statistics.ProjectImportCollector; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.utils.MavenProcessCanceledException; import org.jetbrains.idea.maven.utils.MavenProgressIndicator; +import org.jetbrains.idea.maven.utils.MavenUtil; +import java.util.Collections; import java.util.List; public class MavenProjectsProcessorDeltaReadingTask implements MavenProjectsProcessorTask { @@ -37,6 +42,10 @@ public class MavenProjectsProcessorDeltaReadingTask implements MavenProjectsProc MavenEmbeddersManager embeddersManager, MavenConsole console, MavenProgressIndicator indicator) throws MavenProcessCanceledException { + StructuredIdeActivity activity = ExternalSystemStatUtilKt.importActivityStarted(project, MavenUtil.SYSTEM_ID, () -> + Collections.singletonList(ProjectImportCollector.TASK_CLASS.with(MavenProjectsProcessorReadingTask.class)) + ); + try { myTree.delete(myFilesToDelete, mySettings, indicator); myTree.update(myFilesToUpdate, myForce, mySettings, indicator); @@ -44,6 +53,7 @@ public class MavenProjectsProcessorDeltaReadingTask implements MavenProjectsProc mySettings.updateFromMavenConfig(myTree.getRootProjectsFiles()); } finally { + activity.finished(); if (myOnCompletion != null) myOnCompletion.run(); } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessorReadingTask.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessorReadingTask.java index 4ef8e39275e2..80fd8982e87f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessorReadingTask.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessorReadingTask.java @@ -15,6 +15,9 @@ */ package org.jetbrains.idea.maven.project; +import com.intellij.internal.statistic.StructuredIdeActivity; +import com.intellij.openapi.externalSystem.statistics.ExternalSystemStatUtilKt; +import com.intellij.openapi.externalSystem.statistics.ProjectImportCollector; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.server.MavenWrapperDownloader; @@ -23,6 +26,7 @@ import org.jetbrains.idea.maven.utils.MavenProgressIndicator; import org.jetbrains.idea.maven.utils.MavenUtil; import java.nio.file.Path; +import java.util.Collections; public class MavenProjectsProcessorReadingTask implements MavenProjectsProcessorTask { private final boolean myForce; @@ -45,6 +49,10 @@ public class MavenProjectsProcessorReadingTask implements MavenProjectsProcessor MavenEmbeddersManager embeddersManager, MavenConsole console, MavenProgressIndicator indicator) throws MavenProcessCanceledException { + StructuredIdeActivity activity = ExternalSystemStatUtilKt.importActivityStarted(project, MavenUtil.SYSTEM_ID, () -> + Collections.singletonList(ProjectImportCollector.TASK_CLASS.with(MavenProjectsProcessorReadingTask.class)) + ); + try { checkOrInstallMavenWrapper(project); myTree.updateAll(myForce, mySettings, indicator); @@ -52,6 +60,7 @@ public class MavenProjectsProcessorReadingTask implements MavenProjectsProcessor mySettings.updateFromMavenConfig(myTree.getRootProjectsFiles()); } finally { + activity.finished(); if (myOnCompletion != null) myOnCompletion.run(); } }