Spring/spring-grpc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix status trailers in exception handler

Browse Source
This commit is contained in:
Dave Syer
2025-06-12 13:53:41 +01:00
parent 2dd4b9e2e4
commit ced5936c02
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/grpc-server/src/main/java/org/springframework/grpc/sample/GrpcServerApplication.java
View File

@@ -5,7 +5,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.grpc.server.exception.GrpcExceptionHandler;
import io.grpc.Metadata;
import io.grpc.Status;
import io.grpc.StatusException;
@SpringBootApplication
public class GrpcServerApplication {
@@ -18,7 +20,11 @@ public class GrpcServerApplication {
public GrpcExceptionHandler globalInterceptor() {
return exception -> {
if (exception instanceof IllegalArgumentException) {
return Status.INVALID_ARGUMENT.withDescription(exception.getMessage()).asException();
Metadata metadata = new Metadata();
metadata.put(Metadata.Key.of("error-code", Metadata.ASCII_STRING_MARSHALLER), "INVALID_ARGUMENT");
StatusException result = Status.INVALID_ARGUMENT.withDescription(exception.getMessage())
.asException(metadata);
return result;
}
return null;
};

14
samples/grpc-server/src/test/java/org/springframework/grpc/sample/GrpcServerIntegrationTests.java
View File

@@ -44,6 +44,7 @@ import org.springframework.test.context.ActiveProfiles;
import io.grpc.ForwardingServerCallListener;
import io.grpc.ManagedChannel;
import io.grpc.Metadata;
import io.grpc.ServerCall.Listener;
import io.grpc.ServerInterceptor;
import io.grpc.Status.Code;
@@ -77,18 +78,19 @@ class GrpcServerIntegrationTests {
void specificErrorResponse(@Autowired GrpcChannelFactory channels) {
SimpleGrpc.SimpleBlockingStub client = SimpleGrpc.newBlockingStub(channels.createChannel("0.0.0.0:0"));
assertThat(assertThrows(StatusRuntimeException.class,
() -> client.sayHello(HelloRequest.newBuilder().setName("error").build()))
() -> client.sayHello(HelloRequest.newBuilder().setName("internal").build()))
.getStatus()
.getCode()).isEqualTo(Code.INVALID_ARGUMENT);
.getCode()).isEqualTo(Code.UNKNOWN);
}
@Test
void defaultErrorResponseIsUnknown(@Autowired GrpcChannelFactory channels) {
SimpleGrpc.SimpleBlockingStub client = SimpleGrpc.newBlockingStub(channels.createChannel("0.0.0.0:0"));
assertThat(assertThrows(StatusRuntimeException.class,
() -> client.sayHello(HelloRequest.newBuilder().setName("internal").build()))
.getStatus()
.getCode()).isEqualTo(Code.UNKNOWN);
StatusRuntimeException status = assertThrows(StatusRuntimeException.class,
() -> client.sayHello(HelloRequest.newBuilder().setName("error").build()));
assertThat(status.getStatus().getCode()).isEqualTo(Code.INVALID_ARGUMENT);
assertThat(status.getTrailers().get(Metadata.Key.of("error-code", Metadata.ASCII_STRING_MARSHALLER)))
.isNotNull();
}
}

1
spring-grpc-core/src/main/java/org/springframework/grpc/server/exception/GrpcExceptionHandledServerCall.java
View File

@@ -36,6 +36,7 @@ public class GrpcExceptionHandledServerCall<ReqT, RespT>
if (status.getCode() == Status.Code.UNKNOWN && status.getCause() != null) {
final Throwable cause = status.getCause();
final StatusException statusException = this.exceptionHandler.handleException(cause);
trailers.merge(statusException.getTrailers());
super.close(statusException.getStatus(), trailers);
}
else {

2
spring-grpc-core/src/main/java/org/springframework/grpc/server/exception/GrpcExceptionHandlerInterceptor.java
View File

@@ -147,7 +147,7 @@ public class GrpcExceptionHandlerInterceptor implements ServerInterceptor {
catch (Throwable e) {
}
try {
this.call.close(status.getStatus(), headers(t));
this.call.close(status.getStatus(), headers(status));
}
catch (Throwable e) {
throw new IllegalStateException("Failed to close the call", e);