From c8254676c13e2025f6d806225c967138c33db34c Mon Sep 17 00:00:00 2001
From: "nataliya.valtman" <nataliya.valtman@jetbrains.com>
Date: Mon, 2 Aug 2021 15:26:08 +0300
Subject: [PATCH] Add non Incremental reason to build scan

---
 .../gradle/plugin/statistics/KotlinBuildEsStatListener.kt     | 3 ++-
 .../kotlin/gradle/plugin/statistics/ReportStatistics.kt       | 1 +
 .../gradle/plugin/statistics/ReportStatisticsToBuildScan.kt   | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/KotlinBuildEsStatListener.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/KotlinBuildEsStatListener.kt
index c373a0f35d5..4f25296f750 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/KotlinBuildEsStatListener.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/KotlinBuildEsStatListener.kt
@@ -66,7 +66,8 @@ class KotlinBuildEsStatListener(val projectName: String, val reportStatistics :
         val compileStatData = CompileStatData(
             duration = duration, taskResult = taskResult.name, label = label,
             statData = statData, projectName = projectName, taskName = taskPath, changes = changes,
-            tags = taskExecutionResult?.taskInfo?.properties?.map { it.name } ?: emptyList()
+            tags = taskExecutionResult?.taskInfo?.properties?.map { it.name } ?: emptyList(),
+            nonIncrementalAttributes = taskExecutionResult?.buildMetrics?.buildAttributes?.asMap()?.mapKeys { (key, _) -> key.name }?: emptyMap()
         )
         reportStatistics.forEach { it.report(compileStatData) }
     }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/ReportStatistics.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/ReportStatistics.kt
index 16d6a698e06..dd61a05b004 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/ReportStatistics.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/ReportStatistics.kt
@@ -14,6 +14,7 @@ data class CompileStatData(
     val duration: Long,
     val tags: List<String>,
     val changes: List<String>,
+    val nonIncrementalAttributes: Map<String, Int>,
     val statData: Map<String, Long>
 )
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/ReportStatisticsToBuildScan.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/ReportStatisticsToBuildScan.kt
index 6fb6b118eec..38485496a6b 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/ReportStatisticsToBuildScan.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/statistics/ReportStatisticsToBuildScan.kt
@@ -13,5 +13,9 @@ import org.jetbrains.kotlin.gradle.plugin.stat.ReportStatistics
 class ReportStatisticsToBuildScan(val buildScan: BuildScanExtension) : ReportStatistics {
     override fun report(data: CompileStatData) {
         buildScan.value(data.taskName, Gson().toJson(data).toString())
+        val keys = data.nonIncrementalAttributes.filterValues { it > 0 }.keys.joinToString()
+        if (keys.isNotEmpty()) {
+            buildScan.value("${data.taskName}_nonIncremental", keys)
+        }
     }
 }
\ No newline at end of file