From 67a6256bb3d06161f19321d42365761c5269c109 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Thu, 11 Aug 2016 17:44:33 +0200 Subject: [PATCH] SONAR-7833 log visitor execution timings in ce_activity.log --- .../task/projectanalysis/step/ExecuteVisitorsStep.java | 4 +++- .../projectanalysis/step/ExecuteVisitorsStepTest.java | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java index 7257fc46c38..4da14fba3f7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStep.java @@ -28,6 +28,8 @@ import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolde import org.sonar.server.computation.task.projectanalysis.component.VisitorsCrawler; import org.sonar.server.computation.task.step.ComputationStep; +import static org.sonar.ce.log.CeLogging.logCeActivity; + public class ExecuteVisitorsStep implements ComputationStep { private static final Logger LOGGER = Loggers.get(ExecuteVisitorsStep.class); @@ -49,7 +51,7 @@ public class ExecuteVisitorsStep implements ComputationStep { public void execute() { VisitorsCrawler visitorsCrawler = new VisitorsCrawler(visitors); visitorsCrawler.visit(treeRootHolder.getRoot()); - logVisitorExecutionDurations(visitors, visitorsCrawler); + logCeActivity(() -> logVisitorExecutionDurations(visitors, visitorsCrawler)); } private static void logVisitorExecutionDurations(List visitors, VisitorsCrawler visitorsCrawler) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java index 59a0d3616c2..d357135e49e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java @@ -23,11 +23,11 @@ import java.util.Arrays; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.server.computation.task.projectanalysis.component.Component; import org.sonar.server.computation.task.projectanalysis.component.ComponentVisitor; import org.sonar.server.computation.task.projectanalysis.component.CrawlerDepthLimit; import org.sonar.server.computation.task.projectanalysis.component.PathAwareVisitorAdapter; +import org.sonar.server.computation.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.server.computation.task.projectanalysis.component.TypeAwareVisitorAdapter; import org.sonar.server.computation.task.projectanalysis.measure.MeasureRepositoryRule; import org.sonar.server.computation.task.projectanalysis.metric.Metric; @@ -75,10 +75,10 @@ public class ExecuteVisitorsStepTest { builder(DIRECTORY, DIRECTORY_REF).setKey("directory") .addChildren( builder(FILE, FILE_1_REF).setKey("file1").build(), - builder(FILE, FILE_2_REF).setKey("file2").build() - ).build() - ).build() - ).build()); + builder(FILE, FILE_2_REF).setKey("file2").build()) + .build()) + .build()) + .build()); } @Test -- 2.39.5