Update custom values format
This commit is contained in:
nataliya.valtman
@@ -15,22 +15,22 @@ enum class BuildAttributeKind : Serializable {
|
||||
}
|
||||
}
|
||||
|
||||
enum class BuildAttribute(val kind: BuildAttributeKind) : Serializable {
|
||||
NO_BUILD_HISTORY(BuildAttributeKind.REBUILD_REASON),
|
||||
NO_ABI_SNAPSHOT(BuildAttributeKind.REBUILD_REASON),
|
||||
CACHE_CORRUPTION(BuildAttributeKind.REBUILD_REASON),
|
||||
UNKNOWN_CHANGES_IN_GRADLE_INPUTS(BuildAttributeKind.REBUILD_REASON),
|
||||
JAVA_CHANGE_UNTRACKED_FILE_IS_REMOVED(BuildAttributeKind.REBUILD_REASON),
|
||||
JAVA_CHANGE_UNEXPECTED_PSI(BuildAttributeKind.REBUILD_REASON),
|
||||
JAVA_CHANGE_UNKNOWN_QUALIFIER(BuildAttributeKind.REBUILD_REASON),
|
||||
DEP_CHANGE_REMOVED_ENTRY(BuildAttributeKind.REBUILD_REASON),
|
||||
DEP_CHANGE_HISTORY_IS_NOT_FOUND(BuildAttributeKind.REBUILD_REASON),
|
||||
DEP_CHANGE_HISTORY_CANNOT_BE_READ(BuildAttributeKind.REBUILD_REASON),
|
||||
DEP_CHANGE_HISTORY_NO_KNOWN_BUILDS(BuildAttributeKind.REBUILD_REASON),
|
||||
DEP_CHANGE_NON_INCREMENTAL_BUILD_IN_DEP(BuildAttributeKind.REBUILD_REASON),
|
||||
IN_PROCESS_EXECUTION(BuildAttributeKind.REBUILD_REASON),
|
||||
OUT_OF_PROCESS_EXECUTION(BuildAttributeKind.REBUILD_REASON),
|
||||
IC_IS_NOT_ENABLED(BuildAttributeKind.REBUILD_REASON);
|
||||
enum class BuildAttribute(val kind: BuildAttributeKind, val readableString: String) : Serializable {
|
||||
NO_BUILD_HISTORY(BuildAttributeKind.REBUILD_REASON, "Build history file not found"),
|
||||
NO_ABI_SNAPSHOT(BuildAttributeKind.REBUILD_REASON, "ABI snapshot not found"),
|
||||
CACHE_CORRUPTION(BuildAttributeKind.REBUILD_REASON, "Cache corrupted"),
|
||||
UNKNOWN_CHANGES_IN_GRADLE_INPUTS(BuildAttributeKind.REBUILD_REASON, "Unknown Gradle changes"),
|
||||
JAVA_CHANGE_UNTRACKED_FILE_IS_REMOVED(BuildAttributeKind.REBUILD_REASON, "Untracked Java file is removed"),
|
||||
JAVA_CHANGE_UNEXPECTED_PSI(BuildAttributeKind.REBUILD_REASON, "Java PSI file is expected"),
|
||||
JAVA_CHANGE_UNKNOWN_QUALIFIER(BuildAttributeKind.REBUILD_REASON, "Unknown Java qualifier name"),
|
||||
DEP_CHANGE_REMOVED_ENTRY(BuildAttributeKind.REBUILD_REASON, "Jar file is removed form dependency"),
|
||||
DEP_CHANGE_HISTORY_IS_NOT_FOUND(BuildAttributeKind.REBUILD_REASON, "Dependency history not found"),
|
||||
DEP_CHANGE_HISTORY_CANNOT_BE_READ(BuildAttributeKind.REBUILD_REASON, "Dependency history can not be read"),
|
||||
DEP_CHANGE_HISTORY_NO_KNOWN_BUILDS(BuildAttributeKind.REBUILD_REASON, "Dependency history id not available"),
|
||||
DEP_CHANGE_NON_INCREMENTAL_BUILD_IN_DEP(BuildAttributeKind.REBUILD_REASON, "Non incremental build in history"),
|
||||
IN_PROCESS_EXECUTION(BuildAttributeKind.REBUILD_REASON, "In-process execution"),
|
||||
OUT_OF_PROCESS_EXECUTION(BuildAttributeKind.REBUILD_REASON, "Out of process execution"),
|
||||
IC_IS_NOT_ENABLED(BuildAttributeKind.REBUILD_REASON, "Incremental compilation is not enabled");
|
||||
|
||||
companion object {
|
||||
const val serialVersionUID = 0L
|
||||
|
||||
+2
-2
@@ -24,8 +24,8 @@ class BuildMetricsReporterImpl : BuildMetricsReporter {
|
||||
|
||||
override fun endMeasure(metric: BuildTime, endNs: Long) {
|
||||
val startNs = myBuildTimeStartNs.remove(metric) ?: error("$metric finished before it started")
|
||||
val durationNs = endNs - startNs
|
||||
myBuildTimes.add(metric, durationNs)
|
||||
val durationMs = (endNs - startNs) / 1_000_000
|
||||
myBuildTimes.add(metric, durationMs)
|
||||
}
|
||||
|
||||
override fun addAttribute(attribute: BuildAttribute) {
|
||||
|
||||
@@ -8,35 +8,35 @@ package org.jetbrains.kotlin.build.report.metrics
|
||||
import java.io.Serializable
|
||||
|
||||
@Suppress("Reformat")
|
||||
enum class BuildTime(val parent: BuildTime? = null) : Serializable {
|
||||
GRADLE_TASK_ACTION,
|
||||
GRADLE_TASK,
|
||||
CLEAR_OUTPUT(GRADLE_TASK),
|
||||
BACKUP_OUTPUT(GRADLE_TASK),
|
||||
RESTORE_OUTPUT_FROM_BACKUP(GRADLE_TASK),
|
||||
CONNECT_TO_DAEMON(GRADLE_TASK),
|
||||
CLEAR_JAR_CACHE(GRADLE_TASK),
|
||||
RUN_COMPILER(GRADLE_TASK),
|
||||
NON_INCREMENTAL_COMPILATION_IN_PROCESS(RUN_COMPILER),
|
||||
NON_INCREMENTAL_COMPILATION_OUT_OF_PROCESS(RUN_COMPILER),
|
||||
NON_INCREMENTAL_COMPILATION_DAEMON(RUN_COMPILER),
|
||||
INCREMENTAL_COMPILATION(RUN_COMPILER),
|
||||
STORE_BUILD_INFO(INCREMENTAL_COMPILATION),
|
||||
JAR_SNAPSHOT(INCREMENTAL_COMPILATION),
|
||||
SET_UP_ABI_SNAPSHOTS(JAR_SNAPSHOT),
|
||||
IC_ANALYZE_JAR_FILES(JAR_SNAPSHOT),
|
||||
IC_CALCULATE_INITIAL_DIRTY_SET(INCREMENTAL_COMPILATION),
|
||||
IC_ANALYZE_CHANGES_IN_DEPENDENCIES(IC_CALCULATE_INITIAL_DIRTY_SET),
|
||||
IC_FIND_HISTORY_FILES(IC_ANALYZE_CHANGES_IN_DEPENDENCIES),
|
||||
IC_ANALYZE_HISTORY_FILES(IC_ANALYZE_CHANGES_IN_DEPENDENCIES),
|
||||
IC_ANALYZE_CHANGES_IN_JAVA_SOURCES(IC_CALCULATE_INITIAL_DIRTY_SET),
|
||||
IC_ANALYZE_CHANGES_IN_ANDROID_LAYOUTS(IC_CALCULATE_INITIAL_DIRTY_SET),
|
||||
IC_DETECT_REMOVED_CLASSES(IC_CALCULATE_INITIAL_DIRTY_SET),
|
||||
CLEAR_OUTPUT_ON_REBUILD(INCREMENTAL_COMPILATION),
|
||||
IC_UPDATE_CACHES(INCREMENTAL_COMPILATION),
|
||||
INCREMENTAL_ITERATION(INCREMENTAL_COMPILATION),
|
||||
NON_INCREMENTAL_ITERATION(INCREMENTAL_COMPILATION),
|
||||
IC_WRITE_HISTORY_FILE(INCREMENTAL_COMPILATION);
|
||||
enum class BuildTime(val parent: BuildTime? = null, val readableString: String) : Serializable {
|
||||
GRADLE_TASK_ACTION(readableString = "Task execution"),
|
||||
GRADLE_TASK(readableString = "Total time"),
|
||||
CLEAR_OUTPUT(GRADLE_TASK, "Clear output"),
|
||||
BACKUP_OUTPUT(GRADLE_TASK, "Backup output"),
|
||||
RESTORE_OUTPUT_FROM_BACKUP(GRADLE_TASK, "Restore output"),
|
||||
CONNECT_TO_DAEMON(GRADLE_TASK, "Connect to Kotlin daemon"),
|
||||
CLEAR_JAR_CACHE(GRADLE_TASK, "Clear jar cache"),
|
||||
RUN_COMPILER(GRADLE_TASK, "Run compiler"),
|
||||
NON_INCREMENTAL_COMPILATION_IN_PROCESS(RUN_COMPILER, "Inprocess compilation"),
|
||||
NON_INCREMENTAL_COMPILATION_OUT_OF_PROCESS(RUN_COMPILER, "Out of process compilation"),
|
||||
NON_INCREMENTAL_COMPILATION_DAEMON(RUN_COMPILER, "Non incremental compilation"),
|
||||
INCREMENTAL_COMPILATION(RUN_COMPILER, "Incremental compilation"),
|
||||
STORE_BUILD_INFO(INCREMENTAL_COMPILATION, "Store build info"),
|
||||
JAR_SNAPSHOT(INCREMENTAL_COMPILATION, "ABI JAR Snapshot support"),
|
||||
SET_UP_ABI_SNAPSHOTS(JAR_SNAPSHOT, "Set up ABI snapshot"),
|
||||
IC_ANALYZE_JAR_FILES(JAR_SNAPSHOT, "Analyze jar files"),
|
||||
IC_CALCULATE_INITIAL_DIRTY_SET(INCREMENTAL_COMPILATION, "Init dirty symbols set"),
|
||||
IC_ANALYZE_CHANGES_IN_DEPENDENCIES(IC_CALCULATE_INITIAL_DIRTY_SET, "Analyze dependency changes"),
|
||||
IC_FIND_HISTORY_FILES(IC_ANALYZE_CHANGES_IN_DEPENDENCIES, "Find history files"),
|
||||
IC_ANALYZE_HISTORY_FILES(IC_ANALYZE_CHANGES_IN_DEPENDENCIES, "Analyze history files"),
|
||||
IC_ANALYZE_CHANGES_IN_JAVA_SOURCES(IC_CALCULATE_INITIAL_DIRTY_SET, "Analyze Java file changes"),
|
||||
IC_ANALYZE_CHANGES_IN_ANDROID_LAYOUTS(IC_CALCULATE_INITIAL_DIRTY_SET, "Analyze Android layouts"),
|
||||
IC_DETECT_REMOVED_CLASSES(IC_CALCULATE_INITIAL_DIRTY_SET, "Detect removed classes"),
|
||||
CLEAR_OUTPUT_ON_REBUILD(INCREMENTAL_COMPILATION, "Clear outputs on rebuild"),
|
||||
IC_UPDATE_CACHES(INCREMENTAL_COMPILATION, "Update caches"),
|
||||
INCREMENTAL_ITERATION(INCREMENTAL_COMPILATION, "Incremental iteration"),
|
||||
NON_INCREMENTAL_ITERATION(INCREMENTAL_COMPILATION, "Non-incremental iteration"),
|
||||
IC_WRITE_HISTORY_FILE(INCREMENTAL_COMPILATION, "Write history file");
|
||||
|
||||
companion object {
|
||||
const val serialVersionUID = 0L
|
||||
|
||||
@@ -12,13 +12,13 @@ class BuildTimes : Serializable {
|
||||
private val myBuildTimes = EnumMap<BuildTime, Long>(BuildTime::class.java)
|
||||
|
||||
fun addAll(other: BuildTimes) {
|
||||
for ((bt, timeNs) in other.myBuildTimes) {
|
||||
add(bt, timeNs)
|
||||
for ((bt, timeMs) in other.myBuildTimes) {
|
||||
add(bt, timeMs)
|
||||
}
|
||||
}
|
||||
|
||||
fun add(buildTime: BuildTime, timeNs: Long) {
|
||||
myBuildTimes[buildTime] = myBuildTimes.getOrDefault(buildTime, 0) + timeNs
|
||||
fun add(buildTime: BuildTime, timeMs: Long) {
|
||||
myBuildTimes[buildTime] = myBuildTimes.getOrDefault(buildTime, 0) + timeMs
|
||||
}
|
||||
|
||||
fun asMap(): Map<BuildTime, Long> = myBuildTimes
|
||||
|
||||
Reference in New Issue
Block a user