feat(databasesql): add DSN parser registry with extensibility and tests.

pkg/instrumentation/databasesql/client.go

@@ -42,9 +42,11 @@ var clientEnabler = dbClientEnabler{}
 func beforeOpenInstrumentation(ictx inst.HookContext, driverName, dataSourceName string) {
 	addr, err := parseDSN(driverName, dataSourceName)
 	if err != nil {
+		logger.Warn("could not determine server address from DSN; server.address will be omitted",
+			"driver", driverName, "error", err)
 		addr = "unknown"
 	}
-	dbName := ParseDbName(dataSourceName)
+	dbName := parseDbName(dataSourceName)
 	ictx.SetData(map[string]string{
 		"endpoint": addr,
 		"driver":   driverName,

pkg/instrumentation/databasesql/go.mod

@@ -36,7 +36,7 @@ require (
 	go.opentelemetry.io/contrib/exporters/autoexport v0.63.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/runtime v0.64.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.19.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
@@ -46,10 +46,10 @@ require (
 	go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.14.0 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0 // indirect
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 // indirect
-	go.opentelemetry.io/otel/log v0.14.0 // indirect
+	go.opentelemetry.io/otel/log v0.19.0 // indirect
 	go.opentelemetry.io/otel/metric v1.43.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.43.0 // indirect
-	go.opentelemetry.io/otel/sdk/log v0.14.0 // indirect
+	go.opentelemetry.io/otel/sdk/log v0.19.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.10.0 // indirect
 	golang.org/x/net v0.52.0 // indirect

pkg/instrumentation/databasesql/go.sum

@@ -59,8 +59,8 @@ go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
 go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
 go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0 h1:OMqPldHt79PqWKOMYIAQs3CxAi7RLgPxwfFSwr4ZxtM=
 go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.14.0/go.mod h1:1biG4qiqTxKiUCtoWDPpL3fB3KxVwCiGw81j3nKMuHE=
-go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0 h1:QQqYw3lkrzwVsoEX0w//EhH/TCnpRdEenKBOOEIMjWc=
-go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.14.0/go.mod h1:gSVQcr17jk2ig4jqJ2DX30IdWH251JcNAecvrqTxH1s=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.19.0 h1:HIBTQ3VO5aupLKjC90JgMqpezVXwFuq6Ryjn0/izoag=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.19.0/go.mod h1:ji9vId85hMxqfvICA0Jt8JqEdrXaAkcpkI9HPXya0ro=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 h1:vl9obrcoWVKp/lwl8tRE33853I8Xru9HFbw/skNeLs8=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0/go.mod h1:GAXRxmLJcVM3u22IjTg74zWBrRCKq8BnOqUVLodpcpw=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.43.0 h1:w1K+pCJoPpQifuVpsKamUdn9U0zM3xUziVOqsGksUrY=
@@ -79,16 +79,16 @@ go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0 h1:wm/Q0GAAykXv83
 go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.38.0/go.mod h1:ra3Pa40+oKjvYh+ZD3EdxFZZB0xdMfuileHAm4nNN7w=
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0 h1:kJxSDN4SgWWTjG/hPp3O7LCGLcHXFlvS2/FFOrwL+SE=
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0/go.mod h1:mgIOzS7iZeKJdeB8/NYHrJ48fdGc71Llo5bJ1J4DWUE=
-go.opentelemetry.io/otel/log v0.14.0 h1:2rzJ+pOAZ8qmZ3DDHg73NEKzSZkhkGIua9gXtxNGgrM=
-go.opentelemetry.io/otel/log v0.14.0/go.mod h1:5jRG92fEAgx0SU/vFPxmJvhIuDU9E1SUnEQrMlJpOno=
+go.opentelemetry.io/otel/log v0.19.0 h1:KUZs/GOsw79TBBMfDWsXS+KZ4g2Ckzksd1ymzsIEbo4=
+go.opentelemetry.io/otel/log v0.19.0/go.mod h1:5DQYeGmxVIr4n0/BcJvF4upsraHjg6vudJJpnkL6Ipk=
 go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
 go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
 go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg=
 go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
-go.opentelemetry.io/otel/sdk/log v0.14.0 h1:JU/U3O7N6fsAXj0+CXz21Czg532dW2V4gG1HE/e8Zrg=
-go.opentelemetry.io/otel/sdk/log v0.14.0/go.mod h1:imQvII+0ZylXfKU7/wtOND8Hn4OpT3YUoIgqJVksUkM=
-go.opentelemetry.io/otel/sdk/log/logtest v0.14.0 h1:Ijbtz+JKXl8T2MngiwqBlPaHqc4YCaP/i13Qrow6gAM=
-go.opentelemetry.io/otel/sdk/log/logtest v0.14.0/go.mod h1:dCU8aEL6q+L9cYTqcVOk8rM9Tp8WdnHOPLiBgp0SGOA=
+go.opentelemetry.io/otel/sdk/log v0.19.0 h1:scYVLqT22D2gqXItnWiocLUKGH9yvkkeql5dBDiXyko=
+go.opentelemetry.io/otel/sdk/log v0.19.0/go.mod h1:vFBowwXGLlW9AvpuF7bMgnNI95LiW10szrOdvzBHlAg=
+go.opentelemetry.io/otel/sdk/log/logtest v0.19.0 h1:BEbF7ZBB6qQloV/Ub1+3NQoOUnVtcGkU3XX4Ws3GQfk=
+go.opentelemetry.io/otel/sdk/log/logtest v0.19.0/go.mod h1:Lua81/3yM0wOmoHTokLj9y9ADeA02v1naRrVrkAZuKk=
 go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw=
 go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A=
 go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=

pkg/instrumentation/databasesql/internal/dsnparse/parse.go

@@ -0,0 +1,275 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package dsnparse
+
+import (
+	"errors"
+	"fmt"
+	nurl "net/url"
+	"strings"
+	"sync"
+)
+
+// DSNParser parses a driver-specific DSN and returns the server address (host:port).
+type DSNParser func(dsn string) (addr string, err error)
+
+var (
+	parserMu       sync.RWMutex
+	parserRegistry = map[string]DSNParser{}
+)
+
+// RegisterDSNParser registers a custom DSN parser for the given driver name.
+// Built-in parsers are registered automatically during package initialization.
+// Calling RegisterDSNParser for an already-registered name overwrites the previous parser.
+// It is safe to call from package init() functions.
+func RegisterDSNParser(driverName string, parser DSNParser) {
+	parserMu.Lock()
+	defer parserMu.Unlock()
+	parserRegistry[driverName] = parser
+}
+
+func init() {
+	// Register all built-in DSN parsers.
+	RegisterDSNParser("mysql", ParseMySQL)
+	RegisterDSNParser("postgres", ParsePostgres)
+	RegisterDSNParser("postgresql", ParsePostgres)
+	RegisterDSNParser("pgx", ParsePostgres)    // pgx uses the standard postgres URL format
+	RegisterDSNParser("lib/pq", ParsePostgres) // lib/pq uses the standard postgres URL format
+	RegisterDSNParser("clickhouse", ParseClickHouse)
+	RegisterDSNParser("sqlite3", func(_ string) (string, error) { return "sqlite3", nil })
+	RegisterDSNParser("godror", ParseOracle)
+	RegisterDSNParser("oracle", ParseOracle)
+	RegisterDSNParser("oci8", ParseOracle)
+	RegisterDSNParser("go-oci8", ParseOracle)
+	RegisterDSNParser("mssql", ParseSQLServer)
+	RegisterDSNParser("sqlserver", ParseSQLServer)
+}
+
+// ParseDSN parses driverName and dsn into a server address (host:port).
+// It falls back to best-effort URL parsing for unregistered drivers.
+func ParseDSN(driverName, dsn string) (addr string, err error) {
+	parserMu.RLock()
+	parser, ok := parserRegistry[driverName]
+	parserMu.RUnlock()
+
+	if ok {
+		return parser(dsn)
+	}
+
+	// Best-effort: try standard URL parsing for drivers not in the registry.
+	return BestEffortParse(dsn)
+}
+
+// BestEffortParse attempts to extract a host:port from a DSN using standard URL parsing.
+// It is used as a fallback for drivers that have no registered parser.
+func BestEffortParse(dsn string) (string, error) {
+	u, err := nurl.Parse(dsn)
+	if err == nil && u.Host != "" {
+		return u.Host, nil
+	}
+	return "", errors.New("no DSN parser registered for this driver; best-effort URL parse also failed")
+}
+
+// ParseDbName extracts the database name from a DSN using best-effort URL parsing.
+// For URL-based DSNs it uses the path component; for MySQL-style DSNs it uses
+// the segment between the closing parenthesis and the first '?'. Returns an
+// empty string when the name cannot be determined.
+func ParseDbName(dsn string) string {
+	// MySQL style: user:pass@tcp(host:port)/dbname?params
+	if i := strings.LastIndex(dsn, ")/"); i >= 0 {
+		rest := dsn[i+2:]
+		if j := strings.IndexByte(rest, '?'); j >= 0 {
+			rest = rest[:j]
+		}
+		return rest
+	}
+	// URL style: scheme://user:pass@host/dbname?params
+	u, err := nurl.Parse(dsn)
+	if err == nil && u.Scheme != "" && u.Path != "" {
+		return strings.TrimPrefix(u.Path, "/")
+	}
+	return ""
+}
+
+func ParsePostgres(url string) (addr string, err error) {
+	u, err := nurl.Parse(url)
+	if err != nil {
+		return "", err
+	}
+
+	if u.Scheme != "postgres" && u.Scheme != "postgresql" {
+		return "", fmt.Errorf("invalid connection protocol: %s", u.Scheme)
+	}
+
+	if u.Port() != "" {
+		return u.Host, nil
+	}
+	return u.Hostname() + ":5432", nil
+}
+
+func ParseMySQL(dsn string) (addr string, err error) {
+	// MySQL DSN format: [username[:password]@][protocol[(address)]]/dbname[?params]
+	// We need to find the protocol part after @ to avoid special chars in password
+
+	// Find @ symbol to locate where credentials end
+	atIndex := strings.LastIndex(dsn, "@")
+	var searchStart int
+	if atIndex >= 0 {
+		// Start searching for ( after @
+		searchStart = atIndex
+	} else {
+		// No credentials, search from beginning
+		searchStart = 0
+	}
+
+	// Now find the ( and ) after the @ symbol
+	n := len(dsn)
+	i, j := -1, -1
+	for k := searchStart; k < n; k++ {
+		if dsn[k] == '(' {
+			i = k
+		}
+		if dsn[k] == ')' && i >= 0 {
+			// Only accept ) if we've already found (
+			j = k
+			break
+		}
+	}
+	if i >= 0 && j > i {
+		return dsn[i+1 : j], nil
+	}
+	return "", errors.New("invalid MySQL DSN")
+}
+
+func ParseClickHouse(dsn string) (addr string, err error) {
+	// ClickHouse DSN formats:
+	// tcp://host:port?database=dbname&username=user&password=pass
+	// http://host:port?database=dbname
+	// clickhouse://host:port/database?username=user&password=pass
+	u, err := nurl.Parse(dsn)
+	if err != nil {
+		return "", err
+	}
+
+	// Return host with port
+	if u.Port() != "" {
+		return u.Host, nil
+	}
+
+	// Default ports based on scheme
+	switch u.Scheme {
+	case "tcp", "native":
+		return u.Hostname() + ":9000", nil
+	case "http":
+		return u.Hostname() + ":8123", nil
+	case "https":
+		return u.Hostname() + ":8443", nil
+	case "clickhouse":
+		// Default to native port
+		return u.Hostname() + ":9000", nil
+	}
+
+	return u.Host, nil
+}
+
+func ParseOracle(dsn string) (addr string, err error) {
+	// Oracle DSN formats:
+	// user/password@host:port/service_name
+	// user/password@host:port/sid
+	// user/password@//host:port/service_name
+	// oracle://user:password@host:port/service_name
+
+	// Try URL format first
+	if strings.Contains(dsn, "://") {
+		u, err := nurl.Parse(dsn)
+		if err == nil && u.Host != "" {
+			if u.Port() != "" {
+				return u.Host, nil
+			}
+			return u.Hostname() + ":1521", nil // Oracle default port
+		}
+	}
+
+	// Parse traditional Oracle format: user/password@host:port/service
+	atIndex := strings.Index(dsn, "@")
+	if atIndex < 0 {
+		return "", errors.New("invalid Oracle DSN")
+	}
+
+	connStr := dsn[atIndex+1:]
+	// Remove leading //
+	connStr = strings.TrimPrefix(connStr, "//")
+
+	// Extract host:port before /
+	slashIndex := strings.Index(connStr, "/")
+	var hostPort string
+	if slashIndex > 0 {
+		hostPort = connStr[:slashIndex]
+	} else {
+		hostPort = connStr
+	}
+
+	// If no port specified, add default
+	if !strings.Contains(hostPort, ":") {
+		hostPort = hostPort + ":1521"
+	}
+
+	return hostPort, nil
+}
+
+func ParseSQLServer(dsn string) (addr string, err error) {
+	// SQL Server DSN formats:
+	// sqlserver://username:password@host:port?database=dbname
+	// server=host;port=1433;database=dbname;user id=user;password=pass
+	// Server=host,port;Database=dbname;User Id=user;Password=pass
+
+	// Try URL format first
+	if strings.HasPrefix(dsn, "sqlserver://") || strings.HasPrefix(dsn, "mssql://") {
+		u, err := nurl.Parse(dsn)
+		if err != nil {
+			return "", err
+		}
+		if u.Port() != "" {
+			return u.Host, nil
+		}
+		return u.Hostname() + ":1433", nil // SQL Server default port
+	}
+
+	// Parse connection string format (key=value pairs)
+	dsn = strings.ToLower(dsn)
+	var host, port string
+
+	// Split by semicolon
+	pairs := strings.Split(dsn, ";")
+	for _, pair := range pairs {
+		pair = strings.TrimSpace(pair)
+		if strings.HasPrefix(pair, "server=") {
+			serverVal := strings.TrimPrefix(pair, "server=")
+			// Handle Server=host,port format
+			if strings.Contains(serverVal, ",") {
+				parts := strings.Split(serverVal, ",")
+				host = parts[0]
+				if len(parts) > 1 {
+					port = parts[1]
+				}
+			} else {
+				host = serverVal
+			}
+		} else if strings.HasPrefix(pair, "port=") {
+			port = strings.TrimPrefix(pair, "port=")
+		} else if strings.HasPrefix(pair, "host=") {
+			host = strings.TrimPrefix(pair, "host=")
+		}
+	}
+
+	if host == "" {
+		return "", errors.New("invalid SQL Server DSN")
+	}
+
+	if port == "" {
+		port = "1433" // SQL Server default port
+	}
+
+	return host + ":" + port, nil
+}