fix: use psycopg2 DSN parser to parse DSN (#5272)

This change fixes an issue with DSN parsing with the psycopg2
integration, likely introduced after the refactor of #4294.

Fixes #5269.

## Checklist

- [x] Change(s) are motivated and described in the PR description.
- [x] Testing strategy is described if automated tests are not included
in the PR.
- [ ] Risk is outlined (performance impact, potential for breakage,
maintainability, etc).
- [ ] Change is maintainable (easy to change, telemetry, documentation).
- [ ] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/contributing.html#Release-Note-Guidelines)
are followed.
- [ ] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/)).
- [ ] Author is aware of the performance implications of this PR as
reported in the benchmarks PR comment.

## Reviewer Checklist

- [x] Title is accurate.
- [x] No unnecessary changes are introduced.
- [x] Description motivates each change.
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes unless absolutely necessary.
- [x] Testing strategy adequately addresses listed risk(s).
- [x] Change is maintainable (easy to change, telemetry, documentation).
- [x] Release note makes sense to a user of the library.
- [x] Reviewer is aware of, and discussed the performance implications
of this PR as reported in the benchmarks PR comment.

---------

Co-authored-by: Munir Abdinur <[email protected]>
Co-authored-by: Tahir H. Butt <[email protected]>
Co-authored-by: Tahir H. Butt <[email protected]>

Author: 3 people

ddtrace/contrib/psycopg/connection.py

@@ -5,6 +5,7 @@
 
 from psycopg2.extensions import connection
 from psycopg2.extensions import cursor
+from psycopg2.extensions import parse_dsn
 
 from ddtrace import config
 from ddtrace.internal.constants import COMPONENT
@@ -15,7 +16,6 @@
 from ...ext import SpanTypes
 from ...ext import db
 from ...ext import net
-from ...ext import sql
 
 
 class TracedCursor(cursor):
@@ -66,7 +66,7 @@ def __init__(self, *args, **kwargs):
         super(TracedConnection, self).__init__(*args, **kwargs)
 
         # add metadata (from the connection, string, etc)
-        dsn = sql.parse_pg_dsn(self.dsn)
+        dsn = parse_dsn(self.dsn)
         self._datadog_tags = {
             net.TARGET_HOST: dsn.get("host"),
             net.TARGET_PORT: dsn.get("port"),

ddtrace/contrib/psycopg/patch.py

@@ -1,6 +1,7 @@
 import os
 
 import psycopg2
+from psycopg2.extensions import parse_dsn
 from psycopg2.sql import Composable
 
 from ddtrace import Pin
@@ -13,7 +14,6 @@
 from ddtrace.ext import SpanTypes
 from ddtrace.ext import db
 from ddtrace.ext import net
-from ddtrace.ext import sql
 from ddtrace.internal.constants import COMPONENT
 from ddtrace.vendor import wrapt
 
@@ -108,7 +108,7 @@ def patch_conn(conn, traced_conn_cls=Psycopg2TracedConnection):
     c = traced_conn_cls(conn)
 
     # fetch tags from the dsn
-    dsn = sql.parse_pg_dsn(conn.dsn)
+    dsn = parse_dsn(conn.dsn)
     tags = {
         net.TARGET_HOST: dsn.get("host"),
         net.TARGET_PORT: dsn.get("port"),

releasenotes/notes/fix-psycopg-parse-dsn-f645bc9f056305c7.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    psycopg2: Fixes a bug with DSN parsing integration.