[maven] fix flaky tests IDEA-357354

GitOrigin-RevId: 3389ea7b60f9bfa95f59bb8da03be0614e3f3ba4
This commit is contained in:
Alexander Bubenchikov
2024-09-19 18:08:16 +02:00
committed by intellij-monorepo-bot
parent 48ab0344ad
commit 9ebdffab0b

View File

@@ -173,23 +173,23 @@ public class Maven40ProjectResolver {
buildingResultInfos.add(new ProjectBuildingResultInfo(buildingResult, exceptions, newDependencyHash));
myLongRunningTask.updateTotalRequests(buildingResultInfos.size());
Collection<Maven40ExecutionResult> execResults =
myTelemetry.executeWithSpan("resolveBuildingResults",
runInParallel,
buildingResultInfos, br -> {
if (myLongRunningTask.isCanceled()) return new Maven40ExecutionResult(Collections.emptyList());
Maven40ExecutionResult result = myTelemetry.callWithSpan(
"resolveBuildingResult " + br.buildingResult.getProjectId(), () ->
resolveBuildingResult(session.getRepositorySession(), br.buildingResult, br.exceptions));
result.setDependencyHash(br.dependencyHash);
myLongRunningTask.incrementFinishedRequests();
return result;
}
);
executionResults.addAll(execResults);
}
Collection<Maven40ExecutionResult> execResults =
myTelemetry.executeWithSpan("resolveBuildingResults",
runInParallel,
buildingResultInfos, br -> {
if (myLongRunningTask.isCanceled()) return new Maven40ExecutionResult(Collections.emptyList());
Maven40ExecutionResult result = myTelemetry.callWithSpan(
"resolveBuildingResult " + br.buildingResult.getProjectId(), () ->
resolveBuildingResult(session.getRepositorySession(), br.buildingResult, br.exceptions));
result.setDependencyHash(br.dependencyHash);
myLongRunningTask.incrementFinishedRequests();
return result;
}
);
executionResults.addAll(execResults);
}
catch (Exception e) {
executionResults.add(handleException(e));