Improve span naming and type safety

Author: onurtemizkan

dev-packages/node-integration-tests/suites/tracing/postgresjs/test.ts

@@ -5,7 +5,7 @@ const EXISTING_TEST_EMAIL = 'bar@baz.com';
 const NON_EXISTING_TEST_EMAIL = 'foo@baz.com';
 
 // Helper function to create basic span matcher (reduces duplication in new tests)
-function createDbSpanMatcher(operationName: string, descriptionMatcher: any = expect.any(String)) {
+function createDbSpanMatcher(operationName: string, descriptionMatcher: unknown = expect.any(String)) {
   return expect.objectContaining({
     data: expect.objectContaining({
       'db.namespace': 'test_db',

packages/node/src/integrations/tracing/postgresjs.ts

@@ -360,11 +360,14 @@ export class PostgresJsInstrumentation extends InstrumentationBase<PostgresJsIns
 
       const sanitizedSqlQuery = self._sanitizeSqlQuery(query.strings?.[0]);
 
-      let spanName = sanitizedSqlQuery?.trim() || '';
-      if (!spanName) {
-        // Fallback: try to extract operation from the sanitized query
-        const operationMatch = sanitizedSqlQuery?.match(SQL_OPERATION_REGEX);
-        spanName = operationMatch?.[1] ? `db.${operationMatch[1].toLowerCase()}` : 'db.query';
+      let spanName: string;
+      const operationMatch = sanitizedSqlQuery?.match(SQL_OPERATION_REGEX);
+      if (operationMatch?.[1]) {
+        spanName = `db.${operationMatch[1].toLowerCase()}`;
+      } else if (sanitizedSqlQuery?.trim()) {
+        spanName = sanitizedSqlQuery.trim();
+      } else {
+        spanName = 'db.query';
       }
 
       return startSpanManual(