Add default connection attribute '_server_host'

shatteredsilicon · Oct 31, 2023 · dc53627 · dc53627
1 parent 182f00a
commit dc53627
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/connector.go b/connector.go
@@ -22,7 +22,7 @@ type connector struct {
 	encodedAttributes string  // Encoded connection attributes.
 }
 
-func encodeConnectionAttributes(textAttributes string) string {
+func encodeConnectionAttributes(cfg *Config) string {
 	connAttrsBuf := make([]byte, 0)
 
 	// default connection attributes
@@ -34,9 +34,12 @@ func encodeConnectionAttributes(textAttributes string) string {
 	connAttrsBuf = appendLengthEncodedString(connAttrsBuf, connAttrPlatformValue)
 	connAttrsBuf = appendLengthEncodedString(connAttrsBuf, connAttrPid)
 	connAttrsBuf = appendLengthEncodedString(connAttrsBuf, strconv.Itoa(os.Getpid()))
+	connAttrsBuf = appendLengthEncodedString(connAttrsBuf, connAttrServerHost)
+	serverHost, _, _ := net.SplitHostPort(cfg.Addr)
+	connAttrsBuf = appendLengthEncodedString(connAttrsBuf, serverHost)
 
 	// user-defined connection attributes
-	for _, connAttr := range strings.Split(textAttributes, ",") {
+	for _, connAttr := range strings.Split(cfg.ConnectionAttributes, ",") {
 		attr := strings.SplitN(connAttr, ":", 2)
 		if len(attr) != 2 {
 			continue
@@ -50,7 +53,7 @@ func encodeConnectionAttributes(textAttributes string) string {
 }
 
 func newConnector(cfg *Config) *connector {
-	encodedAttributes := encodeConnectionAttributes(cfg.ConnectionAttributes)
+	encodedAttributes := encodeConnectionAttributes(cfg)
 	return &connector{
 		cfg:               cfg,
 		encodedAttributes: encodedAttributes,

diff --git a/const.go b/const.go
@@ -26,6 +26,7 @@ const (
 	connAttrPlatform        = "_platform"
 	connAttrPlatformValue   = runtime.GOARCH
 	connAttrPid             = "_pid"
+	connAttrServerHost      = "_server_host"
 )
 
 // MySQL constants documentation: