azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Warn in Gradle log when incremental compilation fails

Browse Source 
When incremental compilation fails, we currently log it at the `debug`
level (and fall back to non-incremental compilation). This commit will
change it to `warning` so that we can get more user reports, which will
allow us to fix the root cause.

Also make sure the warning includes a stack trace.

Additionally, let ReportSeverity.fromCode() return a non-null value
or throw an exception otherwise as that case is not expected.

^KT-52839 In Progress
This commit is contained in:
Hung Nguyen
2022-06-16 15:56:41 +01:00
committed by teamcity
parent 623f832bfd
commit e01c2bc651
23 changed files with 358 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/src/org/jetbrains/kotlin/build/report/ICReporter.kt
+14 -4
View File
@@ -9,8 +9,19 @@ import org.jetbrains.kotlin.cli.common.ExitCode
import java.io.File
interface ICReporter {
fun report(message: () -> String)
fun reportVerbose(message: () -> String)
enum class ReportSeverity(val level: Int) {
WARNING(3),
INFO(2),
DEBUG(1);
}
fun report(message: () -> String, severity: ReportSeverity)
// TODO: Move these 3 functions outside of this interface and make them extension functions so they can't be overridden
fun warn(message: () -> String) = report(message, severity = ReportSeverity.WARNING)
fun report(message: () -> String) = report(message, severity = ReportSeverity.INFO)
fun reportVerbose(message: () -> String) = report(message, severity = ReportSeverity.DEBUG)
fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection<File>, exitCode: ExitCode)
fun reportMarkDirtyClass(affectedFiles: Iterable<File>, classFqName: String)
@@ -19,8 +30,7 @@ interface ICReporter {
}
object DoNothingICReporter : ICReporter {
override fun report(message: () -> String) {}
override fun reportVerbose(message: () -> String) {}
override fun report(message: () -> String, severity: ICReporter.ReportSeverity) {}
override fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection<File>, exitCode: ExitCode) {}
override fun reportMarkDirtyClass(affectedFiles: Iterable<File>, classFqName: String) {}
override fun reportMarkDirtyMember(affectedFiles: Iterable<File>, scope: String, name: String) {}
compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/BasicCompilerServicesWithResultsFacadeServer.kt
+1 -2
View File
@@ -63,7 +63,6 @@ fun MessageCollector.reportFromDaemon(outputsCollector: ((File, List<File>) -> U
ReportSeverity.WARNING -> CompilerMessageSeverity.WARNING
ReportSeverity.INFO -> CompilerMessageSeverity.INFO
ReportSeverity.DEBUG -> CompilerMessageSeverity.LOGGING
else -> throw IllegalStateException("Unexpected compiler message report severity $severity")
}
if (message != null) {
report(compilerSeverity, message, attachment as? CompilerMessageSourceLocation)
@@ -92,7 +91,7 @@ private fun MessageCollector.reportUnexpected(category: Int, severity: Int, mess
ReportSeverity.ERROR -> CompilerMessageSeverity.ERROR
ReportSeverity.WARNING -> CompilerMessageSeverity.WARNING
ReportSeverity.INFO -> CompilerMessageSeverity.INFO
else -> CompilerMessageSeverity.LOGGING
ReportSeverity.DEBUG -> CompilerMessageSeverity.LOGGING
}
report(compilerMessageSeverity, "Unexpected message: category=$category; severity=$severity; message='$message'; attachment=$attachment")
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerServicesFacadeBase.kt
+3 -2
View File
@@ -48,8 +48,9 @@ enum class ReportSeverity(val code: Int) {
DEBUG(3);
companion object {
fun fromCode(code: Int): ReportSeverity? =
ReportSeverity.values().firstOrNull { it.code == code }
fun fromCode(code: Int): ReportSeverity {
return values().firstOrNull { it.code == code } ?: error("Can't find a matching ReportSeverity with code = $code")
}
}
}
compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/report/BuildReportICReporterTest.kt
+51
View File
@@ -0,0 +1,51 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.daemon.report
import org.jetbrains.kotlin.build.report.debug
import org.jetbrains.kotlin.build.report.info
import org.jetbrains.kotlin.build.report.warn
import org.jetbrains.kotlin.daemon.testfixtures.FakeCompilationResults
import org.junit.Test
import java.io.File
import kotlin.test.assertEquals
class BuildReportICReporterTest {
@Test
fun testVerboseMode() {
val compilationResults = FakeCompilationResults()
val reporter = BuildReportICReporter(compilationResults, File("unusedRootDir"), isVerbose = true)
reporter.warn { WARNING_MESSAGE }
reporter.info { INFO_MESSAGE }
reporter.debug { DEBUG_MESSAGE }
reporter.flush()
assertEquals(
expected = listOf(WARNING_MESSAGE, INFO_MESSAGE, DEBUG_MESSAGE),
actual = compilationResults.results.single() as List<*>
)
}
@Test
fun testNonVerboseMode() {
val compilationResults = FakeCompilationResults()
val reporter = BuildReportICReporter(compilationResults, File("unusedRootDir"), isVerbose = false)
reporter.warn { WARNING_MESSAGE }
reporter.info { INFO_MESSAGE }
reporter.debug { DEBUG_MESSAGE }
reporter.flush()
assertEquals(
expected = listOf(WARNING_MESSAGE, INFO_MESSAGE),
actual = compilationResults.results.single() as List<*>
)
}
}
internal const val WARNING_MESSAGE = "Warning message"
internal const val INFO_MESSAGE = "Info message"
internal const val DEBUG_MESSAGE = "Debug message"
compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/report/DebugMessagesICReporterTest.kt
+71
View File
@@ -0,0 +1,71 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.daemon.report
import org.jetbrains.kotlin.build.report.ICReporter
import org.jetbrains.kotlin.build.report.debug
import org.jetbrains.kotlin.build.report.info
import org.jetbrains.kotlin.build.report.warn
import org.jetbrains.kotlin.daemon.common.ReportCategory
import org.jetbrains.kotlin.daemon.common.ReportSeverity
import org.jetbrains.kotlin.daemon.testfixtures.FakeCompilerServicesFacadeBase
import org.junit.Test
import java.io.File
import kotlin.test.assertEquals
class DebugMessagesICReporterTest {
@Test
fun testWarningLevel() {
val compilerServices = FakeCompilerServicesFacadeBase()
val reporter = DebugMessagesICReporter(compilerServices, File("unusedRootDir"), ICReporter.ReportSeverity.WARNING)
reporter.warn { WARNING_MESSAGE }
reporter.info { INFO_MESSAGE }
reporter.debug { DEBUG_MESSAGE }
assertEquals(
expected = mapOf(
WARNING_MESSAGE to Pair(ReportCategory.IC_MESSAGE, ReportSeverity.WARNING),
),
actual = compilerServices.messages
)
}
@Test
fun testInfoLevel() {
val compilerServices = FakeCompilerServicesFacadeBase()
val reporter = DebugMessagesICReporter(compilerServices, File("unusedRootDir"), ICReporter.ReportSeverity.INFO)
reporter.warn { WARNING_MESSAGE }
reporter.info { INFO_MESSAGE }
reporter.debug { DEBUG_MESSAGE }
assertEquals(
expected = mapOf(
WARNING_MESSAGE to Pair(ReportCategory.IC_MESSAGE, ReportSeverity.WARNING),
INFO_MESSAGE to Pair(ReportCategory.IC_MESSAGE, ReportSeverity.INFO),
),
actual = compilerServices.messages
)
}
@Test
fun testDebugLevel() {
val compilerServices = FakeCompilerServicesFacadeBase()
val reporter = DebugMessagesICReporter(compilerServices, File("unusedRootDir"), ICReporter.ReportSeverity.DEBUG)
reporter.warn { WARNING_MESSAGE }
reporter.info { INFO_MESSAGE }
reporter.debug { DEBUG_MESSAGE }
assertEquals(
mapOf(
WARNING_MESSAGE to Pair(ReportCategory.IC_MESSAGE, ReportSeverity.WARNING),
INFO_MESSAGE to Pair(ReportCategory.IC_MESSAGE, ReportSeverity.INFO),
DEBUG_MESSAGE to Pair(ReportCategory.IC_MESSAGE, ReportSeverity.DEBUG)
),
actual = compilerServices.messages
)
}
}
compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/testfixtures/FakeCompilationResults.kt
+21
View File
@@ -0,0 +1,21 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.daemon.testfixtures
import org.jetbrains.kotlin.daemon.common.CompilationResults
import java.io.Serializable
class FakeCompilationResults : CompilationResults {
val results: List<Serializable>
get() = resultList.toList()
private val resultList = mutableListOf<Serializable>()
override fun add(compilationResultCategory: Int, value: Serializable) {
resultList.add(value)
}
}
compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/testfixtures/FakeCompilerServicesFacadeBase.kt
+23
View File
@@ -0,0 +1,23 @@
/*
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.daemon.testfixtures
import org.jetbrains.kotlin.daemon.common.CompilerServicesFacadeBase
import org.jetbrains.kotlin.daemon.common.ReportCategory
import org.jetbrains.kotlin.daemon.common.ReportSeverity
import java.io.Serializable
class FakeCompilerServicesFacadeBase : CompilerServicesFacadeBase {
val messages: Map<String, Pair<ReportCategory, ReportSeverity>>
get() = messageMap.toMap()
private val messageMap = mutableMapOf<String, Pair<ReportCategory, ReportSeverity>>()
override fun report(category: Int, severity: Int, message: String?, attachment: Serializable?) {
messageMap[message!!] = ReportCategory.fromCode(category)!! to ReportSeverity.fromCode(severity)
}
}
compiler/daemon/src/org/jetbrains/kotlin/daemon/report/BuildReportICReporter.kt
+10 -11
View File
@@ -5,16 +5,19 @@
package org.jetbrains.kotlin.daemon.report
import com.google.common.annotations.VisibleForTesting
import org.jetbrains.kotlin.build.report.ICReporter.ReportSeverity
import org.jetbrains.kotlin.build.report.ICReporter.ReportSeverity.DEBUG
import org.jetbrains.kotlin.build.report.ICReporterBase
import org.jetbrains.kotlin.build.report.RemoteICReporter
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.daemon.common.CompilationResultCategory
import org.jetbrains.kotlin.daemon.common.CompilationResults
import org.jetbrains.kotlin.build.report.ICReporterBase
import org.jetbrains.kotlin.build.report.RemoteICReporter
import java.io.File
import java.util.*
// todo: sync BuildReportICReporterAsync
internal class BuildReportICReporter(
@VisibleForTesting
class BuildReportICReporter(
private val compilationResults: CompilationResults,
rootDir: File,
private val isVerbose: Boolean = false
@@ -22,14 +25,10 @@ internal class BuildReportICReporter(
private val icLogLines = arrayListOf<String>()
private val recompilationReason = HashMap<File, String>()
override fun report(message: () -> String) {
icLogLines.add(message())
}
override fun report(message: () -> String, severity: ReportSeverity) {
if (severity == DEBUG && !isVerbose) return
override fun reportVerbose(message: () -> String) {
if (isVerbose) {
report(message)
}
icLogLines.add(message())
}
override fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection<File>, exitCode: ExitCode) {
compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompileIterationICReporter.kt
+4 -6
View File
@@ -5,12 +5,13 @@
package org.jetbrains.kotlin.daemon.report
import org.jetbrains.kotlin.build.report.ICReporter.ReportSeverity
import org.jetbrains.kotlin.build.report.ICReporterBase
import org.jetbrains.kotlin.build.report.RemoteICReporter
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.daemon.common.CompilationResultCategory
import org.jetbrains.kotlin.daemon.common.CompilationResults
import org.jetbrains.kotlin.daemon.common.CompileIterationResult
import org.jetbrains.kotlin.build.report.ICReporterBase
import org.jetbrains.kotlin.build.report.RemoteICReporter
import java.io.File
internal class CompileIterationICReporter(
@@ -23,10 +24,7 @@ internal class CompileIterationICReporter(
)
}
override fun report(message: () -> String) {
}
override fun reportVerbose(message: () -> String) {
override fun report(message: () -> String, severity: ReportSeverity) {
}
override fun flush() {
compiler/daemon/src/org/jetbrains/kotlin/daemon/report/CompositeICReporter.kt
+3 -6
View File
@@ -5,17 +5,14 @@
package org.jetbrains.kotlin.daemon.report
import org.jetbrains.kotlin.build.report.ICReporter.ReportSeverity
import org.jetbrains.kotlin.build.report.RemoteICReporter
import org.jetbrains.kotlin.cli.common.ExitCode
import java.io.File
internal class CompositeICReporter(private val reporters: Iterable<RemoteICReporter>) : RemoteICReporter {
override fun report(message: () -> String) {
reporters.forEach { it.report(message) }
}
override fun reportVerbose(message: () -> String) {
reporters.forEach { it.reportVerbose(message) }
override fun report(message: () -> String, severity: ReportSeverity) {
reporters.forEach { it.report(message, severity) }
}
override fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection<File>, exitCode: ExitCode) {
compiler/daemon/src/org/jetbrains/kotlin/daemon/report/DaemonMessageReporter.kt
+1 -1
View File
@@ -28,7 +28,7 @@ fun DaemonMessageReporter(
compilationOptions: CompilationOptions
): DaemonMessageReporter =
if (ReportCategory.DAEMON_MESSAGE.code in compilationOptions.reportCategories) {
val mySeverity = ReportSeverity.fromCode(compilationOptions.reportSeverity)!!
val mySeverity = ReportSeverity.fromCode(compilationOptions.reportSeverity)
DaemonMessageReporterImpl(servicesFacade, mySeverity)
}
else {
compiler/daemon/src/org/jetbrains/kotlin/daemon/report/DebugMessagesICReporter.kt
+23 -15
View File
@@ -5,28 +5,28 @@
package org.jetbrains.kotlin.daemon.report
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.daemon.common.*
import com.google.common.annotations.VisibleForTesting
import org.jetbrains.kotlin.build.report.ICReporter
import org.jetbrains.kotlin.build.report.ICReporterBase
import org.jetbrains.kotlin.build.report.RemoteICReporter
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.daemon.common.CompilerServicesFacadeBase
import org.jetbrains.kotlin.daemon.common.ReportCategory
import org.jetbrains.kotlin.daemon.common.ReportSeverity
import org.jetbrains.kotlin.daemon.common.report
import java.io.File
internal class DebugMessagesICReporter(
@VisibleForTesting
class DebugMessagesICReporter(
private val servicesFacade: CompilerServicesFacadeBase,
rootDir: File,
private val isVerbose: Boolean
private val reportSeverity: ICReporter.ReportSeverity
) : ICReporterBase(rootDir), RemoteICReporter {
override fun report(message: () -> String) {
servicesFacade.report(
ReportCategory.IC_MESSAGE,
ReportSeverity.DEBUG, message()
)
}
override fun reportVerbose(message: () -> String) {
if (isVerbose) {
report(message)
}
override fun report(message: () -> String, severity: ICReporter.ReportSeverity) {
if (severity.level < reportSeverity.level) return
servicesFacade.report(ReportCategory.IC_MESSAGE, severity.getSeverity(), message())
}
override fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection<File>, exitCode: ExitCode) {
@@ -34,4 +34,12 @@ internal class DebugMessagesICReporter(
override fun flush() {
}
}
}
internal fun ICReporter.ReportSeverity.getSeverity(): ReportSeverity {
return when (this) {
ICReporter.ReportSeverity.WARNING -> ReportSeverity.WARNING
ICReporter.ReportSeverity.INFO -> ReportSeverity.INFO
ICReporter.ReportSeverity.DEBUG -> ReportSeverity.DEBUG
}
}
compiler/daemon/src/org/jetbrains/kotlin/daemon/report/experimental/DaemonMessageReporterAsync.kt
+1 -1
View File
@@ -18,7 +18,7 @@ internal fun DaemonMessageReporterAsync(
compilationOptions: CompilationOptions
): DaemonMessageReporter =
if (ReportCategory.DAEMON_MESSAGE.code in compilationOptions.reportCategories) {
val mySeverity = ReportSeverity.fromCode(compilationOptions.reportSeverity)!!
val mySeverity = ReportSeverity.fromCode(compilationOptions.reportSeverity)
DaemonMessageReporterAsyncAsyncImpl(servicesFacade, mySeverity)
} else {
DummyDaemonMessageReporterAsync
compiler/daemon/src/org/jetbrains/kotlin/daemon/report/experimental/RemoteICReporter.kt
+20 -25
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.daemon.report.experimental
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.async
import org.jetbrains.kotlin.build.report.ICReporter
import org.jetbrains.kotlin.build.report.ICReporterBase
import org.jetbrains.kotlin.build.report.RemoteBuildReporter
import org.jetbrains.kotlin.build.report.RemoteICReporter
@@ -16,25 +17,20 @@ import org.jetbrains.kotlin.build.report.metrics.RemoteBuildMetricsReporter
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.daemon.common.*
import org.jetbrains.kotlin.daemon.report.CompositeICReporter
import org.jetbrains.kotlin.daemon.report.getSeverity
import java.io.File
internal class DebugMessagesICReporterAsync(
private val servicesFacade: CompilerServicesFacadeBaseAsync,
rootDir: File,
private val isVerbose: Boolean
private val reportSeverity: ICReporter.ReportSeverity
) : ICReporterBase(rootDir), RemoteICReporter {
override fun report(message: () -> String) {
GlobalScope.async {
servicesFacade.report(
ReportCategory.IC_MESSAGE,
ReportSeverity.DEBUG, message()
)
}
}
override fun reportVerbose(message: () -> String) {
if (isVerbose) {
report(message)
override fun report(message: () -> String, severity: ICReporter.ReportSeverity) {
if (severity.level < reportSeverity.level) return
GlobalScope.async {
servicesFacade.report(ReportCategory.IC_MESSAGE, severity.getSeverity(), message())
}
}
@@ -57,10 +53,7 @@ internal class CompileIterationICReporterAsync(
}
}
override fun report(message: () -> String) {
}
override fun reportVerbose(message: () -> String) {
override fun report(message: () -> String, severity: ICReporter.ReportSeverity) {
}
override fun flush() {
@@ -75,14 +68,10 @@ internal class BuildReportICReporterAsync(
private val icLogLines = arrayListOf<String>()
private val recompilationReason = HashMap<File, String>()
override fun report(message: () -> String) {
icLogLines.add(message())
}
override fun report(message: () -> String, severity: ICReporter.ReportSeverity) {
if (severity == ICReporter.ReportSeverity.DEBUG && !isVerbose) return
override fun reportVerbose(message: () -> String) {
if (isVerbose) {
report(message)
}
icLogLines.add(message())
}
override fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection<File>, exitCode: ExitCode) {
@@ -116,8 +105,14 @@ fun getICReporterAsync(
val reporters = ArrayList<RemoteICReporter>()
if (ReportCategory.IC_MESSAGE.code in compilationOptions.reportCategories) {
val isVerbose = compilationOptions.reportSeverity == ReportSeverity.DEBUG.code
reporters.add(DebugMessagesICReporterAsync(servicesFacade, root, isVerbose = isVerbose))
reporters.add(
DebugMessagesICReporterAsync(
servicesFacade = servicesFacade,
rootDir = root,
reportSeverity = ReportSeverity.fromCode(compilationOptions.reportSeverity)
.getSeverity(mapErrorToWarning = true, mapInfoToWarning = true)
)
)
}
val requestedResults = compilationOptions
compiler/daemon/src/org/jetbrains/kotlin/daemon/report/getICReporter.kt
+49 -3
View File
@@ -16,12 +16,12 @@
package org.jetbrains.kotlin.daemon.report
import org.jetbrains.kotlin.build.report.ICReporter
import org.jetbrains.kotlin.build.report.RemoteBuildReporter
import org.jetbrains.kotlin.build.report.RemoteICReporter
import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporterImpl
import org.jetbrains.kotlin.build.report.metrics.DoNothingBuildMetricsReporter
import org.jetbrains.kotlin.daemon.common.*
import java.util.*
fun getBuildReporter(
servicesFacade: CompilerServicesFacadeBase,
@@ -32,8 +32,14 @@ fun getBuildReporter(
val reporters = ArrayList<RemoteICReporter>()
if (ReportCategory.IC_MESSAGE.code in compilationOptions.reportCategories) {
val isVerbose = compilationOptions.reportSeverity == ReportSeverity.DEBUG.code
reporters.add(DebugMessagesICReporter(servicesFacade, root, isVerbose = isVerbose))
reporters.add(
DebugMessagesICReporter(
servicesFacade = servicesFacade,
rootDir = root,
reportSeverity = ReportSeverity.fromCode(compilationOptions.reportSeverity)
.getSeverity(mapErrorToWarning = true, mapInfoToWarning = true)
)
)
}
val requestedResults = compilationOptions
@@ -63,3 +69,43 @@ fun getBuildReporter(
return RemoteBuildReporter(CompositeICReporter(reporters), metricsReporter)
}
internal fun ReportSeverity.getSeverity(
/**
* If true, [ReportSeverity.ERROR] will be mapped to [ICReporter.ReportSeverity.WARNING] (i.e., when [ReportSeverity.ERROR] is
* specified, [ICReporter.ReportSeverity.WARNING] messages will also be shown).
*
* NOTE: This parameter exists only because we don't have `ICReporter.ReportSeverity.ERROR` yet. Once that we create that enum, we can
* remove this parameter.
*/
mapErrorToWarning: Boolean,
/**
* If true, [ReportSeverity.INFO] will be mapped to [ICReporter.ReportSeverity.WARNING] (i.e., when [ReportSeverity.INFO] is specified,
* only messages with severity [ICReporter.ReportSeverity.WARNING] and above will be shown).
*
* NOTE: This parameter exists only to preserve the previous behavior (`mapInfoToWarning = true`). If `mapInfoToWarning` is never set
* to `true`, we can remove this parameter.
*/
mapInfoToWarning: Boolean
): ICReporter.ReportSeverity {
return when (this) {
ReportSeverity.ERROR -> if (mapErrorToWarning) {
ICReporter.ReportSeverity.WARNING
} else {
throw IllegalArgumentException(
"No mapping exists for `ReportSeverity.ERROR`." +
" Add `ICReporter.ReportSeverity.ERROR` and remove mapErrorToWarning, or set mapErrorToWarning = true."
)
}
ReportSeverity.WARNING -> ICReporter.ReportSeverity.WARNING
ReportSeverity.INFO -> if (mapInfoToWarning) {
ICReporter.ReportSeverity.WARNING
} else {
ICReporter.ReportSeverity.INFO
}
ReportSeverity.DEBUG -> ICReporter.ReportSeverity.DEBUG
}
}
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalCompilerRunner.kt
+7 -4
View File
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.incremental.parsing.classesFqNames
import org.jetbrains.kotlin.incremental.util.BufferingMessageCollector
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.progress.CompilationCanceledStatus
import org.jetbrains.kotlin.util.suffixIfNot
import java.io.File
abstract class IncrementalCompilerRunner<
@@ -179,8 +180,9 @@ abstract class IncrementalCompilerRunner<
}
return exitCode
} catch (e: Throwable) {
reporter.report {
"Incremental compilation failed: ${e.stackTraceToString()}.\nFalling back to non-incremental compilation."
reporter.warn {
"Incremental compilation failed: ${e.stackTraceToString().suffixIfNot("\n")}" +
"Falling back to non-incremental compilation"
}
rebuildReason = BuildAttribute.INCREMENTAL_COMPILATION_FAILED
}
@@ -188,8 +190,9 @@ abstract class IncrementalCompilerRunner<
is CompilationMode.Rebuild -> rebuildReason = compilationMode.reason
}
} catch (e: Exception) {
reporter.report {
"Incremental compilation analysis failed: ${e.stackTraceToString()}.\nFalling back to non-incremental compilation."
reporter.warn {
"Incremental compilation analysis failed: ${e.stackTraceToString().suffixIfNot("\n")}" +
"Falling back to non-incremental compilation"
}
} finally {
if (!caches.close(flush = true)) {
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/classpathDiff/ClasspathSnapshotBuildReporter.kt
+2 -2
View File
@@ -12,8 +12,8 @@ import org.jetbrains.kotlin.build.report.metrics.BuildMetricsReporter
class ClasspathSnapshotBuildReporter(private val buildReporter: BuildReporter) :
ICReporter by buildReporter, BuildMetricsReporter by buildReporter {
override fun reportVerbose(message: () -> String) {
buildReporter.reportVerbose { "[ClasspathSnapshot] ${message()}" }
override fun report(message: () -> String, severity: ICReporter.ReportSeverity) {
buildReporter.report({ "[ClasspathSnapshot] ${message()}" }, severity)
}
fun reportVerboseWithLimit(maxLength: Int = 1000, message: () -> String) {
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/utils/TestICReporter.kt
+2 -4
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.incremental.utils
import org.jetbrains.kotlin.build.report.ICReporter.ReportSeverity
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.build.report.ICReporterBase
import java.io.File
@@ -29,10 +30,7 @@ class TestICReporter : ICReporterBase() {
var exitCode: ExitCode = ExitCode.OK
private set
override fun report(message: () -> String) {
}
override fun reportVerbose(message: () -> String) {
override fun report(message: () -> String, severity: ReportSeverity) {
}
override fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection<File>, exitCode: ExitCode) {
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+9 -10
View File
@@ -20,9 +20,12 @@ import org.jetbrains.jps.incremental.java.JavaBuilder
import org.jetbrains.jps.model.JpsProject
import org.jetbrains.kotlin.build.GeneratedFile
import org.jetbrains.kotlin.build.GeneratedJvmClass
import org.jetbrains.kotlin.build.report.ICReporter.ReportSeverity
import org.jetbrains.kotlin.build.report.ICReporterBase
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.*
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.INFO
import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil
import org.jetbrains.kotlin.compilerRunner.*
import org.jetbrains.kotlin.config.IncrementalCompilation
@@ -30,12 +33,11 @@ import org.jetbrains.kotlin.config.KotlinModuleKind
import org.jetbrains.kotlin.config.Services
import org.jetbrains.kotlin.daemon.common.isDaemonEnabled
import org.jetbrains.kotlin.incremental.*
import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.build.report.ICReporterBase
import org.jetbrains.kotlin.incremental.components.EnumWhenTracker
import org.jetbrains.kotlin.jps.KotlinJpsBundle
import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
import org.jetbrains.kotlin.incremental.components.InlineConstTracker
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.jps.KotlinJpsBundle
import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache
import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageManager
import org.jetbrains.kotlin.jps.model.kotlinKind
@@ -731,15 +733,12 @@ private class JpsICReporter : ICReporterBase() {
override fun reportCompileIteration(incremental: Boolean, sourceFiles: Collection<File>, exitCode: ExitCode) {
}
override fun report(message: () -> String) {
override fun report(message: () -> String, severity: ReportSeverity) {
// Currently, all severity levels are mapped to debug
if (KotlinBuilder.LOG.isDebugEnabled) {
KotlinBuilder.LOG.debug(message())
}
}
override fun reportVerbose(message: () -> String) {
report(message)
}
}
private fun ChangesCollector.processChangesUsingLookups(
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleIncrementalCompilerServicesFacadeImpl.kt
+9 -3
View File
@@ -7,8 +7,8 @@ package org.jetbrains.kotlin.compilerRunner
import org.jetbrains.kotlin.daemon.client.reportFromDaemon
import org.jetbrains.kotlin.daemon.common.*
import org.jetbrains.kotlin.gradle.logging.GradleBufferingMessageCollector
import org.jetbrains.kotlin.gradle.logging.kotlinDebug
import org.jetbrains.kotlin.daemon.common.ReportSeverity.*
import org.jetbrains.kotlin.gradle.logging.*
import java.io.Serializable
import java.rmi.Remote
import java.rmi.server.UnicastRemoteObject
@@ -27,7 +27,13 @@ internal open class GradleCompilerServicesFacadeImpl(
override fun report(category: Int, severity: Int, message: String?, attachment: Serializable?) {
when (ReportCategory.fromCode(category)) {
ReportCategory.IC_MESSAGE -> {
log.kotlinDebug { "[IC] $message" }
@Suppress("UNUSED_VARIABLE")
val unusedValueForExhaustiveWhen = when (ReportSeverity.fromCode(severity)) {
ERROR -> log.kotlinError { "[IC] $message" }
WARNING -> log.kotlinWarn { "[IC] $message" }
INFO -> log.kotlinInfo { "[IC] $message" }
DEBUG -> log.kotlinDebug { "[IC] $message" }
}
}
ReportCategory.DAEMON_MESSAGE -> {
log.kotlinDebug { "[DAEMON] $message" }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerWork.kt
+1 -3
View File
@@ -7,10 +7,8 @@ package org.jetbrains.kotlin.compilerRunner
import org.gradle.api.logging.Logger
import org.jetbrains.kotlin.build.report.metrics.*
import org.jetbrains.kotlin.cli.common.CompilerSystemProperties
import org.jetbrains.kotlin.cli.common.ExitCode
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.cli.common.toBooleanLenient
import org.jetbrains.kotlin.config.Services
import org.jetbrains.kotlin.daemon.common.*
import org.jetbrains.kotlin.gradle.logging.*
@@ -385,7 +383,7 @@ internal class GradleKotlinCompilerWork @Inject constructor(
private fun reportCategories(verbose: Boolean): Array<Int> =
if (!verbose) {
arrayOf(ReportCategory.COMPILER_MESSAGE.code)
arrayOf(ReportCategory.COMPILER_MESSAGE.code, ReportCategory.IC_MESSAGE.code)
} else {
ReportCategory.values().map { it.code }.toTypedArray()
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/logging/gradleLoggingUtils.kt
+14 -4
View File
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.gradle.logging
import org.gradle.api.Task
import org.gradle.api.logging.Logger
import org.jetbrains.kotlin.compilerRunner.KotlinLogger
@@ -27,10 +26,21 @@ internal inline fun Logger.kotlinDebug(message: () -> String) {
}
}
internal inline fun KotlinLogger.kotlinDebug(fn: () -> String) {
internal inline fun KotlinLogger.kotlinError(message: () -> String) {
error("[KOTLIN] ${message()}")
}
internal inline fun KotlinLogger.kotlinWarn(message: () -> String) {
warn("[KOTLIN] ${message()}")
}
internal inline fun KotlinLogger.kotlinInfo(message: () -> String) {
info("[KOTLIN] ${message()}")
}
internal inline fun KotlinLogger.kotlinDebug(message: () -> String) {
if (isDebugEnabled) {
val msg = fn()
debug("[KOTLIN] $msg")
debug("[KOTLIN] ${message()}")
}
}
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/incremental/MavenICReporter.java
+19 -12
View File
@@ -20,6 +20,8 @@ import kotlin.jvm.functions.Function0;
import org.apache.maven.plugin.logging.Log;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.cli.common.ExitCode;
import org.jetbrains.kotlin.build.report.ICReporter;
import org.jetbrains.kotlin.build.report.ICReporterKt;
import org.jetbrains.kotlin.build.report.ICReporterBase;
import java.io.File;
@@ -69,26 +71,31 @@ public class MavenICReporter extends ICReporterBase {
}
@Override
public void report(@NotNull Function0<String> getMessage) {
public void report(@NotNull Function0<String> getMessage, @NotNull ICReporter.ReportSeverity severity) {
switch (logLevel) {
case NONE:
break;
case INFO:
log.info(getMessage.invoke());
if (severity == ICReporter.ReportSeverity.WARNING) {
log.warn(getMessage.invoke());
} else if (severity == ICReporter.ReportSeverity.INFO) {
log.info(getMessage.invoke());
} else if (severity == ICReporter.ReportSeverity.DEBUG) {
// Don't log
} else throw new IllegalArgumentException(severity.toString() + " is not yet handled");
break;
case DEBUG:
log.debug(getMessage.invoke());
if (severity == ICReporter.ReportSeverity.WARNING) {
log.warn(getMessage.invoke());
} else if (severity == ICReporter.ReportSeverity.INFO) {
log.info(getMessage.invoke());
} else if (severity == ICReporter.ReportSeverity.DEBUG) {
log.debug(getMessage.invoke());
} else throw new IllegalArgumentException(severity.toString() + " is not yet handled");
break;
}
}
@Override
public void reportVerbose(@NotNull Function0<String> getMessage) {
if (logLevel == LogLevel.DEBUG) {
log.debug(getMessage.invoke());
}
}
@NotNull
public Set<File> getCompiledKotlinFiles() {
return compiledKotlinFiles;
@@ -97,7 +104,7 @@ public class MavenICReporter extends ICReporterBase {
@Override
public void reportCompileIteration(boolean b, @NotNull Collection<? extends File> sourceFiles, @NotNull ExitCode exitCode) {
compiledKotlinFiles.addAll(sourceFiles);
report(() -> "Kotlin compile iteration: " + pathsAsString(sourceFiles));
report(() -> "Exit code: " + exitCode.toString());
ICReporterKt.info(this, () -> "Kotlin compile iteration: " + pathsAsString(sourceFiles));
ICReporterKt.info(this, () -> "Exit code: " + exitCode.toString());
}
}