apply review feedback

Author: Lms24

packages/server-utils/src/integrations/knex.ts

@@ -153,6 +153,7 @@ function subscribeBuilder(channelName: string): void {
 function subscribeQuery(): void {
   bindTracingChannelToSpan<KnexQueryChannelContext>(
     diagnosticsChannel.tracingChannel<KnexQueryChannelContext>(CHANNELS.KNEX_QUERY),
+    // oxlint-disable-next-line complexity
     data => {
       const runner = data.self;
       const builder = runner?.builder;
@@ -175,10 +176,9 @@ function subscribeQuery(): void {
       const dbSystem = mapSystem(client?.driverName);
 
       const dbStatement = query?.sql != null ? truncate(query.sql, MAX_QUERY_LENGTH) : undefined;
-      // The statement is sanitized before it is summarized, so that a string literal containing
-      // `from`/`join` can't leak a value into the summary.
+      const dialect = client?.driverName === 'mysql' || client?.driverName === 'mysql2' ? 'mysql' : undefined;
       const querySummary = dbStatement
-        ? _INTERNAL_getSqlQuerySummary(_INTERNAL_sanitizeSqlQuery(dbStatement))
+        ? _INTERNAL_getSqlQuerySummary(_INTERNAL_sanitizeSqlQuery(dbStatement, dialect))
         : undefined;
       const attributes: SpanAttributes = {
         [SENTRY_OP]: DB,

packages/server-utils/src/integrations/tedious.ts

@@ -156,8 +156,8 @@ function subscribeQuery(channelName: string, operation: string): void {
     const span = startInactiveSpan({
       name:
         client && hasSpanStreamingEnabled(client)
-          ? (querySummary ?? getLowCardinalitySecondarySpanName(operation, databaseName, sql, request.table))
-          : sql || getSecondarySpanName(operation, databaseName, sql, request.table),
+          ? querySummary || getLowCardinalitySecondarySpanName(operation, databaseName, sql, request.table)
+          : sql || getSecondarySpanName(operation, databaseName, request.table),
       attributes,
     });
 
@@ -209,22 +209,12 @@ function extractSql(request: TediousRequest): string | undefined {
 }
 
 /**
- * The span name is a low-cardinality label for the operation; the SDK's db-span inference later renames
- * the span description off `db.query.text` when present. Mirrors the vendored OTel `getSpanName`.
+ * Get a secondary span name for static trace lifecycle (not strictly adhering to sentry-convention span names)
  */
-function getSecondarySpanName(
-  operation: string,
-  db: string | undefined,
-  sql: string | undefined,
-  bulkLoadTable: string | undefined,
-): string {
+function getSecondarySpanName(operation: string, db: string | undefined, bulkLoadTable: string | undefined): string {
   if (operation === 'execBulkLoad' && bulkLoadTable && db) {
     return `${operation} ${bulkLoadTable} ${db}`;
   }
-  if (operation === 'callProcedure' && sql) {
-    // `sql` refers to the procedure name for `callProcedure`.
-    return db ? `${operation} ${sql} ${db}` : `${operation} ${sql}`;
-  }
   // Avoid `sql` in the general case because of its high cardinality.
   return db ? `${operation} ${db}` : operation;
 }