MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[maven] IDEA-313767 refactoring: fix IDE activity reporting for MavenProjectsProcessorReadingTask

Browse Source 
GitOrigin-RevId: d0787f8f2f151b7196cfcfccce36b43d4127ba19
This commit is contained in:
Dmitry Kichinsky
2023-06-02 11:43:58 +00:00
committed by intellij-monorepo-bot
parent 7e62e05a79
commit 229d04ea33
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessor.java
-8
View File
@@ -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");
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessorDeltaReadingTask.java
+10
View File
@@ -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();
}
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsProcessorReadingTask.java
+9
View File
@@ -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();
}
}