Merge branch 'develop' into feat/knexIntegration-node

Author: AbhiPrasad

dev-packages/e2e-tests/test-applications/react-router-6/tests/sse.test.ts

@@ -66,8 +66,12 @@ test('Waits for sse streaming when sse has been explicitly aborted', async ({ pa
   expect(resolveBodyDuration).toBe(0);
 
   // validate abort error was thrown by inspecting console
-  const consoleBreadcrumb = rootSpan.breadcrumbs?.find(breadcrumb => breadcrumb.category === 'console');
-  expect(consoleBreadcrumb?.message).toBe('Could not fetch sse AbortError: BodyStreamBuffer was aborted');
+  expect(rootSpan.breadcrumbs).toContainEqual(
+    expect.objectContaining({
+      category: 'console',
+      message: 'Could not fetch sse AbortError: BodyStreamBuffer was aborted',
+    }),
+  );
 });
 
 test('Aborts when stream takes longer than 5s, by not updating the span duration', async ({ page }) => {

dev-packages/node-integration-tests/package.json

@@ -66,6 +66,7 @@
     "redis-4": "npm:redis@^4.6.14",
     "reflect-metadata": "0.2.1",
     "rxjs": "^7.8.1",
+    "tedious": "^18.6.1",
     "yargs": "^16.2.0"
   },
   "devDependencies": {

dev-packages/node-integration-tests/suites/tracing/tedious/docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3.9'
+
+services:
+  db:
+    image: mcr.microsoft.com/mssql/server:2022-latest
+    restart: always
+    container_name: integration-tests-tedious
+    ports:
+      - '1433:1433'
+    environment:
+      ACCEPT_EULA: 'Y'
+      MSSQL_SA_PASSWORD: 'TESTing123'

dev-packages/node-integration-tests/suites/tracing/tedious/scenario.js

@@ -0,0 +1,65 @@
+const { loggingTransport } = require('@sentry-internal/node-integration-tests');
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  transport: loggingTransport,
+});
+
+const { Connection, Request } = require('tedious');
+
+const config = {
+  server: '127.0.0.1',
+  authentication: {
+    type: 'default',
+    options: {
+      userName: 'sa',
+      password: 'TESTing123',
+    },
+  },
+  options: {
+    port: 1433,
+    encrypt: false,
+  },
+};
+
+const connection = new Connection(config);
+
+function executeAllStatements(span) {
+  executeStatement('SELECT 1 + 1 AS solution', () => {
+    executeStatement('SELECT GETDATE()', () => {
+      span.end();
+      connection.close();
+    });
+  });
+}
+
+function executeStatement(query, callback) {
+  const request = new Request(query, err => {
+    if (err) {
+      throw err;
+    }
+    callback();
+  });
+
+  connection.execSql(request);
+}
+
+connection.connect(err => {
+  if (err) {
+    throw err;
+  }
+
+  Sentry.startSpanManual(
+    {
+      op: 'transaction',
+      name: 'Test Transaction',
+    },
+    span => {
+      // span must be ended manually after all queries
+      executeAllStatements(span);
+    },
+  );
+});

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

@@ -0,0 +1,53 @@
+import { conditionalTest } from '../../../utils';
+import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
+
+jest.setTimeout(75000);
+
+// Tedious version we are testing against only supports Node 18+
+// https://github.com/tediousjs/tedious/blob/8310c455a2cc1cba83c1ca3c16677da4f83e12a9/package.json#L38
+conditionalTest({ min: 18 })('tedious auto instrumentation', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  test('should auto-instrument `tedious` package', done => {
+    const EXPECTED_TRANSACTION = {
+      transaction: 'Test Transaction',
+      spans: expect.arrayContaining([
+        expect.objectContaining({
+          description: 'SELECT GETDATE()',
+          data: expect.objectContaining({
+            'sentry.origin': 'auto.db.otel.tedious',
+            'sentry.op': 'db',
+            'db.name': 'master',
+            'db.statement': 'SELECT GETDATE()',
+            'db.system': 'mssql',
+            'db.user': 'sa',
+            'net.peer.name': '127.0.0.1',
+            'net.peer.port': 1433,
+          }),
+          status: 'ok',
+        }),
+        expect.objectContaining({
+          description: 'SELECT 1 + 1 AS solution',
+          data: expect.objectContaining({
+            'sentry.origin': 'auto.db.otel.tedious',
+            'sentry.op': 'db',
+            'db.name': 'master',
+            'db.statement': 'SELECT 1 + 1 AS solution',
+            'db.system': 'mssql',
+            'db.user': 'sa',
+            'net.peer.name': '127.0.0.1',
+            'net.peer.port': 1433,
+          }),
+          status: 'ok',
+        }),
+      ]),
+    };
+
+    createRunner(__dirname, 'scenario.js')
+      .withDockerCompose({ workingDirectory: [__dirname], readyMatches: ['1433'] })
+      .expect({ transaction: EXPECTED_TRANSACTION })
+      .start(done);
+  });
+});

packages/astro/src/index.server.ts

@@ -126,6 +126,7 @@ export {
   startSession,
   startSpan,
   startSpanManual,
+  tediousIntegration,
   trpcMiddleware,
   withActiveSpan,
   withIsolationScope,

packages/aws-serverless/src/index.ts

@@ -100,6 +100,7 @@ export {
   mysqlIntegration,
   mysql2Integration,
   redisIntegration,
+  tediousIntegration,
   nestIntegration,
   setupNestErrorHandler,
   postgresIntegration,

packages/browser/src/profiling/utils.ts

@@ -1,21 +1,11 @@
 /* eslint-disable max-lines */
 
 import { DEFAULT_ENVIRONMENT, getClient, spanToJSON } from '@sentry/core';
-import type {
-  DebugImage,
-  Envelope,
-  Event,
-  EventEnvelope,
-  Profile,
-  Span,
-  StackFrame,
-  StackParser,
-  ThreadCpuProfile,
-} from '@sentry/types';
+import type { DebugImage, Envelope, Event, EventEnvelope, Profile, Span, ThreadCpuProfile } from '@sentry/types';
 import {
-  GLOBAL_OBJ,
   browserPerformanceTimeOrigin,
   forEachEnvelopeItem,
+  getDebugImagesForResources,
   logger,
   timestampInSeconds,
   uuid4,
@@ -352,17 +342,10 @@ export function findProfiledTransactionsFromEnvelope(envelope: Envelope): Event[
   return events;
 }
 
-const debugIdStackParserCache = new WeakMap<StackParser, Map<string, StackFrame[]>>();
 /**
  * Applies debug meta data to an event from a list of paths to resources (sourcemaps)
  */
 export function applyDebugMetadata(resource_paths: ReadonlyArray<string>): DebugImage[] {
-  const debugIdMap = GLOBAL_OBJ._sentryDebugIds;
-
-  if (!debugIdMap) {
-    return [];
-  }
-
   const client = getClient();
   const options = client && client.getOptions();
   const stackParser = options && options.stackParser;
@@ -371,51 +354,7 @@ export function applyDebugMetadata(resource_paths: ReadonlyArray<string>): Debug
     return [];
   }
 
-  let debugIdStackFramesCache: Map<string, StackFrame[]>;
-  const cachedDebugIdStackFrameCache = debugIdStackParserCache.get(stackParser);
-  if (cachedDebugIdStackFrameCache) {
-    debugIdStackFramesCache = cachedDebugIdStackFrameCache;
-  } else {
-    debugIdStackFramesCache = new Map<string, StackFrame[]>();
-    debugIdStackParserCache.set(stackParser, debugIdStackFramesCache);
-  }
-
-  // Build a map of filename -> debug_id
-  const filenameDebugIdMap = Object.keys(debugIdMap).reduce<Record<string, string>>((acc, debugIdStackTrace) => {
-    let parsedStack: StackFrame[];
-
-    const cachedParsedStack = debugIdStackFramesCache.get(debugIdStackTrace);
-    if (cachedParsedStack) {
-      parsedStack = cachedParsedStack;
-    } else {
-      parsedStack = stackParser(debugIdStackTrace);
-      debugIdStackFramesCache.set(debugIdStackTrace, parsedStack);
-    }
-
-    for (let i = parsedStack.length - 1; i >= 0; i--) {
-      const stackFrame = parsedStack[i];
-      const file = stackFrame && stackFrame.filename;
-
-      if (stackFrame && file) {
-        acc[file] = debugIdMap[debugIdStackTrace] as string;
-        break;
-      }
-    }
-    return acc;
-  }, {});
-
-  const images: DebugImage[] = [];
-  for (const path of resource_paths) {
-    if (path && filenameDebugIdMap[path]) {
-      images.push({
-        type: 'sourcemap',
-        code_file: path,
-        debug_id: filenameDebugIdMap[path] as string,
-      });
-    }
-  }
-
-  return images;
+  return getDebugImagesForResources(stackParser, resource_paths);
 }
 
 /**

packages/bun/src/index.ts

@@ -121,6 +121,7 @@ export {
   mysqlIntegration,
   mysql2Integration,
   redisIntegration,
+  tediousIntegration,
   nestIntegration,
   setupNestErrorHandler,
   postgresIntegration,

packages/core/src/utils/prepareEvent.ts

@@ -6,10 +6,16 @@ import type {
   EventHint,
   Scope as ScopeInterface,
   ScopeContext,
-  StackFrame,
   StackParser,
 } from '@sentry/types';
-import { GLOBAL_OBJ, addExceptionMechanism, dateTimestampInSeconds, normalize, truncate, uuid4 } from '@sentry/utils';
+import {
+  addExceptionMechanism,
+  dateTimestampInSeconds,
+  getFilenameToDebugIdMap,
+  normalize,
+  truncate,
+  uuid4,
+} from '@sentry/utils';
 
 import { DEFAULT_ENVIRONMENT } from '../constants';
 import { getGlobalScope } from '../currentScopes';
@@ -161,51 +167,12 @@ function applyClientOptions(event: Event, options: ClientOptions): void {
   }
 }
 
-const debugIdStackParserCache = new WeakMap<StackParser, Map<string, StackFrame[]>>();
-
 /**
  * Puts debug IDs into the stack frames of an error event.
  */
 export function applyDebugIds(event: Event, stackParser: StackParser): void {
-  const debugIdMap = GLOBAL_OBJ._sentryDebugIds;
-
-  if (!debugIdMap) {
-    return;
-  }
-
-  let debugIdStackFramesCache: Map<string, StackFrame[]>;
-  const cachedDebugIdStackFrameCache = debugIdStackParserCache.get(stackParser);
-  if (cachedDebugIdStackFrameCache) {
-    debugIdStackFramesCache = cachedDebugIdStackFrameCache;
-  } else {
-    debugIdStackFramesCache = new Map<string, StackFrame[]>();
-    debugIdStackParserCache.set(stackParser, debugIdStackFramesCache);
-  }
-
   // Build a map of filename -> debug_id
-  const filenameDebugIdMap = Object.entries(debugIdMap).reduce<Record<string, string>>(
-    (acc, [debugIdStackTrace, debugIdValue]) => {
-      let parsedStack: StackFrame[];
-      const cachedParsedStack = debugIdStackFramesCache.get(debugIdStackTrace);
-      if (cachedParsedStack) {
-        parsedStack = cachedParsedStack;
-      } else {
-        parsedStack = stackParser(debugIdStackTrace);
-        debugIdStackFramesCache.set(debugIdStackTrace, parsedStack);
-      }
-
-      for (let i = parsedStack.length - 1; i >= 0; i--) {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const stackFrame = parsedStack[i]!;
-        if (stackFrame.filename) {
-          acc[stackFrame.filename] = debugIdValue;
-          break;
-        }
-      }
-      return acc;
-    },
-    {},
-  );
+  const filenameDebugIdMap = getFilenameToDebugIdMap(stackParser);
 
   try {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion