diff --git a/contrib/database/sql/internal/dsn.go b/contrib/database/sql/internal/dsn.go
index 6171eb668c..d1abb7dc67 100644
--- a/contrib/database/sql/internal/dsn.go
+++ b/contrib/database/sql/internal/dsn.go
@@ -16,11 +16,6 @@ import (
 // ParseDSN parses various supported DSN types into a map of key/value pairs which can be used as valid tags.
 func ParseDSN(driverName, dsn string) (meta map[string]string, err error) {
 	meta = make(map[string]string)
-	if driverName != "mysql" && driverName != "postgres" && driverName != "sqlserver" && strings.Contains(dsn, ":") {
-		// If the DSN is valid but the driverName is not supported, use the
-		// drivername from the DSN instead
-		driverName = dsn[:strings.Index(dsn, ":")]
-	}
 	switch driverName {
 	case "mysql":
 		meta, err = parseMySQLDSN(dsn)
diff --git a/contrib/database/sql/propagation_test.go b/contrib/database/sql/propagation_test.go
index 27e2bccf7d..fdc206a822 100644
--- a/contrib/database/sql/propagation_test.go
+++ b/contrib/database/sql/propagation_test.go
@@ -167,7 +167,6 @@ func TestDBMPropagation(t *testing.T) {
 			Register("test", d, tc.opts...)
 			defer unregister("test")
 
-			var db *sql.DB
 			var err error
 
 			dsn := "dn"
@@ -175,7 +174,7 @@ func TestDBMPropagation(t *testing.T) {
 				dsn = tc.dsn
 			}
 
-			db, err = Open("test", dsn)
+			db, err := Open("test", dsn)
 
 			require.NoError(t, err)