Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Translate unknown exceptions to UNKNOWN Status #461

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −7
Open

Translate unknown exceptions to UNKNOWN Status #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion stub/src/main/java/io/grpc/kotlin/ServerCalls.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,9 @@ object ServerCalls {
null -> Status.OK
is CancellationException -> Status.CANCELLED.withCause(failure)
is StatusException, is StatusRuntimeException -> Status.fromThrowable(failure)
else -> Status.fromThrowable(failure).withCause(failure)
else -> Status.UNKNOWN
.withDescription("Unknown Exception")
.withCause(failure)
}
val trailers = failure?.let { Status.trailersFromThrowable(it) } ?: GrpcMetadata()
mutex.withLock { call.close(closeStatus, trailers) }
Expand Down
14 changes: 8 additions & 6 deletions stub/src/test/java/io/grpc/kotlin/ServerCallsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,7 +1184,7 @@ class ServerCallsTest : AbstractCallsTest() {
}
}

val receivedStatusCause = CompletableDeferred<Throwable?>()
val receivedStatus = CompletableDeferred<Status?>()

val interceptor = object : ServerInterceptor {
override fun <ReqT, RespT> interceptCall(
Expand All @@ -1195,7 +1195,7 @@ class ServerCallsTest : AbstractCallsTest() {
next.startCall(
object : ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT>(call) {
override fun close(status: Status, trailers: Metadata) {
receivedStatusCause.complete(status.cause)
receivedStatus.complete(status)
super.close(status, trailers)
}
},
Expand All @@ -1213,11 +1213,13 @@ class ServerCallsTest : AbstractCallsTest() {
// the exception should not propagate to the client
assertThat(clientException.cause).isNull()

assertThat(clientException.status.code).isEqualTo(Status.Code.INTERNAL)
val statusCause = receivedStatusCause.await()
assertThat(clientException.status.code).isEqualTo(Status.Code.UNKNOWN)
val status = receivedStatus.await()!!
// but the exception should propagate to server interceptors, with stack trace intact
assertThat(statusCause).isEqualTo(thrownStatusCause.await())
assertThat(statusCause!!.stackTraceToString()).contains("internalServerCall")
assertThat(status.code).isEqualTo(Status.UNKNOWN.code)
assertThat(status.description).isEqualTo("Unknown Exception")
assertThat(status.cause).isEqualTo(thrownStatusCause.await())
assertThat(status.cause?.stackTraceToString()).contains("internalServerCall")
}

}
Loading