prettify xtest grpc stream msgs

Author: asmyasnikov

internal/xtest/grpclogger.go

@@ -35,13 +35,11 @@ func (l GrpcLogger) UnaryClientInterceptor(
 	opts ...grpc.CallOption,
 ) error {
 	err := invoker(ctx, method, req, reply, cc, opts...)
-	l.t.Logf(
-		"UnaryClientInterceptor: %s - err: %v\n\nreq:\n%v\n\nresp:\n%v",
-		method,
-		err,
-		req,
-		reply,
-	)
+	if err != nil {
+		l.t.Logf("UnaryClientInterceptor: %s - err: %v\n\nreq:\n%v\n\nresp:\n%v", method, err, req, reply)
+	} else {
+		l.t.Logf("UnaryClientInterceptor: %s:\n\nreq:\n%v\n\nresp:\n%v", method, req, reply)
+	}
 
 	return err
 }
@@ -59,12 +57,11 @@ func (l GrpcLogger) StreamClientInterceptor(
 	if stream != nil {
 		stream = streamWrapper
 	}
-	l.t.Logf(
-		"StreamStart: %v with err '%v' (streamID: %v)",
-		method,
-		err,
-		streamWrapper.streamID,
-	)
+	if err != nil {
+		l.t.Logf("StreamStart: %v with err '%v' (streamID: %v)", method, err, streamWrapper.streamID)
+	} else {
+		l.t.Logf("StreamStart: %v (streamID: %v)", method, streamWrapper.streamID)
+	}
 
 	return stream, err
 }
@@ -81,21 +78,33 @@ func newGrpcLoggerStream(stream grpc.ClientStream, t testing.TB) grpcLoggerStrea
 
 func (g grpcLoggerStream) CloseSend() error {
 	err := g.ClientStream.CloseSend()
-	g.t.Logf("CloseSend: %v (streamID: %v)", err, g.streamID)
+	if err != nil {
+		g.t.Logf("CloseSend: %v (streamID: %v)", err, g.streamID)
+	} else {
+		g.t.Logf("CloseSend (streamID: %v)", g.streamID)
+	}
 
 	return err
 }
 
 func (g grpcLoggerStream) SendMsg(m interface{}) error {
 	err := g.ClientStream.SendMsg(m)
-	g.t.Logf("SendMsg (streamID: %v) with err '%v':\n%v ", g.streamID, err, m)
+	if err != nil {
+		g.t.Logf("SendMsg (streamID: %v) with err '%v':\n%v ", g.streamID, err, m)
+	} else {
+		g.t.Logf("SendMsg (streamID: %v):\n%v ", g.streamID, m)
+	}
 
 	return err
 }
 
 func (g grpcLoggerStream) RecvMsg(m interface{}) error {
 	err := g.ClientStream.RecvMsg(m)
-	g.t.Logf("RecvMsg (streamID: %v) with err '%v':\n%v ", g.streamID, err, m)
+	if err != nil {
+		g.t.Logf("RecvMsg (streamID: %v) with err '%v':\n%v ", g.streamID, err, m)
+	} else {
+		g.t.Logf("RecvMsg (streamID: %v):\n%v ", g.streamID, m)
+	}
 
 	return err
 }