Merge pull request #578 from a-simeshin/add-loggin-to-client-log-interceptor

Author: ST-DDT

examples/cloud-grpc-client/src/main/java/net/devh/boot/grpc/examples/cloud/client/LogGrpcInterceptor.java

@@ -24,11 +24,16 @@
 import io.grpc.Channel;
 import io.grpc.ClientCall;
 import io.grpc.ClientInterceptor;
+import io.grpc.ForwardingClientCall;
+import io.grpc.ForwardingClientCallListener;
+import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
+import io.grpc.Status;
 import net.devh.boot.grpc.client.interceptor.GrpcGlobalClientInterceptor;
 
 /**
- * Example {@link ClientInterceptor} that logs all called methods. In this example it is added to Spring's application
+ * Example {@link ClientInterceptor} that logs all called methods in INFO log level, also request and response messages,
+ * headers, trailers and interaction status in DEBUG log level. In this example it is added to Spring's application
  * context via {@link GlobalInterceptorConfiguration}, but is also possible to directly annotate this class with
  * {@link GrpcGlobalClientInterceptor}.
  */
@@ -43,8 +48,40 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
             final CallOptions callOptions,
             final Channel next) {
 
-        log.info(method.getFullMethodName());
-        return next.newCall(method, callOptions);
+        log.info("Received call to {}", method.getFullMethodName());
+        return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(next.newCall(method, callOptions)) {
+
+            @Override
+            public void sendMessage(ReqT message) {
+                log.debug("Request message: {}", message);
+                super.sendMessage(message);
+            }
+
+            @Override
+            public void start(Listener<RespT> responseListener, Metadata headers) {
+                super.start(
+                        new ForwardingClientCallListener.SimpleForwardingClientCallListener<RespT>(responseListener) {
+                            @Override
+                            public void onMessage(RespT message) {
+                                log.debug("Response message: {}", message);
+                                super.onMessage(message);
+                            }
+
+                            @Override
+                            public void onHeaders(Metadata headers) {
+                                log.debug("gRPC headers: {}", headers);
+                                super.onHeaders(headers);
+                            }
+
+                            @Override
+                            public void onClose(Status status, Metadata trailers) {
+                                log.info("Interaction ends with status: {}", status);
+                                log.info("Trailers: {}", trailers);
+                                super.onClose(status, trailers);
+                            }
+                        }, headers);
+            }
+        };
     }
 
 }

examples/local-grpc-client/src/main/java/net/devh/boot/grpc/examples/local/client/LogGrpcInterceptor.java

@@ -24,9 +24,19 @@
 import io.grpc.Channel;
 import io.grpc.ClientCall;
 import io.grpc.ClientInterceptor;
+import io.grpc.ForwardingClientCall;
+import io.grpc.ForwardingClientCallListener;
+import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
+import io.grpc.Status;
+import net.devh.boot.grpc.client.interceptor.GrpcGlobalClientInterceptor;
 
 /**
+ * Example {@link ClientInterceptor} that logs all called methods in INFO log level, also request and response messages,
+ * headers, trailers and interaction status in DEBUG log level. In this example it is added to Spring's application
+ * context via {@link GlobalClientInterceptorConfiguration}, but is also possible to directly annotate this class with
+ * {@link GrpcGlobalClientInterceptor}.
+ *
  * @author Michael ([email protected])
  * @since 2016/12/8
  */
@@ -35,10 +45,45 @@ public class LogGrpcInterceptor implements ClientInterceptor {
     private static final Logger log = LoggerFactory.getLogger(LogGrpcInterceptor.class);
 
     @Override
-    public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> method,
-            CallOptions callOptions, Channel next) {
-        log.info(method.getFullMethodName());
-        return next.newCall(method, callOptions);
+    public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
+            MethodDescriptor<ReqT, RespT> method,
+            CallOptions callOptions,
+            Channel next) {
+
+        log.info("Received call to {}", method.getFullMethodName());
+        return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(next.newCall(method, callOptions)) {
+
+            @Override
+            public void sendMessage(ReqT message) {
+                log.debug("Request message: {}", message);
+                super.sendMessage(message);
+            }
+
+            @Override
+            public void start(Listener<RespT> responseListener, Metadata headers) {
+                super.start(
+                        new ForwardingClientCallListener.SimpleForwardingClientCallListener<RespT>(responseListener) {
+                            @Override
+                            public void onMessage(RespT message) {
+                                log.debug("Response message: {}", message);
+                                super.onMessage(message);
+                            }
+
+                            @Override
+                            public void onHeaders(Metadata headers) {
+                                log.debug("gRPC headers: {}", headers);
+                                super.onHeaders(headers);
+                            }
+
+                            @Override
+                            public void onClose(Status status, Metadata trailers) {
+                                log.info("Interaction ends with status: {}", status);
+                                log.info("Trailers: {}", trailers);
+                                super.onClose(status, trailers);
+                            }
+                        }, headers);
+            }
+        };
     }
 
 }