Add server address and cluster id to events' toString output (#1008)

jyemin · web-flow · commit 33c1dcacf7ea · 2022-10-03T10:01:47.000-04:00
JAVA-4732
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionCheckOutFailedEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionCheckOutFailedEvent.java
@@ -88,8 +88,9 @@ public Reason getReason() {
     @Override
     public String toString() {
         return "ConnectionCheckOutFailedEvent{"
-                       + "serverId=" + serverId
-                       + " reason=" + reason
-                       + '}';
+                + "server=" + serverId.getAddress()
+                + ", clusterId=" + serverId.getClusterId()
+                + ", reason=" + reason
+                + '}';
     }
 }
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionCheckOutStartedEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionCheckOutStartedEvent.java
@@ -49,7 +49,8 @@ public ServerId getServerId() {
     @Override
     public String toString() {
         return "ConnectionCheckOutStartedEvent{"
-                       + "serverId=" + serverId
-                       + '}';
+                + "server=" + serverId.getAddress()
+                + ", clusterId=" + serverId.getClusterId()
+                + '}';
     }
 }
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionCheckedInEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionCheckedInEvent.java
@@ -49,7 +49,9 @@ public ConnectionId getConnectionId() {
     @Override
     public String toString() {
         return "ConnectionCheckedInEvent{"
-                       + "connectionId=" + connectionId
-                       + '}';
+                + "connectionId=" + connectionId
+                + ", server=" + connectionId.getServerId().getAddress()
+                + ", clusterId=" + connectionId.getServerId().getClusterId()
+                + '}';
     }
 }
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionCheckedOutEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionCheckedOutEvent.java
@@ -49,7 +49,9 @@ public ConnectionId getConnectionId() {
     @Override
     public String toString() {
         return "ConnectionCheckedOutEvent{"
-                       + "connectionId=" + connectionId
-                       + '}';
+                + "connectionId=" + connectionId
+                + ", server=" + connectionId.getServerId().getAddress()
+                + ", clusterId=" + connectionId.getServerId().getClusterId()
+                + '}';
     }
 }
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionClosedEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionClosedEvent.java
@@ -87,8 +87,10 @@ public Reason getReason() {
     @Override
     public String toString() {
         return "ConnectionClosedEvent{"
-                       + " connectionId=" + connectionId
-                       + " reason=" + reason
-                       + '}';
+                + "connectionId=" + connectionId
+                + ", server=" + connectionId.getServerId().getAddress()
+                + ", clusterId=" + connectionId.getServerId().getClusterId()
+                + ", reason=" + reason
+                + '}';
     }
 }
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionCreatedEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionCreatedEvent.java
@@ -49,7 +49,9 @@ public ConnectionId getConnectionId() {
     @Override
     public String toString() {
         return "ConnectionCreatedEvent{"
-                       + " connectionId=" + connectionId
-                       + '}';
+                + "connectionId=" + connectionId
+                + ", server=" + connectionId.getServerId().getAddress()
+                + ", clusterId=" + connectionId.getServerId().getClusterId()
+                + '}';
     }
 }
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionReadyEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionReadyEvent.java
@@ -49,7 +49,9 @@ public ConnectionId getConnectionId() {
     @Override
     public String toString() {
         return "ConnectionReadyEvent{"
-                       + " connectionId=" + connectionId
-                       + '}';
+                + "connectionId=" + connectionId
+                + ", server=" + connectionId.getServerId().getAddress()
+                + ", clusterId=" + connectionId.getServerId().getClusterId()
+                + '}';
     }
 }
diff --git a/driver-core/src/main/com/mongodb/event/ConnectionRemovedEvent.java b/driver-core/src/main/com/mongodb/event/ConnectionRemovedEvent.java
@@ -103,6 +103,8 @@ public Reason getReason() {
     public String toString() {
         return "ConnectionRemovedEvent{"
                 + "connectionId=" + connectionId
+                + ", server=" + connectionId.getServerId().getAddress()
+                + ", clusterId=" + connectionId.getServerId().getClusterId()
                 + ", reason=" + reason
                 + '}';
     }
diff --git a/driver-core/src/main/com/mongodb/event/ServerHeartbeatFailedEvent.java b/driver-core/src/main/com/mongodb/event/ServerHeartbeatFailedEvent.java
@@ -110,6 +110,8 @@ public Throwable getThrowable() {
     public String toString() {
         return "ServerHeartbeatFailedEvent{"
                 + "connectionId=" + connectionId
+                + ", server=" + connectionId.getServerId().getAddress()
+                + ", clusterId=" + connectionId.getServerId().getClusterId()
                 + ", elapsedTimeNanos=" + elapsedTimeNanos
                 + ", awaited=" + awaited
                 + ", throwable=" + throwable
diff --git a/driver-core/src/main/com/mongodb/event/ServerHeartbeatStartedEvent.java b/driver-core/src/main/com/mongodb/event/ServerHeartbeatStartedEvent.java
@@ -50,6 +50,8 @@ public ConnectionId getConnectionId() {
     public String toString() {
         return "ServerHeartbeatStartedEvent{"
                 + "connectionId=" + connectionId
+                + ", server=" + connectionId.getServerId().getAddress()
+                + ", clusterId=" + connectionId.getServerId().getClusterId()
                 + "} " + super.toString();
     }
 }
diff --git a/driver-core/src/main/com/mongodb/event/ServerHeartbeatSucceededEvent.java b/driver-core/src/main/com/mongodb/event/ServerHeartbeatSucceededEvent.java
@@ -111,6 +111,8 @@ public boolean isAwaited() {
     public String toString() {
         return "ServerHeartbeatSucceededEvent{"
                 + "connectionId=" + connectionId
+                + ", server=" + connectionId.getServerId().getAddress()
+                + ", clusterId=" + connectionId.getServerId().getClusterId()
                 + ", reply=" + reply
                 + ", elapsedTimeNanos=" + elapsedTimeNanos
                 + ", awaited=" + awaited

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,9 @@ public Reason getReason() {`
`88`	`88`	`@Override`
`89`	`89`	`public String toString() {`
`90`	`90`	`return "ConnectionCheckOutFailedEvent{"`
`91`		`- + "serverId=" + serverId`
`92`		`- + " reason=" + reason`
`93`		`- + '}';`
	`91`	`+ + "server=" + serverId.getAddress()`
	`92`	`+ + ", clusterId=" + serverId.getClusterId()`
	`93`	`+ + ", reason=" + reason`
	`94`	`+ + '}';`
`94`	`95`	`}`
`95`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,8 @@ public ServerId getServerId() {`
`49`	`49`	`@Override`
`50`	`50`	`public String toString() {`
`51`	`51`	`return "ConnectionCheckOutStartedEvent{"`
`52`		`- + "serverId=" + serverId`
`53`		`- + '}';`
	`52`	`+ + "server=" + serverId.getAddress()`
	`53`	`+ + ", clusterId=" + serverId.getClusterId()`
	`54`	`+ + '}';`
`54`	`55`	`}`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,9 @@ public ConnectionId getConnectionId() {`
`49`	`49`	`@Override`
`50`	`50`	`public String toString() {`
`51`	`51`	`return "ConnectionCheckedInEvent{"`
`52`		`- + "connectionId=" + connectionId`
`53`		`- + '}';`
	`52`	`+ + "connectionId=" + connectionId`
	`53`	`+ + ", server=" + connectionId.getServerId().getAddress()`
	`54`	`+ + ", clusterId=" + connectionId.getServerId().getClusterId()`
	`55`	`+ + '}';`
`54`	`56`	`}`
`55`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,10 @@ public Reason getReason() {`
`87`	`87`	`@Override`
`88`	`88`	`public String toString() {`
`89`	`89`	`return "ConnectionClosedEvent{"`
`90`		`- + " connectionId=" + connectionId`
`91`		`- + " reason=" + reason`
`92`		`- + '}';`
	`90`	`+ + "connectionId=" + connectionId`
	`91`	`+ + ", server=" + connectionId.getServerId().getAddress()`
	`92`	`+ + ", clusterId=" + connectionId.getServerId().getClusterId()`
	`93`	`+ + ", reason=" + reason`
	`94`	`+ + '}';`
`93`	`95`	`}`
`94`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,8 @@ public Reason getReason() {`
`103`	`103`	`public String toString() {`
`104`	`104`	`return "ConnectionRemovedEvent{"`
`105`	`105`	`+ "connectionId=" + connectionId`
	`106`	`+ + ", server=" + connectionId.getServerId().getAddress()`
	`107`	`+ + ", clusterId=" + connectionId.getServerId().getClusterId()`
`106`	`108`	`+ ", reason=" + reason`
`107`	`109`	`+ '}';`
`108`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@ public ConnectionId getConnectionId() {`
`50`	`50`	`public String toString() {`
`51`	`51`	`return "ServerHeartbeatStartedEvent{"`
`52`	`52`	`+ "connectionId=" + connectionId`
	`53`	`+ + ", server=" + connectionId.getServerId().getAddress()`
	`54`	`+ + ", clusterId=" + connectionId.getServerId().getClusterId()`
`53`	`55`	`+ "} " + super.toString();`
`54`	`56`	`}`
`55`	`57`	`}`