Implemented collecting use-old-backend flag from Gradle

#KT-46689 Fixed
JetBrains · May 19, 2021 · b3134c0 · b3134c0
1 parent 0505d58
commit b3134c0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/statistics/KotlinGradleFUSLogger.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/statistics/KotlinGradleFUSLogger.kt
@@ -129,7 +129,8 @@ class KotlinGradleFUSLogger : StartupActivity, DumbAware, Runnable {
                 BooleanMetrics.ENABLED_COMPILER_PLUGIN_JPA_SUPPORT,
                 BooleanMetrics.ENABLED_COMPILER_PLUGIN_SAM_WITH_RECEIVER,
                 BooleanMetrics.JVM_COMPILER_IR_MODE,
-                StringMetrics.JVM_DEFAULTS
+                StringMetrics.JVM_DEFAULTS,
+                StringMetrics.USE_OLD_BACKEND
             )
 
             container.log(

diff --git a/...-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/...-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
@@ -134,10 +134,13 @@ internal open class GradleCompilerRunner(protected val taskProvider: GradleCompi
         // compiler would report metrics by itself via JMX
         KotlinBuildStatsService.applyIfInitialised {
             if (compilerArgs is K2JVMCompilerArguments) {
-                val args = K2JVMCompilerArguments()
-                parseCommandLineArguments(argsArray.toList(), args)
-                KotlinBuildStatsService.getInstance()?.report(BooleanMetrics.JVM_COMPILER_IR_MODE, args.useIR)
-                KotlinBuildStatsService.getInstance()?.report(StringMetrics.JVM_DEFAULTS, args.jvmDefault)
+                KotlinBuildStatsService.getInstance()?.apply {
+                    val args = K2JVMCompilerArguments()
+                    parseCommandLineArguments(argsArray.toList(), args)
+                    report(BooleanMetrics.JVM_COMPILER_IR_MODE, args.useIR)
+                    report(StringMetrics.JVM_DEFAULTS, args.jvmDefault)
+                    report(StringMetrics.USE_OLD_BACKEND, args.useOldBackend.toString())
+                }
             }
         }
 

diff --git a/...ols/kotlin-gradle-statistics/src/org/jetbrains/kotlin/statistics/metrics/StringMetrics.kt b/...ols/kotlin-gradle-statistics/src/org/jetbrains/kotlin/statistics/metrics/StringMetrics.kt
@@ -46,4 +46,6 @@ enum class StringMetrics(val type: StringOverridePolicy, val anonymization: Stri
 
     // Compiler parameters
     JVM_DEFAULTS(CONCAT, SAFE),
+    USE_OLD_BACKEND(CONCAT, SAFE)
+
 }