feat: improve grpc exception descriptions

add stacktrace and exception class to GRPC exception
justenwalker · Apr 24, 2021 · 7c0b5f0 · 7c0b5f0
1 parent ff529ae
commit 7c0b5f0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/main/java/tech/justen/concord/goodwill/service/GrpcDockerService.java b/src/main/java/tech/justen/concord/goodwill/service/GrpcDockerService.java
@@ -34,7 +34,7 @@ public void runContainer(DockerContainerSpec request, StreamObserver<DockerConta
             responseObserver.onCompleted();
         } catch (Exception e) {
             log.error("GrpcService: runContainer error", e);
-            responseObserver.onError(e);
+            responseObserver.onError(GrpcUtils.toStatusException(e));
         }
     }
 }
diff --git a/src/main/java/tech/justen/concord/goodwill/service/GrpcUtils.java b/src/main/java/tech/justen/concord/goodwill/service/GrpcUtils.java
@@ -17,6 +17,9 @@
 import io.grpc.StatusRuntimeException;
 import tech.justen.concord.goodwill.grpc.ContextProto.*;
 
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.*;
 
 @SuppressWarnings("unchecked")
@@ -184,7 +187,7 @@ private static Any getAny(List<Object> value) {
     }
 
     public static StatusRuntimeException toStatusException(Exception ex) {
-        return Status.INTERNAL.withDescription(ex.getMessage()).withCause(ex).asRuntimeException();
+        return Status.INTERNAL.withDescription(exceptionDescription(ex)).withCause(ex).asRuntimeException();
     }
 
     public static StatusRuntimeException toStatusException(ApiException ex, String desc) {
@@ -210,4 +213,16 @@ public static StatusRuntimeException toStatusException(ApiException ex, String d
         }
         return status.withDescription(ex.getMessage()).withCause(ex).asRuntimeException();
     }
+
+    private static String exceptionDescription(Throwable ex) {
+        StringWriter sw = new StringWriter();
+        sw.append(ex.getClass().getName());
+        if (ex.getMessage() != null) {
+            sw.append(": ");
+            sw.append(ex.getMessage());
+            sw.append('\n');
+        }
+        ex.printStackTrace(new PrintWriter(sw));
+        return sw.toString();
+    }
 }