Merge branch 'main' into trentm-semconv-up-ioredis

Author: trentm

.github/workflows/ossf-scorecard.yml

@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@d3ced5c96c16c4332e2a61eb6f3649d6f1b20bb8 # v3.31.5
+        uses: github/codeql-action/upload-sarif@497990dfed22177a82ba1bbab381bc8f6d27058f # v3.31.6
         with:
           sarif_file: results.sarif

package-lock.json

@@ -71,7 +71,7 @@
     "karma-mocha": "2.0.1",
     "karma-spec-reporter": "0.0.36",
     "karma-webpack": "5.0.1",
-    "lerna": "9.0.1",
+    "lerna": "9.0.3",
     "markdownlint-cli2": "0.19.1",
     "minimatch": "9.0.5",
     "mocha": "11.7.5",

package.json

@@ -333,19 +333,24 @@ 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.
-        const queryConfig = firstArgIsString
-          ? {
-              text: arg0 as string,
-              values: Array.isArray(args[1]) ? args[1] : undefined,
-            }
-          : firstArgIsQueryObjectWithText
-            ? {
-                ...(arg0 as any),
-                values:
-                  (arg0 as any).values ??
-                  (Array.isArray(args[1]) ? args[1] : undefined),
-              }
-            : undefined;
+        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 attributes: Attributes = {
           [ATTR_DB_SYSTEM]: DB_SYSTEM_VALUE_POSTGRESQL,