http4s adds description to returned codes, with nice messages and so …

…on (#30)
avast · May 6, 2019 · faaa337 · faaa337
1 parent 574289a
commit faaa337
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/core/src/main/scala/com/avast/grpc/jsonbridge/GrpcJsonBridgeBase.scala b/core/src/main/scala/com/avast/grpc/jsonbridge/GrpcJsonBridgeBase.scala
@@ -25,6 +25,12 @@ abstract class GrpcJsonBridgeBase[F[_], Stub <: io.grpc.stub.AbstractStub[Stub]]
     JsonFormat.printer().includingDefaultValueFields().omittingInsignificantWhitespace()
   }
 
+  private def richStatus(status: Status, description: String, cause: Throwable): Status = {
+    val d = Option(status.getDescription).getOrElse(description)
+    val c = Option(status.getCause).getOrElse(cause)
+    status.withDescription(d).withCause(c)
+  }
+
   // https://groups.google.com/forum/#!topic/grpc-io/1-KMubq1tuc
   protected def withNewClientStub[A](headers: Seq[GrpcHeader])(f: Stub => Future[A])(
       implicit ec: ExecutionContext): F[Either[Status, A]] = {
@@ -42,30 +48,32 @@ abstract class GrpcJsonBridgeBase[F[_], Stub <: io.grpc.stub.AbstractStub[Stub]]
         .map(Right(_): Either[Status, A])
         .recover {
           case NonFatal(ex) =>
-            logger.info("Error while executing the request (recover)", ex)
+            val message = "Error while executing the request (recover)"
+            logger.info(message, ex)
             ex match {
               case e: StatusException if e.getStatus.getCode == Status.Code.UNKNOWN =>
-                Left(Status.INTERNAL.withCause(e.getStatus.getCause))
+                Left(richStatus(Status.INTERNAL, message, e.getStatus.getCause))
               case e: StatusRuntimeException if e.getStatus.getCode == Status.Code.UNKNOWN =>
-                Left(Status.INTERNAL.withCause(e.getStatus.getCause))
+                Left(richStatus(Status.INTERNAL, message, e.getStatus.getCause))
               case e: StatusException =>
-                Left(e.getStatus)
+                Left(richStatus(e.getStatus, message, e.getStatus.getCause))
               case e: StatusRuntimeException =>
-                Left(e.getStatus)
+                Left(richStatus(e.getStatus, message, e.getStatus.getCause))
               case _ =>
-                Left(Status.INTERNAL.withCause(ex))
+                Left(richStatus(Status.INTERNAL, message, ex))
             }
         }
     } catch {
       case NonFatal(ex) =>
-        logger.info("Error while executing the request (catch)", ex)
+        val message = "Error while executing the request (catch)"
+        logger.info(message, ex)
         ex match {
           case e: StatusException if e.getStatus.getCode == Status.Code.UNKNOWN =>
-            F.pure(Left(Status.INTERNAL.withCause(e.getStatus.getCause)))
+            F.pure(Left(richStatus(Status.INTERNAL, message, e.getStatus.getCause)))
           case e: StatusRuntimeException if e.getStatus.getCode == Status.Code.UNKNOWN =>
-            F.pure(Left(Status.INTERNAL.withCause(e.getStatus.getCause)))
+            F.pure(Left(richStatus(Status.INTERNAL, message, e.getStatus.getCause)))
           case _ =>
-            F.pure(Left(Status.INTERNAL.withCause(ex)))
+            F.pure(Left(richStatus(Status.INTERNAL, message, ex)))
         }
     }
 
@@ -81,12 +89,13 @@ abstract class GrpcJsonBridgeBase[F[_], Stub <: io.grpc.stub.AbstractStub[Stub]]
       }
     } catch {
       case NonFatal(ex) =>
-        logger.warn("Error while converting JSON to GPB", ex)
+        val message = "Error while converting JSON to GPB"
+        logger.warn(message, ex)
         ex match {
           case e: StatusRuntimeException =>
-            Left(e.getStatus)
+            Left(richStatus(e.getStatus, message, e.getStatus.getCause))
           case _ =>
-            Left(Status.INVALID_ARGUMENT.withCause(ex))
+            Left(richStatus(Status.INVALID_ARGUMENT, message, ex))
         }
     }
   }

diff --git a/http4s/src/main/scala/com/avast/grpc/jsonbrige/http4s/Http4s.scala b/http4s/src/main/scala/com/avast/grpc/jsonbrige/http4s/Http4s.scala
@@ -97,7 +97,11 @@ object Http4s extends StrictLogging {
   private def mapStatus[F[_]: Sync](s: GrpcStatus, configuration: Configuration)(implicit h: Http4sDsl[F]): F[Response[F]] = {
     import h._
 
-    val description = List(Option(s.getDescription), Option(s.getCause).flatMap(x => Option(x.getMessage))).flatten.mkString(", ")
+    val description = List(
+      Option(s.getDescription),
+      Option(s.getCause).flatMap(e => Option(e.getClass.getCanonicalName)),
+      Option(s.getCause).flatMap(e => Option(e.getMessage))
+    ).flatten.mkString(", ")
 
     s.getCode match {
       case Code.NOT_FOUND => NotFound(description)