Merge remote-tracking branch 'origin/develop' into ab/gen-ai-span-v2-poc

Author: andreiborza

.size-limit.js

@@ -324,7 +324,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '59 KB',
+    limit: '60 KB',
   },
   // Node SDK (ESM)
   {

dev-packages/browser-integration-tests/suites/tracing/no-parent-span-client-report-streamed/init.js

@@ -0,0 +1,13 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  integrations: [
+    Sentry.browserTracingIntegration({ instrumentPageLoad: false, instrumentNavigation: false }),
+    Sentry.spanStreamingIntegration(),
+  ],
+  tracesSampleRate: 1,
+  sendClientReports: true,
+});

dev-packages/browser-integration-tests/suites/tracing/no-parent-span-client-report-streamed/subject.js

@@ -0,0 +1 @@
+fetch('http://sentry-test-site.example/api/test');

dev-packages/browser-integration-tests/suites/tracing/no-parent-span-client-report-streamed/test.ts

@@ -0,0 +1,45 @@
+import { expect } from '@playwright/test';
+import type { ClientReport } from '@sentry/core';
+import { sentryTest } from '../../../utils/fixtures';
+import {
+  envelopeRequestParser,
+  hidePage,
+  shouldSkipTracingTest,
+  testingCdnBundle,
+  waitForClientReportRequest,
+} from '../../../utils/helpers';
+
+sentryTest(
+  'records no_parent_span client report for fetch requests without an active span',
+  async ({ getLocalTestUrl, page }) => {
+    sentryTest.skip(shouldSkipTracingTest() || testingCdnBundle());
+
+    await page.route('http://sentry-test-site.example/api/test', route => {
+      route.fulfill({
+        status: 200,
+        body: 'ok',
+        headers: { 'Content-Type': 'text/plain' },
+      });
+    });
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    const clientReportPromise = waitForClientReportRequest(page, report => {
+      return report.discarded_events.some(e => e.reason === 'no_parent_span');
+    });
+
+    await page.goto(url);
+
+    await hidePage(page);
+
+    const clientReport = envelopeRequestParser<ClientReport>(await clientReportPromise);
+
+    expect(clientReport.discarded_events).toEqual([
+      {
+        category: 'span',
+        quantity: 1,
+        reason: 'no_parent_span',
+      },
+    ]);
+  },
+);

dev-packages/browser-integration-tests/suites/tracing/no-parent-span-client-report/init.js

@@ -0,0 +1,10 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  integrations: [Sentry.browserTracingIntegration({ instrumentPageLoad: false, instrumentNavigation: false })],
+  tracesSampleRate: 1,
+  sendClientReports: true,
+});

dev-packages/browser-integration-tests/suites/tracing/no-parent-span-client-report/subject.js

@@ -0,0 +1 @@
+fetch('http://sentry-test-site.example/api/test');

dev-packages/browser-integration-tests/suites/tracing/no-parent-span-client-report/test.ts

@@ -0,0 +1,45 @@
+import { expect } from '@playwright/test';
+import type { ClientReport } from '@sentry/core';
+import { sentryTest } from '../../../utils/fixtures';
+import {
+  envelopeRequestParser,
+  hidePage,
+  shouldSkipTracingTest,
+  testingCdnBundle,
+  waitForClientReportRequest,
+} from '../../../utils/helpers';
+
+sentryTest(
+  'records no_parent_span client report for fetch requests without an active span',
+  async ({ getLocalTestUrl, page }) => {
+    sentryTest.skip(shouldSkipTracingTest() || testingCdnBundle());
+
+    await page.route('http://sentry-test-site.example/api/test', route => {
+      route.fulfill({
+        status: 200,
+        body: 'ok',
+        headers: { 'Content-Type': 'text/plain' },
+      });
+    });
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    const clientReportPromise = waitForClientReportRequest(page, report => {
+      return report.discarded_events.some(e => e.reason === 'no_parent_span');
+    });
+
+    await page.goto(url);
+
+    await hidePage(page);
+
+    const clientReport = envelopeRequestParser<ClientReport>(await clientReportPromise);
+
+    expect(clientReport.discarded_events).toEqual([
+      {
+        category: 'span',
+        quantity: 1,
+        reason: 'no_parent_span',
+      },
+    ]);
+  },
+);

dev-packages/bun-integration-tests/expect.ts

@@ -68,7 +68,11 @@ export function expectedEvent(event: Event, { sdk }: { sdk: 'bun' | 'hono' }): E
 
 export function eventEnvelope(
   event: Event,
-  { includeSampleRand = false, sdk = 'bun' }: { includeSampleRand?: boolean; sdk?: 'bun' | 'hono' } = {},
+  {
+    includeSampleRand = false,
+    includeTransaction = true,
+    sdk = 'bun',
+  }: { includeSampleRand?: boolean; includeTransaction?: boolean; sdk?: 'bun' | 'hono' } = {},
 ): Envelope {
   return [
     {
@@ -79,11 +83,13 @@ export function eventEnvelope(
         environment: event.environment || 'production',
         public_key: 'public',
         trace_id: UUID_MATCHER,
+
         sample_rate: expect.any(String),
         sampled: expect.any(String),
         // release is auto-detected from GitHub CI env vars, so only expect it if we know it will be there
         ...(process.env.GITHUB_SHA ? { release: expect.any(String) } : {}),
         ...(includeSampleRand && { sample_rand: expect.stringMatching(/^[01](\.\d+)?$/) }),
+        ...(includeTransaction && { transaction: expect.any(String) }),
       },
     },
     [[{ type: 'event' }, expectedEvent(event, { sdk })]],

dev-packages/bun-integration-tests/suites/basic/test.ts

@@ -25,7 +25,7 @@ it('captures an error thrown in Bun.serve fetch handler', async ({ signal }) =>
             url: expect.stringContaining('/error'),
           }),
         },
-        { includeSampleRand: true },
+        { includeSampleRand: true, includeTransaction: false },
       ),
     )
     .ignore('transaction')

dev-packages/bun-integration-tests/suites/hono-sdk/index.ts

@@ -0,0 +1,31 @@
+import { sentry } from '@sentry/hono/bun';
+import { Hono } from 'hono';
+
+const app = new Hono();
+
+app.use(
+  sentry(app, {
+    dsn: process.env.SENTRY_DSN,
+    tracesSampleRate: 1.0,
+  }),
+);
+
+app.get('/', c => {
+  return c.text('Hello from Hono on Bun!');
+});
+
+app.get('/hello/:name', c => {
+  const name = c.req.param('name');
+  return c.text(`Hello, ${name}!`);
+});
+
+app.get('/error/:param', () => {
+  throw new Error('Test error from Hono app');
+});
+
+const server = Bun.serve({
+  port: 0,
+  fetch: app.fetch,
+});
+
+process.send?.(JSON.stringify({ event: 'READY', port: server.port }));