From 1d2e60a2af0dd79f853ea5ffd9b6bea61aae3306 Mon Sep 17 00:00:00 2001
From: Alexander Likhachev <Alexander.Likhachev@jetbrains.com>
Date: Fri, 3 Dec 2021 12:46:59 +0300
Subject: [PATCH] [Gradle] Measure TESTS_EXECUTED & COMPILATION_STARTED metrics
 report time

---
 .../org/jetbrains/kotlin/gradle/tasks/Tasks.kt       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
index afb77aa754d..a51eca9909d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
@@ -337,14 +337,14 @@ abstract class AbstractKotlinCompile<T : CommonCompilerArguments> : AbstractKotl
 
     @TaskAction
     fun execute(inputChanges: InputChanges) {
-        KotlinBuildStatsService.applyIfInitialised {
-            if (name.contains("Test"))
-                it.report(BooleanMetrics.TESTS_EXECUTED, true)
-            else
-                it.report(BooleanMetrics.COMPILATION_STARTED, true)
-        }
         val buildMetrics = metrics.get()
         buildMetrics.measure(BuildTime.GRADLE_TASK_ACTION) {
+            KotlinBuildStatsService.applyIfInitialised {
+                if (name.contains("Test"))
+                    it.report(BooleanMetrics.TESTS_EXECUTED, true)
+                else
+                    it.report(BooleanMetrics.COMPILATION_STARTED, true)
+            }
             validateCompilerClasspath()
             systemPropertiesService.get().startIntercept()
             CompilerSystemProperties.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY.value = "true"