From 58442df5311fd69f349b24fe189f73683b627a0a Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Wed, 20 Jul 2022 15:17:00 +0200 Subject: [PATCH] [maven] add FUS events for MavenImporter usage and duration (fix module counting) GitOrigin-RevId: 0db12ef3afd0a794880bc3f0981b0103270f629f --- .../maven/importing/MavenLegacyModuleImporter.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenLegacyModuleImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenLegacyModuleImporter.java index 785efccc24ee..33a75eb61667 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenLegacyModuleImporter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenLegacyModuleImporter.java @@ -157,7 +157,7 @@ public final class MavenLegacyModuleImporter { } if (importer.getModuleType() == moduleType) { - measureImporterTime(importer, counters, () -> { + measureImporterTime(importer, counters, true, () -> { importer.preProcess(myModule, myMavenProject, changes, myProviderForExtensions); }); } @@ -188,7 +188,7 @@ public final class MavenLegacyModuleImporter { if (importer.getModuleType() == moduleType) { try { - measureImporterTime(importer, counters, () -> { + measureImporterTime(importer, counters, false, () -> { importer.process(myProviderForExtensions, myModule, myRootModelAdapter, @@ -226,7 +226,7 @@ public final class MavenLegacyModuleImporter { } if (importer.getModuleType() == moduleType) { - measureImporterTime(importer, counters, () -> { + measureImporterTime(importer, counters, false, () -> { importer.postProcess(myModule, myMavenProject, changes, myProviderForExtensions); }); } @@ -238,14 +238,17 @@ public final class MavenLegacyModuleImporter { }); } - private static void measureImporterTime(MavenImporter importer, Map, CountAndTime> counters, Runnable r) { + private static void measureImporterTime(MavenImporter importer, + Map, CountAndTime> counters, + boolean increaseModuleCounter, + Runnable r) { long before = System.nanoTime(); try { r.run(); } finally { CountAndTime countAndTime = counters.computeIfAbsent(importer.getClass(), __ -> new CountAndTime()); - countAndTime.count++; + if (increaseModuleCounter) countAndTime.count++; countAndTime.time += TimeoutUtil.getDurationMillis(before); } }