Merge branch 'getsentry:develop' into feat/graphqlClientIntegration

Author: Zen-cronic

CHANGELOG.md

@@ -10,7 +10,7 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-Work in this release was contributed by @tjhiggins, @chris-basebone, @GrizliK1988, @davidturissini, @nwalters512, @aloisklink, @arturovt, @benjick, @maximepvrt, @mstrokin, @kunal-511, @jahands, @jrandolf, @Zen-cronic and @nathankleyn. Thank you for your contributions!
+Work in this release was contributed by @tjhiggins, @chris-basebone, @GrizliK1988, @davidturissini, @nwalters512, @aloisklink, @arturovt, @benjick, @maximepvrt, @mstrokin, @kunal-511, @jahands, @jrandolf, @tannerlinsley, @Zen-cronic and @nathankleyn. Thank you for your contributions!
 
 ## 9.0.0-alpha.0
 

dev-packages/e2e-tests/test-applications/sveltekit-2-twp/.gitignore renamed to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/.gitignore

@@ -1,5 +1,5 @@
 {
-  "name": "sveltekit-2-svelte-5",
+  "name": "sveltekit-2.5.0-twp",
   "version": "0.0.1",
   "private": true,
   "scripts": {
@@ -22,7 +22,7 @@
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@sentry/core": "latest || *",
     "@sveltejs/adapter-auto": "^3.0.0",
-    "@sveltejs/kit": "^2.0.0",
+    "@sveltejs/kit": "2.5.0",
     "@sveltejs/vite-plugin-svelte": "^3.0.0",
     "svelte": "^5.0.0-next.115",
     "svelte-check": "^3.6.0",

dev-packages/e2e-tests/test-applications/sveltekit-2-twp/.npmrc renamed to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/.npmrc

@@ -2,5 +2,5 @@ import { startEventProxyServer } from '@sentry-internal/test-utils';
 
 startEventProxyServer({
   port: 3031,
-  proxyServerName: 'sveltekit-2-twp',
+  proxyServerName: 'sveltekit-2.5.0-twp',
 });

dev-packages/e2e-tests/test-applications/sveltekit-2-twp/README.md renamed to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/README.md

@@ -2,11 +2,11 @@ import { expect, test } from '@playwright/test';
 import { waitForError } from '@sentry-internal/test-utils';
 
 test('errors on frontend and backend are connected by the same trace', async ({ page }) => {
-  const clientErrorPromise = waitForError('sveltekit-2-twp', evt => {
+  const clientErrorPromise = waitForError('sveltekit-2.5.0-twp', evt => {
     return evt.exception?.values?.[0].value === 'Client Error';
   });
 
-  const serverErrorPromise = waitForError('sveltekit-2-twp', evt => {
+  const serverErrorPromise = waitForError('sveltekit-2.5.0-twp', evt => {
     return evt.exception?.values?.[0].value === 'No search query provided';
   });
 

dev-packages/e2e-tests/test-applications/sveltekit-2-twp/package.json renamed to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/package.json

@@ -0,0 +1,16 @@
+import { expect, test } from '@playwright/test';
+
+test.describe('SDK-internal behavior', () => {
+  test('Injects fetch proxy script for SvelteKit<2.16.0', async ({ page }) => {
+    await page.goto('/');
+
+    const sentryCarrier = await page.evaluate('typeof window.__SENTRY__');
+    const proxyHandle = await page.evaluate('typeof window._sentryFetchProxy');
+
+    // sanity check
+    expect(sentryCarrier).toBe('object');
+
+    // fetch proxy script ran
+    expect(proxyHandle).toBe('function');
+  });
+});

dev-packages/e2e-tests/test-applications/sveltekit-2-twp/playwright.config.mjs renamed to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/playwright.config.mjs

@@ -23,7 +23,7 @@
     "@sentry/core": "latest || *",
     "@sveltejs/adapter-auto": "^3.0.0",
     "@sveltejs/adapter-node": "^2.0.0",
-    "@sveltejs/kit": "^2.5.0",
+    "@sveltejs/kit": "^2.16.0",
     "@sveltejs/vite-plugin-svelte": "^3.0.0",
     "svelte": "^4.2.8",
     "svelte-check": "^3.6.0",

dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/app.d.ts renamed to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/app.d.ts

@@ -0,0 +1,16 @@
+import { expect, test } from '@playwright/test';
+import { waitForInitialPageload } from './utils';
+
+test.describe('SDK-internal behavior', () => {
+  test("Doesn't inject fetch proxy script for SvelteKit>=2.16.0", async ({ page }) => {
+    await waitForInitialPageload(page, { route: '/' });
+    const sentryCarrier = await page.evaluate('typeof window.__SENTRY__');
+    const proxyHandle = await page.evaluate('typeof window._sentryFetchProxy');
+
+    // sanity check
+    expect(sentryCarrier).toBe('object');
+
+    // fetch proxy script didn't run
+    expect(proxyHandle).toBe('undefined');
+  });
+});

dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/app.html renamed to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/app.html

@@ -0,0 +1,61 @@
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+import * as Sentry from '@sentry/node';
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  release: '1.0',
+  tracePropagationTargets: [/\/v0/, 'v1'],
+  integrations: [Sentry.httpIntegration({ spans: false })],
+  transport: loggingTransport,
+  // Ensure this gets a correct hint
+  beforeBreadcrumb(breadcrumb, hint) {
+    breadcrumb.data = breadcrumb.data || {};
+    const req = hint?.request as { path?: string };
+    breadcrumb.data.ADDED_PATH = req?.path;
+    return breadcrumb;
+  },
+});
+
+import * as http from 'http';
+
+async function run(): Promise<void> {
+  Sentry.addBreadcrumb({ message: 'manual breadcrumb' });
+
+  await makeHttpRequest(`${process.env.SERVER_URL}/api/v0`);
+  await makeHttpGet(`${process.env.SERVER_URL}/api/v1`);
+  await makeHttpRequest(`${process.env.SERVER_URL}/api/v2`);
+  await makeHttpRequest(`${process.env.SERVER_URL}/api/v3`);
+
+  Sentry.captureException(new Error('foo'));
+}
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+run();
+
+function makeHttpRequest(url: string): Promise<void> {
+  return new Promise<void>(resolve => {
+    http
+      .request(url, httpRes => {
+        httpRes.on('data', () => {
+          // we don't care about data
+        });
+        httpRes.on('end', () => {
+          resolve();
+        });
+      })
+      .end();
+  });
+}
+
+function makeHttpGet(url: string): Promise<void> {
+  return new Promise<void>(resolve => {
+    http.get(url, httpRes => {
+      httpRes.on('data', () => {
+        // we don't care about data
+      });
+      httpRes.on('end', () => {
+        resolve();
+      });
+    });
+  });
+}

dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/hooks.client.ts renamed to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/hooks.client.ts

@@ -0,0 +1,95 @@
+import { createRunner } from '../../../../utils/runner';
+import { createTestServer } from '../../../../utils/server';
+
+test('outgoing http requests are correctly instrumented with tracing & spans disabled', done => {
+  expect.assertions(11);
+
+  createTestServer(done)
+    .get('/api/v0', headers => {
+      expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+      expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
+      expect(headers['baggage']).toEqual(expect.any(String));
+    })
+    .get('/api/v1', headers => {
+      expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+      expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
+      expect(headers['baggage']).toEqual(expect.any(String));
+    })
+    .get('/api/v2', headers => {
+      expect(headers['baggage']).toBeUndefined();
+      expect(headers['sentry-trace']).toBeUndefined();
+    })
+    .get('/api/v3', headers => {
+      expect(headers['baggage']).toBeUndefined();
+      expect(headers['sentry-trace']).toBeUndefined();
+    })
+    .start()
+    .then(([SERVER_URL, closeTestServer]) => {
+      createRunner(__dirname, 'scenario.ts')
+        .withEnv({ SERVER_URL })
+        .ensureNoErrorOutput()
+        .expect({
+          event: {
+            exception: {
+              values: [
+                {
+                  type: 'Error',
+                  value: 'foo',
+                },
+              ],
+            },
+            breadcrumbs: [
+              {
+                message: 'manual breadcrumb',
+                timestamp: expect.any(Number),
+              },
+              {
+                category: 'http',
+                data: {
+                  'http.method': 'GET',
+                  url: `${SERVER_URL}/api/v0`,
+                  status_code: 200,
+                  ADDED_PATH: '/api/v0',
+                },
+                timestamp: expect.any(Number),
+                type: 'http',
+              },
+              {
+                category: 'http',
+                data: {
+                  'http.method': 'GET',
+                  url: `${SERVER_URL}/api/v1`,
+                  status_code: 200,
+                  ADDED_PATH: '/api/v1',
+                },
+                timestamp: expect.any(Number),
+                type: 'http',
+              },
+              {
+                category: 'http',
+                data: {
+                  'http.method': 'GET',
+                  url: `${SERVER_URL}/api/v2`,
+                  status_code: 200,
+                  ADDED_PATH: '/api/v2',
+                },
+                timestamp: expect.any(Number),
+                type: 'http',
+              },
+              {
+                category: 'http',
+                data: {
+                  'http.method': 'GET',
+                  url: `${SERVER_URL}/api/v3`,
+                  status_code: 200,
+                  ADDED_PATH: '/api/v3',
+                },
+                timestamp: expect.any(Number),
+                type: 'http',
+              },
+            ],
+          },
+        })
+        .start(closeTestServer);
+    });
+});

dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/hooks.server.ts renamed to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/hooks.server.ts

@@ -130,7 +130,7 @@ function baggageHeaderToObject(baggageHeader: string): Record<string, string> {
  * @returns a baggage header string, or `undefined` if the object didn't have any values, since an empty baggage header
  * is not spec compliant.
  */
-function objectToBaggageHeader(object: Record<string, string>): string | undefined {
+export function objectToBaggageHeader(object: Record<string, string>): string | undefined {
   if (Object.keys(object).length === 0) {
     // An empty baggage header is not spec compliant: We return undefined.
     return undefined;

dev-packages/e2e-tests/test-applications/sveltekit-2-twp/src/routes/+layout.svelte renamed to dev-packages/e2e-tests/test-applications/sveltekit-2.5.0-twp/src/routes/+layout.svelte

@@ -130,6 +130,7 @@ export {
   baggageHeaderToDynamicSamplingContext,
   dynamicSamplingContextToSentryBaggageHeader,
   parseBaggageHeader,
+  objectToBaggageHeader,
 } from './baggage';
 
 export { getSanitizedUrlString, parseUrl, stripUrlQueryAndFragment } from './url';