From 802c26013c65fcc6b2e94f8b0b46cf14443ea81c Mon Sep 17 00:00:00 2001
From: GochoMugo <mugo@forfuture.co.ke>
Date: Sat, 6 Dec 2025 07:16:37 +0300
Subject: [PATCH] fix(pg-instrumentation): capture query props when passed as
 class instance

---
 .../instrumentation-pg/src/instrumentation.ts | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/packages/instrumentation-pg/src/instrumentation.ts b/packages/instrumentation-pg/src/instrumentation.ts
index 87811bd8a2..a8124a370d 100644
--- a/packages/instrumentation-pg/src/instrumentation.ts
+++ b/packages/instrumentation-pg/src/instrumentation.ts
@@ -333,24 +333,21 @@ export class PgInstrumentation extends InstrumentationBase<PgInstrumentationConf
         // TODO: remove the `as ...` casts below when the TS version is upgraded.
         // Newer TS versions will use the result of firstArgIsQueryObjectWithText
         // to properly narrow arg0, but TS 4.3.5 does not.
-        let queryConfig: any;
-
-        if (firstArgIsString) {
-          queryConfig = {
-            text: arg0 as string,
-            values: Array.isArray(args[1]) ? args[1] : undefined,
-          };
-        } else if (firstArgIsQueryObjectWithText) {
-          const q = arg0 as any;
-
-          if (q.values === undefined && Array.isArray(args[1])) {
-            q.values = args[1];
-          }
-
-          queryConfig = q;
-        } else {
-          queryConfig = undefined;
-        }
+        const queryConfig = firstArgIsString
+          ? {
+              text: arg0 as string,
+              values: Array.isArray(args[1]) ? args[1] : undefined,
+            }
+          : firstArgIsQueryObjectWithText
+            ? {
+                ...(arg0 as any),
+                name: arg0.name,
+                text: arg0.text,
+                values:
+                  (arg0 as any).values ??
+                  (Array.isArray(args[1]) ? args[1] : undefined),
+              }
+            : undefined;
 
         const attributes: Attributes = {
           [ATTR_DB_SYSTEM]: DB_SYSTEM_VALUE_POSTGRESQL,