Skip to content

Commit d0984cc

Browse files
committed
Calculate projects configurationMetrics after project evaluation
This configuration metrics calculation allows - to avoid metrics calculation on build close and CME - to get clear stack trace and error message in case of exception Delete unnecessary ProjectConfigurationFusService services. #KTI-1611 Fixed Merge-request: KT-MR-16382 Merged-by: Nataliya Valtman <Nataliya.Valtman@jetbrains.com> (cherry picked from commit 363cbac)
1 parent 351f801 commit d0984cc

File tree

3 files changed

+1
-49
lines changed

3 files changed

+1
-49
lines changed

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/BuildFusService.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ abstract class BuildFusService : BuildService<BuildFusService.Parameters>, AutoC
9595
val isConfigurationCacheRequested = project.isConfigurationCacheRequested
9696
val isProjectIsolationRequested = project.isProjectIsolationRequested
9797

98-
ProjectConfigurationFusService.registerIfAbsent(project)
99-
10098
project.gradle.sharedServices.registrations.findByName(serviceName)?.let {
10199
@Suppress("UNCHECKED_CAST")
102100
return (it.service as Provider<BuildFusService>)

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/FinalizeConfigurationFusMetricAction.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,9 @@ import org.jetbrains.kotlin.gradle.plugin.await
1313
internal val FinalizeConfigurationFusMetricAction = KotlinProjectSetupCoroutine {
1414
KotlinPluginLifecycle.Stage.ReadyForExecution.await()
1515

16-
val projectConfigurationService =
17-
project.gradle.sharedServices.registrations.findByName(ProjectConfigurationFusService.getServiceName(project))?.also {
18-
val parameters = it.parameters as ProjectConfigurationFusService.Parameters
19-
parameters.configurationMetrics.finalizeValue()
20-
}
21-
2216
project.gradle.sharedServices.registrations.findByName(BuildFusService.serviceName)?.also {
2317
val parameters = it.parameters as BuildFusService.Parameters
2418
parameters.generalConfigurationMetrics.finalizeValue()
25-
projectConfigurationService?.service?.orNull?.also {
26-
parameters.configurationMetrics.add((it.parameters as ProjectConfigurationFusService.Parameters).configurationMetrics)
27-
}
19+
parameters.configurationMetrics.add(KotlinProjectConfigurationMetrics.collectMetrics(project))
2820
}
2921
}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/ProjectConfigurationFusService.kt

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)