From a6811d5bb154a7aef16a4cd36d0ffb9be3816d25 Mon Sep 17 00:00:00 2001
From: ZHANG Dapeng <zdapeng@google.com>
Date: Fri, 13 Apr 2018 09:41:09 -0700
Subject: [PATCH] all: add toString() to Server to improve debug info

---
 alts/src/main/java/io/grpc/alts/AltsServerBuilder.java   | 6 ++++++
 .../src/main/java/io/grpc/inprocess/InProcessServer.java | 6 ++++++
 core/src/main/java/io/grpc/internal/ServerImpl.java      | 9 +++++++++
 netty/src/main/java/io/grpc/netty/NettyServer.java       | 9 +++++++++
 4 files changed, 30 insertions(+)

diff --git a/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java b/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java
index 058958510c..3d39a548fd 100644
--- a/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java
+++ b/alts/src/main/java/io/grpc/alts/AltsServerBuilder.java
@@ -16,6 +16,7 @@
 
 package io.grpc.alts;
 
+import com.google.common.base.MoreObjects;
 import io.grpc.BindableService;
 import io.grpc.CompressorRegistry;
 import io.grpc.DecompressorRegistry;
@@ -248,5 +249,10 @@ public final class AltsServerBuilder extends ServerBuilder<AltsServerBuilder> {
     public void awaitTermination() throws InterruptedException {
       delegate.awaitTermination();
     }
+
+    @Override
+    public String toString() {
+      return MoreObjects.toStringHelper(this).add("delegate", delegate).toString();
+    }
   }
 }
diff --git a/core/src/main/java/io/grpc/inprocess/InProcessServer.java b/core/src/main/java/io/grpc/inprocess/InProcessServer.java
index 2ba9fcfcd7..81bb047b9f 100644
--- a/core/src/main/java/io/grpc/inprocess/InProcessServer.java
+++ b/core/src/main/java/io/grpc/inprocess/InProcessServer.java
@@ -18,6 +18,7 @@ package io.grpc.inprocess;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.common.base.MoreObjects;
 import io.grpc.ServerStreamTracer;
 import io.grpc.internal.Channelz.SocketStats;
 import io.grpc.internal.Instrumented;
@@ -95,6 +96,11 @@ final class InProcessServer implements InternalServer {
     }
   }
 
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this).add("name", name).toString();
+  }
+
   synchronized ServerTransportListener register(InProcessTransport transport) {
     if (shutdown) {
       return null;
diff --git a/core/src/main/java/io/grpc/internal/ServerImpl.java b/core/src/main/java/io/grpc/internal/ServerImpl.java
index f9f646b1f3..6c13ee3f88 100644
--- a/core/src/main/java/io/grpc/internal/ServerImpl.java
+++ b/core/src/main/java/io/grpc/internal/ServerImpl.java
@@ -25,6 +25,7 @@ import static io.grpc.internal.GrpcUtil.TIMEOUT_KEY;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
@@ -580,6 +581,14 @@ public final class ServerImpl extends io.grpc.Server implements Instrumented<Ser
     return ret;
   }
 
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("logId", logId)
+        .add("transportServer", transportServer)
+        .toString();
+  }
+
   private static final class NoopListener implements ServerStreamListener {
     @Override
     public void messagesAvailable(MessageProducer producer) {
diff --git a/netty/src/main/java/io/grpc/netty/NettyServer.java b/netty/src/main/java/io/grpc/netty/NettyServer.java
index f9efdf03eb..9d6a6aa07c 100644
--- a/netty/src/main/java/io/grpc/netty/NettyServer.java
+++ b/netty/src/main/java/io/grpc/netty/NettyServer.java
@@ -21,6 +21,7 @@ import static io.grpc.netty.NettyServerBuilder.MAX_CONNECTION_AGE_NANOS_DISABLED
 import static io.netty.channel.ChannelOption.SO_BACKLOG;
 import static io.netty.channel.ChannelOption.SO_KEEPALIVE;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -304,6 +305,14 @@ class NettyServer implements InternalServer, WithLogId {
     return logId;
   }
 
+  @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(this)
+        .add("logId", logId)
+        .add("address", address)
+        .toString();
+  }
+
   class EventLoopReferenceCounter extends AbstractReferenceCounted {
     @Override
     protected void deallocate() {