[FUS] Add FUS event for useFirRunner option in JVM builds

^KT-79032 Fixed


Merge-request: KT-MR-22753
Merged-by: Evgenii Mazhukin <[email protected]>

Author: mazhukinevgeniy

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/FusStatisticsIT.kt

@@ -322,12 +322,12 @@ class FusStatisticsIT : KGPBaseTest() {
         }
     }
 
+    @JvmGradlePluginTests
     @DisplayName("fus metric for multiproject")
     @GradleTest
     @GradleTestVersions(
         additionalVersions = [TestVersions.Gradle.G_8_0, TestVersions.Gradle.G_8_2],
     )
-    @JvmGradlePluginTests
     fun testFusStatisticsForMultiproject(gradleVersion: GradleVersion) {
         project(
             "incrementalMultiproject", gradleVersion,
@@ -374,6 +374,37 @@ class FusStatisticsIT : KGPBaseTest() {
         }
     }
 
+    @JvmGradlePluginTests
+    @DisplayName("fus metric for jvm feature flags")
+    @GradleTest
+    @GradleTestVersions(
+        additionalVersions = [TestVersions.Gradle.G_8_0, TestVersions.Gradle.G_8_2],
+    )
+    fun testFusStatisticsForJvmMultiprojectWithFeatureFlags(gradleVersion: GradleVersion) {
+        project(
+            "incrementalMultiproject", gradleVersion,
+        ) {
+            assertNoErrorFilesCreated {
+                //Collect metrics from BuildMetricsService also
+                build(
+                    "compileKotlin", "-Pkotlin.session.logger.root.path=$projectPath",
+                    buildOptions = defaultBuildOptions
+                        .copy(
+                            buildReport = listOf(BuildReportType.FILE),
+                            useFirJvmRunner = true,
+                        ).disableIsolatedProjects(),
+                ) {
+                    assertOutputDoesNotContainFusErrors()
+                    fusStatisticsDirectory.assertFusReportContains(
+                        "CONFIGURATION_IMPLEMENTATION_COUNT=2",
+                        "NUMBER_OF_SUBPROJECTS=2",
+                        "COMPILATIONS_COUNT=2",
+                        "KOTLIN_INCREMENTAL_FIR_RUNNER_ENABLED=true"
+                    )
+                }
+            }
+        }
+    }
 
     @JvmGradlePluginTests
     @DisplayName("general fields with configuration cache")

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

@@ -251,6 +251,7 @@ internal object CompileKotlinTaskMetrics : FusMetrics {
         name: String,
         compilerOptions: KotlinCommonCompilerOptions,
         separateKmpCompilationEnabled: Boolean,
+        firRunnerEnabled: Boolean, // jvm only as of 2.2.20
         metricsContainer: StatisticsValuesConsumer,
     ) {
         metricsContainer.report(BooleanMetrics.KOTLIN_PROGRESSIVE_MODE, compilerOptions.progressiveMode.get())
@@ -267,6 +268,9 @@ internal object CompileKotlinTaskMetrics : FusMetrics {
         if (separateKmpCompilationEnabled) {
             metricsContainer.report(BooleanMetrics.KOTLIN_SEPARATE_KMP_COMPILATION_ENABLED, true)
         }
+        if (firRunnerEnabled) {
+            metricsContainer.report(BooleanMetrics.KOTLIN_INCREMENTAL_FIR_RUNNER_ENABLED, true)
+        }
     }
 }
 
@@ -359,4 +363,4 @@ internal object KotlinStdlibConfigurationMetrics : FusMetrics {
             it.put(StringMetrics.KOTLIN_STDLIB_VERSION, requestedStdlibVersion)
         }
     }
-}
+}

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/AbstractKotlinCompile.kt

@@ -236,7 +236,13 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments> @Inject constr
         buildMetrics.addTimeMetric(GradleBuildPerformanceMetric.START_TASK_ACTION_EXECUTION)
         buildMetrics.measure(GradleBuildTime.OUT_OF_WORKER_TASK_ACTION) {
             buildFusService.orNull?.reportFusMetrics {
-                CompileKotlinTaskMetrics.collectMetrics(name, compilerOptions, separateKmpCompilation.get(), it)
+                CompileKotlinTaskMetrics.collectMetrics(
+                    name,
+                    compilerOptions,
+                    separateKmpCompilation.get(),
+                    firRunnerEnabled = (this as? KotlinCompile)?.useFirRunner?.get() == true,
+                    it
+                )
             }
             validateCompilerClasspath()
             systemPropertiesService.get().startIntercept()

libraries/tools/kotlin-gradle-statistics/src/main/kotlin/org/jetbrains/kotlin/statistics/metrics/BooleanMetrics.kt

@@ -47,6 +47,7 @@ enum class BooleanMetrics(val type: BooleanOverridePolicy, val anonymization: Bo
     KOTLIN_PROGRESSIVE_MODE(OVERRIDE, SAFE),
     KOTLIN_KTS_USED(OR, SAFE),
     KOTLIN_INCREMENTAL_NATIVE_ENABLED(OR, SAFE),
+    KOTLIN_INCREMENTAL_FIR_RUNNER_ENABLED(OR, SAFE),
     KOTLIN_SEPARATE_KMP_COMPILATION_ENABLED(OR, SAFE),
     KMP_TOP_LEVEL_DEPENDENCIES_BLOCK(OR, SAFE),
 
@@ -118,6 +119,6 @@ enum class BooleanMetrics(val type: BooleanOverridePolicy, val anonymization: Bo
     ;
 
     companion object {
-        const val VERSION = 16
+        const val VERSION = 17
     }
 }

libraries/tools/kotlin-gradle-statistics/src/test/kotlin/org/jetbrains/kotlin/statistics/ModuleChangesCatchingTest.kt

@@ -23,7 +23,7 @@ private const val STRING_METRICS_RELATIVE_PATH = "$SOURCE_CODE_RELATIVE_PATH/Str
 private const val NUMERICAL_METRICS_RELATIVE_PATH = "$SOURCE_CODE_RELATIVE_PATH/NumericalMetrics.kt"
 
 private val STRING_METRICS_EXPECTED_VERSION_AND_HASH = Pair(6, "9590d0e39131ec9814649a6e38a5b81e")
-private val BOOLEAN_METRICS_EXPECTED_VERSION_AND_HASH = Pair(16, "e6f8f64dc79393d70113c5eaa8711f3c")
+private val BOOLEAN_METRICS_EXPECTED_VERSION_AND_HASH = Pair(17, "7ee268355a9a9d92e398c9e1cb1c6f58")
 private val NUMERICAL_METRICS_EXPECTED_VERSION_AND_HASH = Pair(2, "d8c1a1f4fb7227fbe8247320bf3370ca")
 private val SOURCE_FOLDER_EXPECTED_VERSION_AND_HASH =
     Pair(