StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

end spans on cancel

Browse Source
This commit is contained in:
a10zn8
2023-08-21 13:53:11 +04:00
parent 1562cc35c6
commit fd6f617ed2
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/kotlin/io/emeraldpay/dshackle/reader/SpannedReader.kt
View File

@@ -33,16 +33,16 @@ class SpannedReader<K, D>(
return reader.read(key)
.contextWrite { ReactorSleuth.putSpanInScope(tracer, it, newSpan) }
.doOnError {
newSpan.apply {
tag(SPAN_ERROR, "true")
tag(SPAN_STATUS_MESSAGE, it.message)
end()
}
newSpan.tag(SPAN_ERROR, "true")
.tag(SPAN_STATUS_MESSAGE, it.message)
.end()
}
.doOnNext { newSpan.end() }
.doOnCancel {
newSpan.tag(SPAN_STATUS_MESSAGE, "cancelled").end()
}
.switchIfEmpty {
newSpan.tag(SPAN_READER_RESULT, "empty result")
newSpan.end()
newSpan.tag(SPAN_READER_RESULT, "empty result").end()
Mono.empty()
}
}

3
src/main/kotlin/io/emeraldpay/dshackle/rpc/NativeCall.kt
View File

@@ -124,6 +124,9 @@ open class NativeCall(
)
}
.doOnNext { callRes -> completeSpan(callRes, requestCount) }
.doOnCancel {
tracer.currentSpan()?.tag(SPAN_STATUS_MESSAGE, "cancel")?.end()
}
.contextWrite { ctx -> createTracingReactorContext(ctx, requestCount, requestId, requestSpan) }
}
}