fix(instrumentation-pg): improve connection string parsing for pool attributes and fix tests

Author: nikmel2803

plugins/node/opentelemetry-instrumentation-pg/src/utils.ts

@@ -157,13 +157,22 @@ export function getSemanticAttributesFromConnection(
 }
 
 export function getSemanticAttributesFromPool(params: PgPoolOptionsParams) {
+// const connectionParams = getConnectionParams(params);
+
+    let url: URL | undefined;
+    try {
+        url = params.connectionString ? new URL(params.connectionString) : undefined;
+    } catch (e) {
+        url = undefined;
+    }
+
   return {
     [SEMATTRS_DB_SYSTEM]: DBSYSTEMVALUES_POSTGRESQL,
-    [SEMATTRS_DB_NAME]: params.database, // required
+    [SEMATTRS_DB_NAME]: url?.pathname.slice(1) ?? params.database, // required
     [SEMATTRS_DB_CONNECTION_STRING]: getConnectionString(params), // required
-    [SEMATTRS_NET_PEER_NAME]: params.host, // required
-    [SEMATTRS_NET_PEER_PORT]: getPort(params.port),
-    [SEMATTRS_DB_USER]: params.user,
+    [SEMATTRS_NET_PEER_NAME]: url?.hostname ?? params.host, // required
+    [SEMATTRS_NET_PEER_PORT]: Number(url?.port) || getPort(params.port),
+    [SEMATTRS_DB_USER]: url?.username ?? params.user,
     [AttributeNames.IDLE_TIMEOUT_MILLIS]: params.idleTimeoutMillis,
     [AttributeNames.MAX_CLIENT]: params.maxClient,
   };

plugins/node/opentelemetry-instrumentation-pg/test/pg-pool.test.ts

@@ -226,16 +226,16 @@ describe('pg-pool', () => {
       const connectionString = `postgresql://${CONFIG.user}:${CONFIG.password}@${CONFIG.host}:${CONFIG.port}/${CONFIG.database}`;
       const poolWithConnString = new pgPool({
         connectionString,
+        idleTimeoutMillis: CONFIG.idleTimeoutMillis,
       });
 
       const expectedAttributes = {
         [SEMATTRS_DB_SYSTEM]: DBSYSTEMVALUES_POSTGRESQL,
         [SEMATTRS_DB_NAME]: CONFIG.database,
         [SEMATTRS_NET_PEER_NAME]: CONFIG.host,
-        [SEMATTRS_DB_CONNECTION_STRING]: connectionString,
+        [SEMATTRS_DB_CONNECTION_STRING]: `postgresql://${CONFIG.host}:${CONFIG.port}/${CONFIG.database}`,
         [SEMATTRS_NET_PEER_PORT]: CONFIG.port,
         [SEMATTRS_DB_USER]: CONFIG.user,
-        [AttributeNames.MAX_CLIENT]: CONFIG.maxClient,
         [AttributeNames.IDLE_TIMEOUT_MILLIS]: CONFIG.idleTimeoutMillis,
       };
 

plugins/node/opentelemetry-instrumentation-pg/test/utils.test.ts

@@ -292,7 +292,7 @@ describe('utils.ts', () => {
       const connectionString = 'not-a-valid-url';
       assert.strictEqual(
         utils.parseAndMaskConnectionString(connectionString),
-        'postgresql://localhost'
+        'postgresql://localhost:5432/'
       );
     });
   });