added deployment UID prefix and review comments

PeerDB-io · Dec 21, 2023 · f7cd2b5 · f7cd2b5
1 parent 214fab9
commit f7cd2b5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/flow/activities/flowable.go b/flow/activities/flowable.go
@@ -180,12 +180,17 @@ func (a *FlowableActivity) handleSlotInfo(
 		return err
 	}
 
+	deploymentUIDPrefix := ""
+	if peerdbenv.GetPeerDBDeploymentUID() != "" {
+		deploymentUIDPrefix = fmt.Sprintf("[%s] ", peerdbenv.GetPeerDBDeploymentUID())
+	}
+
 	slotLagInMBThreshold := peerdbenv.GetPeerDBSlotLagMBAlertThreshold()
 	if (slotLagInMBThreshold > 0) && (slotInfo[0].LagInMb >= float32(slotLagInMBThreshold)) {
 		a.Alerter.AlertIf(ctx, fmt.Sprintf("%s-slot-lag-threshold-exceeded", peerName),
-			fmt.Sprintf(`Slot `+"`%s`"+` on peer `+"`%s`"+` has exceeded threshold size of %dMB, currently at %.2fMB!
+			fmt.Sprintf(`%sSlot `+"`%s`"+` on peer `+"`%s`"+` has exceeded threshold size of %dMB, currently at %.2fMB!
 cc: <!channel>`,
-				slotName, peerName, slotLagInMBThreshold, slotInfo[0].LagInMb))
+				deploymentUIDPrefix, slotName, peerName, slotLagInMBThreshold, slotInfo[0].LagInMb))
 	}
 
 	// Also handles alerts for PeerDB user connections exceeding a given limit here
@@ -195,12 +200,12 @@ cc: <!channel>`,
 		slog.WarnContext(ctx, "warning: failed to get current open connections", slog.Any("error", err))
 		return err
 	}
-	if (maxOpenConnectionsThreshold > 0) && (res.CurrentOpenConnections >= uint64(maxOpenConnectionsThreshold)) {
+	if (maxOpenConnectionsThreshold > 0) && (res.CurrentOpenConnections >= int64(maxOpenConnectionsThreshold)) {
 		a.Alerter.AlertIf(ctx, fmt.Sprintf("%s-max-open-connections-threshold-exceeded", peerName),
-			fmt.Sprintf(`Open connections from PeerDB user `+"`%s`"+` on peer `+"`%s`"+
+			fmt.Sprintf(`%sOpen connections from PeerDB user `+"`%s`"+` on peer `+"`%s`"+
 				` has exceeded threshold size of %d connections, currently at %d connections!
 cc: <!channel>`,
-				res.UserName, peerName, maxOpenConnectionsThreshold, res.CurrentOpenConnections))
+				deploymentUIDPrefix, res.UserName, peerName, maxOpenConnectionsThreshold, res.CurrentOpenConnections))
 	}
 
 	if len(slotInfo) != 0 {

diff --git a/flow/connectors/postgres/postgres.go b/flow/connectors/postgres/postgres.go
@@ -910,6 +910,6 @@ func (c *PostgresConnector) GetOpenConnectionsForUser() (*protos.GetOpenConnecti
 
 	return &protos.GetOpenConnectionsForUserResult{
 		UserName:               c.config.User,
-		CurrentOpenConnections: uint64(result.Int64),
+		CurrentOpenConnections: result.Int64,
 	}, nil
 }
diff --git a/flow/generated/protos/flow.pb.go b/flow/generated/protos/flow.pb.go
diff --git a/nexus/pt/src/peerdb_flow.rs b/nexus/pt/src/peerdb_flow.rs
@@ -560,8 +560,8 @@ pub struct PeerDbColumns {
 pub struct GetOpenConnectionsForUserResult {
     #[prost(string, tag="1")]
     pub user_name: ::prost::alloc::string::String,
-    #[prost(uint64, tag="2")]
-    pub current_open_connections: u64,
+    #[prost(int64, tag="2")]
+    pub current_open_connections: i64,
 }
 /// protos for qrep
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]

diff --git a/protos/flow.proto b/protos/flow.proto
@@ -376,5 +376,5 @@ message PeerDBColumns {
 
 message GetOpenConnectionsForUserResult {
   string user_name = 1;
-  uint64 current_open_connections = 2;
+  int64 current_open_connections = 2;
 }
diff --git a/ui/grpc_generated/flow.ts b/ui/grpc_generated/flow.ts
@@ -6401,7 +6401,7 @@ export const GetOpenConnectionsForUserResult = {
       writer.uint32(10).string(message.userName);
     }
     if (message.currentOpenConnections !== 0) {
-      writer.uint32(16).uint64(message.currentOpenConnections);
+      writer.uint32(16).int64(message.currentOpenConnections);
     }
     return writer;
   },
@@ -6425,7 +6425,7 @@ export const GetOpenConnectionsForUserResult = {
             break;
           }
 
-          message.currentOpenConnections = longToNumber(reader.uint64() as Long);
+          message.currentOpenConnections = longToNumber(reader.int64() as Long);
           continue;
       }
       if ((tag & 7) === 4 || tag === 0) {