Fix integration tests, add more representative e2e test

Author: andreiborza

dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/app.ts

@@ -62,6 +62,16 @@ app.get('/test-exception/:id', function (req, _res) {
   throw new Error(`This is an exception with id ${id}`);
 });
 
+app.get('/test-logs/:id', function (req, res) {
+  const id = req.params.id;
+
+  Sentry.startSpan({ name: `log-operation-${id}` }, () => {
+    Sentry.logger.info(`test-log-${id}`, { requestId: id });
+  });
+
+  res.send({ ok: true, id });
+});
+
 Sentry.setupExpressErrorHandler(app);
 
 app.use(function onError(err: unknown, req: any, res: any, next: any) {

dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/instrument.ts

@@ -17,6 +17,7 @@ Sentry.init({
   // Tracing is completely disabled
   // Custom OTEL setup
   skipOpenTelemetrySetup: true,
+  enableLogs: true,
 });
 
 // Create and configure NodeTracerProvider

dev-packages/e2e-tests/test-applications/node-otel-without-tracing/tests/logs.test.ts

@@ -0,0 +1,42 @@
+import { expect, test } from '@playwright/test';
+import { waitForEnvelopeItem } from '@sentry-internal/test-utils';
+
+test('Logs from different requests have different trace IDs', async ({ baseURL }) => {
+  const logEnvelopePromise1 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
+    const [itemHeader, itemPayload] = envelopeItem;
+    if (itemHeader.type === 'log') {
+      const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
+      return logItems.items.some(item => item.body === 'test-log-1');
+    }
+    return false;
+  });
+
+  const logEnvelopePromise2 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
+    const [itemHeader, itemPayload] = envelopeItem;
+    if (itemHeader.type === 'log') {
+      const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
+      return logItems.items.some(item => item.body === 'test-log-2');
+    }
+    return false;
+  });
+
+  // Make two requests to different routes (each Express route is an isolation scope)
+  await fetch(`${baseURL}/test-logs/1`);
+  await fetch(`${baseURL}/test-logs/2`);
+
+  const logEnvelope1 = await logEnvelopePromise1;
+  const logEnvelope2 = await logEnvelopePromise2;
+
+  const logPayload1 = logEnvelope1[1] as { items: Array<{ body: string; trace_id?: string }> };
+  const logPayload2 = logEnvelope2[1] as { items: Array<{ body: string; trace_id?: string }> };
+
+  const log1 = logPayload1.items.find(item => item.body === 'test-log-1');
+  const log2 = logPayload2.items.find(item => item.body === 'test-log-2');
+
+  const traceId1 = log1?.trace_id;
+  const traceId2 = log2?.trace_id;
+
+  expect(traceId1).toMatch(/[a-f0-9]{32}/);
+  expect(traceId2).toMatch(/[a-f0-9]{32}/);
+  expect(traceId1).not.toBe(traceId2);
+});

dev-packages/node-integration-tests/suites/pino/instrument-auto-off.mjs

@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   release: '1.0',
+  tracesSampleRate: 1.0,
   enableLogs: true,
   integrations: [Sentry.pinoIntegration({ autoInstrument: false })],
 });

dev-packages/node-integration-tests/suites/pino/instrument.mjs

@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   release: '1.0',
+  tracesSampleRate: 1.0,
   enableLogs: true,
   integrations: [Sentry.pinoIntegration({ error: { levels: ['error', 'fatal'] } })],
 });

dev-packages/node-integration-tests/suites/pino/test.ts

@@ -11,6 +11,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
       .withMockSentryServer()
       .withInstrument(instrumentPath)
       .ignore('event')
+      .ignore('transaction')
       .expect({
         log: log => {
           const traceId1 = log.items?.[0]?.trace_id;
@@ -28,6 +29,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
     await createRunner(__dirname, 'scenario.mjs')
       .withMockSentryServer()
       .withInstrument(instrumentPath)
+      .ignore('transaction')
       .expect({
         event: {
           exception: {
@@ -105,6 +107,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
     await createRunner(__dirname, 'scenario-next.mjs')
       .withMockSentryServer()
       .withInstrument(instrumentPath)
+      .ignore('transaction')
       .expect({
         event: {
           exception: {
@@ -182,6 +185,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
     await createRunner(__dirname, 'scenario-track.mjs')
       .withMockSentryServer()
       .withInstrument(instrumentPath)
+      .ignore('transaction')
       .expect({
         log: {
           items: [