Skip to content

fix(database_observability.postgres): Correctly handle dsn with unix sockets #6030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
k3-cat wants to merge 2 commits into
base: main
Choose a base branch
from
+33 −3
Open

fix(database_observability.postgres): Correctly handle dsn with unix sockets #6030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46192fc
Fix regex for parsing DSN in component database_observability.postgres
k3-cat Apr 10, 2026
33eaaa1
Rename test cases for clarity and add new cases for dsn with unix soc…
k3-cat Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/component/database_observability/postgres/collector/dsn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

type databaseConnectionFactory func(dsn string) (*sql.DB, error)

var dsnParseRegex = regexp.MustCompile(`^(\w+:\/\/.+\/)(?<dbname>[\w\-_\$]+)(\??.*$)`)
var dsnParseRegex = regexp.MustCompile(`^(\w+:\/\/[\w:@.\-_]*\/)(?<dbname>[\w\-_\$]+)((?:\?\S*)?)`)
var defaultDbConnectionFactory = func(dsn string) (*sql.DB, error) {
return sql.Open("postgres", dsn)
}
Expand Down
34 changes: 32 additions & 2 deletions internal/component/database_observability/postgres/collector/dsn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,35 @@ func TestReplaceDatabaseNameInDSN(t *testing.T) {
expected: "postgres://postgres:password@localhost:5432/testdb",
},
{
name: "database name appears in password",
name: "problematic case - database name appears in password",
dsn: "postgres://user:mydb123@localhost:5432/mydb",
newDBName: "newdb",
expected: "postgres://user:mydb123@localhost:5432/newdb",
},
{
name: "database name with special characters",
name: "problematic case - database name with special characters",
dsn: "postgres://user:pass@localhost:5432/my-db_test$1",
newDBName: "new_db",
expected: "postgres://user:pass@localhost:5432/new_db",
},
{
name: "unix socket - minimum postgres DSN",
dsn: "postgres:///mydb?host=/run/postgresql",
newDBName: "newdb",
expected: "postgres:///newdb?host=/run/postgresql",
},
{
name: "unix socket - general postgres DSN",
dsn: "postgres://user:@/mydb?host=/run/postgresql",
newDBName: "newdb",
expected: "postgres://user:@/newdb?host=/run/postgresql",
},
{
name: "unix socket problematic case - hostname and dbname with special characters",
dsn: "postgres://user:pass@ex-amp_le.com:5432/my-db_test$1?host=/run/postgresql",
newDBName: "new_db",
expected: "postgres://user:pass@ex-amp_le.com:5432/new_db?host=/run/postgresql",
},
{
name: "invalid DSN format",
dsn: "invalid-dsn-format",
Expand All @@ -62,6 +80,18 @@ func TestReplaceDatabaseNameInDSN(t *testing.T) {
newDBName: "newdb",
expectError: true,
},
{
name: "DSN with space",
dsn: "postgres://user:pass @localhost:5432/",
newDBName: "newdb",
expectError: true,
},
{
name: "DSN with space in query parameters",
dsn: "postgres://user:pass@localhost:5432/mydb?sslmode=disable &connect_timeout=10",
newDBName: "newdb",
expectError: true,
},
}

for _, tt := range tests {
Expand Down