Skip to content

Commit ec618b7

Browse files
committed
xds: Remove newlines from XdsConfig.toString()
The newlines can make logs really hard to read, as many log handling systems will split up each log statement by line. With the newlines, those singular log entries get split between multiple log entries which can make reading/processing it pretty ugly. When logging XdsConfig by itself, it isn't necessarily _that_ bad when XdsConfig is what you're actually trying to look at, but when XdsConfig is in the attributes of ResolvedAddresses it gets very distracting.
1 parent 103bd4b commit ec618b7

1 file changed

Lines changed: 7 additions & 8 deletions

File tree

xds/src/main/java/io/grpc/xds/XdsConfig.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static com.google.common.base.Preconditions.checkNotNull;
2020

21+
import com.google.common.base.MoreObjects;
2122
import com.google.common.collect.ImmutableList;
2223
import com.google.common.collect.ImmutableMap;
2324
import io.grpc.StatusOr;
@@ -76,14 +77,12 @@ public int hashCode() {
7677

7778
@Override
7879
public String toString() {
79-
StringBuilder builder = new StringBuilder();
80-
builder.append("XdsConfig{")
81-
.append("\n listener=").append(listener)
82-
.append(",\n route=").append(route)
83-
.append(",\n virtualHost=").append(virtualHost)
84-
.append(",\n clusters=").append(clusters)
85-
.append("\n}");
86-
return builder.toString();
80+
return MoreObjects.toStringHelper(this)
81+
.add("listener", listener)
82+
.add("route", route)
83+
.add("virtualHost", virtualHost)
84+
.add("clusters", clusters)
85+
.toString();
8786
}
8887

8988
public LdsUpdate getListener() {

0 commit comments

Comments
 (0)