MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-14 18:05:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

TW-89630 workaround: flowId is not set

Browse Source 
GitOrigin-RevId: 73ad90ca0287ba227c78e9dd36f7fdcbee18e0bb
This commit is contained in:
Dmitriy.Panov
2024-09-11 22:36:52 +02:00
committed by intellij-monorepo-bot
parent 3891dfa89c
commit 19f7d72de3
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
build/tasks/src/org/jetbrains/intellij/build/logging/TeamCityBuildMessageLogger.kt
View File

@@ -30,16 +30,15 @@ class TeamCityBuildMessageLogger : BuildMessageLogger() {
* [ServiceMessage.setFlowId] is called with [io.opentelemetry.api.trace.SpanContext.getSpanId].
*
* See [the docs](https://www.jetbrains.com/help/teamcity/service-messages.html#Message+FlowId).
*
* FIXME [ServiceMessage.setFlowId] is skipped as a workaround for TW-89630
*/
@Suppress("unused")
@ApiStatus.Internal
class SpanAwareServiceMessage : ServiceMessage {
constructor(span: Span, messageName: String, argument: String) : super(messageName, argument) {
setFlowId(span.spanContext.spanId)
}
constructor(span: Span, messageName: String, argument: String) : super(messageName, argument)
constructor(span: Span, messageName: String, attributes: Map<String, String>) : super(messageName, attributes) {
setFlowId(span.spanContext.spanId)
}
constructor(span: Span, messageName: String, attributes: Map<String, String>) : super(messageName, attributes)
}
/**

3
platform/build-scripts/src/org/jetbrains/intellij/build/impl/logging/jps/JpsLoggerFactory.kt
View File

@@ -13,7 +13,6 @@ import org.jetbrains.annotations.ApiStatus.Internal
import org.jetbrains.annotations.Nls
import org.jetbrains.annotations.VisibleForTesting
import org.jetbrains.intellij.build.CompilationContext
import org.jetbrains.intellij.build.logging.TeamCityBuildMessageLogger
import org.jetbrains.jps.builders.BuildTarget
import org.jetbrains.jps.incremental.MessageHandler
import org.jetbrains.jps.incremental.messages.*
@@ -87,7 +86,7 @@ internal class JpsMessageHandler(private val context: CompilationContext, privat
private val compilationFinishTimeForTarget = ConcurrentHashMap<String, Long>()
private var progress = -1.0f
override fun processMessage(message: BuildMessage): Unit = TeamCityBuildMessageLogger.withFlow(span) {
override fun processMessage(message: BuildMessage) {
val text = message.messageText
when (message.kind) {
BuildMessage.Kind.ERROR, BuildMessage.Kind.INTERNAL_BUILDER_ERROR -> {