noot

lib/gat/handlers/pool/pools/basic/pool.go

@@ -218,7 +218,10 @@ func (T *Pool) Serve(conn *fed.Conn) error {
 		client.Conn.Ready = true
 	}
 
-	poolLabels := prom.PoolSimpleLabels{}
+	poolLabels := prom.PoolSimpleLabels{
+		Database: conn.Database,
+		User:     conn.User,
+	}
 	{
 		if T.config.ReleaseAfterTransaction {
 			poolLabels.Mode = "transaction"

lib/gat/handlers/pool/pools/hybrid/pool.go

@@ -450,7 +450,10 @@ func (T *Pool) serveOnly(l prom.PoolHybridLabels, conn *fed.Conn, write bool) er
 }
 
 func (T *Pool) Serve(conn *fed.Conn) error {
-	labels := prom.PoolHybridLabels{}
+	labels := prom.PoolHybridLabels{
+		Database: conn.Database,
+		User:     conn.User,
+	}
 	switch conn.InitialParameters[strutil.MakeCIString("hybrid.mode")] {
 	case "ro":
 		labels.Mode = "ro"

lib/instrumentation/prom/pool_hybrid.go

@@ -12,6 +12,8 @@ func init() {
 
 type PoolHybridLabels struct {
 	Mode     string `label:"mode"`
+	Database string `label:"database"`
+	User     string `label:"user"`
 }
 
 type OperationHybridLabels struct {
@@ -19,6 +21,8 @@ type OperationHybridLabels struct {
 	Mode string `label:"mode"`
 
 	Target   string `label:"target"`
+	Database string `label:"database"`
+	User     string `label:"user"`
 }
 
 func (s *PoolHybridLabels) ToOperation(
@@ -27,6 +31,7 @@ func (s *PoolHybridLabels) ToOperation(
 	return OperationHybridLabels{
 		Pool:     "hybrid",
 		Mode:     s.Mode,
+		Database: s.Database,
 		Target:   target,
 	}
 }

lib/instrumentation/prom/pool_simple.go

@@ -17,18 +17,23 @@ var PoolSimple struct {
 
 type PoolSimpleLabels struct {
 	Mode     string `label:"mode"`
+	Database string `label:"database"`
+	User     string `label:"user"`
 }
 
 func (s *PoolSimpleLabels) ToOperation() OperationSimpleLabels {
 	return OperationSimpleLabels{
 		Pool:     "basic",
 		Mode:     s.Mode,
+		Database: s.Database,
 	}
 }
 
 type OperationSimpleLabels struct {
 	Pool     string `label:"pool"`
 	Mode     string `label:"mode"`
+	Database string `label:"database"`
+	User     string `label:"user"`
 }
 
 var OperationSimple struct {