Merge pull request #17298 from getsentry/prepare-release/10.1.0

meta(changelog): Update changelog for 10.1.0

Author: andreiborza

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 10.1.0
+
+- feat(nuxt): Align build-time options to follow bundler plugins structure ([#17255](https://github.com/getsentry/sentry-javascript/pull/17255))
+- fix(browser-utils): Ensure web vital client hooks unsubscribe correctly ([#17272](https://github.com/getsentry/sentry-javascript/pull/17272))
+- fix(browser): Ensure request from `diagnoseSdkConnectivity` doesn't create span ([#17280](https://github.com/getsentry/sentry-javascript/pull/17280))
+
 ## 10.0.0
 
 Version `10.0.0` marks a release of the Sentry JavaScript SDKs that contains breaking changes. The goal of this release is to primarily upgrade the underlying OpenTelemetry dependencies to v2 with minimal breaking changes.

dev-packages/browser-integration-tests/suites/public-api/diagnoseSdkConnectivity/init.js

@@ -0,0 +1,9 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  integrations: [Sentry.browserTracingIntegration({ idleTimeout: 3000, childSpanTimeout: 3000 })],
+  tracesSampleRate: 1,
+});

dev-packages/browser-integration-tests/suites/public-api/diagnoseSdkConnectivity/subject.js

@@ -0,0 +1 @@
+Sentry.diagnoseSdkConnectivity().then(res => console.log('SDK connectivity:', res));

dev-packages/browser-integration-tests/suites/public-api/diagnoseSdkConnectivity/test.ts

@@ -0,0 +1,49 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../utils/fixtures';
+import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../utils/helpers';
+
+sentryTest('makes a call to sentry.io to diagnose SDK connectivity', async ({ getLocalTestUrl, page }) => {
+  const bundle = process.env.PW_BUNDLE as string | undefined;
+  if (shouldSkipTracingTest() || !!bundle) {
+    // the CDN bundle doesn't export diagnoseSdkConnectivity. So skipping the test for bundles.
+    sentryTest.skip();
+  }
+
+  const pageloadRequestPromise = waitForTransactionRequest(page, e => e.contexts?.trace?.op === 'pageload');
+
+  // mock sdk connectivity url to avoid making actual request to sentry.io
+  page.route('**/api/4509632503087104/envelope/**/*', route => {
+    return route.fulfill({
+      status: 200,
+      body: '{}',
+    });
+  });
+
+  const diagnoseMessagePromise = new Promise<string>(resolve => {
+    page.on('console', msg => {
+      if (msg.text().includes('SDK connectivity:')) {
+        resolve(msg.text());
+      }
+    });
+  });
+
+  const url = await getLocalTestUrl({ testDir: __dirname });
+  await page.goto(url);
+
+  const pageLoadEvent = envelopeRequestParser(await pageloadRequestPromise);
+
+  // undefined is expected and means the request was successful
+  expect(await diagnoseMessagePromise).toEqual('SDK connectivity: undefined');
+
+  // the request to sentry.io should not be traced, hence no http.client span should be sent.
+  const httpClientSpans = pageLoadEvent.spans?.filter(s => s.op === 'http.client');
+  expect(httpClientSpans).toHaveLength(0);
+
+  // no fetch breadcrumb should be sent (only breadcrumb for the console log)
+  expect(pageLoadEvent.breadcrumbs).toEqual([
+    expect.objectContaining({
+      category: 'console',
+      message: 'SDK connectivity: undefined',
+    }),
+  ]);
+});

packages/aws-serverless/src/sdk.ts

@@ -306,11 +306,11 @@ export function wrapHandler<TEvent, TResult>(
         if (options.captureAllSettledReasons && Array.isArray(rv) && isPromiseAllSettledResult(rv)) {
           const reasons = getRejectedReasons(rv);
           reasons.forEach(exception => {
-            captureException(exception, scope => markEventUnhandled(scope));
+            captureException(exception, scope => markEventUnhandled(scope, 'auto.function.aws-serverless.promise'));
           });
         }
       } catch (e) {
-        captureException(e, scope => markEventUnhandled(scope));
+        captureException(e, scope => markEventUnhandled(scope, 'auto.function.aws-serverless.handler'));
         throw e;
       } finally {
         clearTimeout(timeoutWarningTimer);

packages/aws-serverless/src/utils.ts

@@ -26,9 +26,9 @@ const headerGetter: TextMapGetter<APIGatewayProxyEventHeaders> = {
 /**
  * Marks an event as unhandled by adding a span processor to the passed scope.
  */
-export function markEventUnhandled(scope: Scope): Scope {
+export function markEventUnhandled(scope: Scope, type: string): Scope {
   scope.addEventProcessor(event => {
-    addExceptionMechanism(event, { handled: false });
+    addExceptionMechanism(event, { handled: false, type });
     return event;
   });
 

packages/aws-serverless/test/sdk.test.ts

@@ -501,7 +501,7 @@ describe('AWSLambda', () => {
       // @ts-expect-error just mocking around...
       expect(evtProcessor(event).exception.values[0]?.mechanism).toEqual({
         handled: false,
-        type: 'generic',
+        type: 'auto.function.aws-serverless.handler',
       });
     }
   });

packages/browser-utils/src/metrics/utils.ts

@@ -226,13 +226,21 @@ export function listenForWebVitalReportEvents(
     // we only want to collect LCP if we actually navigate. Redirects should be ignored.
     if (!options?.isRedirect) {
       _runCollectorCallbackOnce('navigation');
-      unsubscribeStartNavigation?.();
-      unsubscribeAfterStartPageLoadSpan?.();
+      safeUnsubscribe(unsubscribeStartNavigation, unsubscribeAfterStartPageLoadSpan);
     }
   });
 
   const unsubscribeAfterStartPageLoadSpan = client.on('afterStartPageLoadSpan', span => {
     pageloadSpanId = span.spanContext().spanId;
-    unsubscribeAfterStartPageLoadSpan?.();
+    safeUnsubscribe(unsubscribeAfterStartPageLoadSpan);
   });
 }
+
+/**
+ * Invoke a list of unsubscribers in a safe way, by deferring the invocation to the next tick.
+ * This is necessary because unsubscribing in sync can lead to other callbacks no longer being invoked
+ * due to in-place array mutation of the subscribers array on the client.
+ */
+function safeUnsubscribe(...unsubscribers: (() => void | undefined)[]): void {
+  unsubscribers.forEach(u => u && setTimeout(u, 0));
+}

packages/browser/src/diagnose-sdk.ts

@@ -1,4 +1,4 @@
-import { getClient } from '@sentry/core';
+import { getClient, suppressTracing } from '@sentry/core';
 
 /**
  * A function to diagnose why the SDK might not be successfully sending data.
@@ -23,20 +23,22 @@ export async function diagnoseSdkConnectivity(): Promise<
   }
 
   try {
-    // If fetch throws, there is likely an ad blocker active or there are other connective issues.
-    await fetch(
-      // We are using the
-      // - "sentry-sdks" org with id 447951 not to pollute any actual organizations.
-      // - "diagnose-sdk-connectivity" project with id 4509632503087104
-      // - the public key of said org/project, which is disabled in the project settings
-      // => this DSN: https://[email protected]/4509632503087104 (i.e. disabled)
-      'https://o447951.ingest.sentry.io/api/4509632503087104/envelope/?sentry_version=7&sentry_key=c1dfb07d783ad5325c245c1fd3725390&sentry_client=sentry.javascript.browser%2F1.33.7',
-      {
-        body: '{}',
-        method: 'POST',
-        mode: 'cors',
-        credentials: 'omit',
-      },
+    await suppressTracing(() =>
+      // If fetch throws, there is likely an ad blocker active or there are other connective issues.
+      fetch(
+        // We are using the
+        // - "sentry-sdks" org with id 447951 not to pollute any actual organizations.
+        // - "diagnose-sdk-connectivity" project with id 4509632503087104
+        // - the public key of said org/project, which is disabled in the project settings
+        // => this DSN: https://[email protected]/4509632503087104 (i.e. disabled)
+        'https://o447951.ingest.sentry.io/api/4509632503087104/envelope/?sentry_version=7&sentry_key=c1dfb07d783ad5325c245c1fd3725390&sentry_client=sentry.javascript.browser%2F1.33.7',
+        {
+          body: '{}',
+          method: 'POST',
+          mode: 'cors',
+          credentials: 'omit',
+        },
+      ),
     );
   } catch {
     return 'sentry-unreachable';

packages/browser/test/diagnose-sdk.test.ts

@@ -162,4 +162,18 @@ describe('diagnoseSdkConnectivity', () => {
       credentials: 'omit',
     });
   });
+
+  it('calls suppressTracing to avoid tracing the fetch call to sentry', async () => {
+    const suppressTracingSpy = vi.spyOn(sentryCore, 'suppressTracing');
+
+    const mockClient: Partial<Client> = {
+      getDsn: vi.fn().mockReturnValue('https://[email protected]/123'),
+    };
+    mockGetClient.mockReturnValue(mockClient);
+    mockFetch.mockResolvedValue(new Response('{}', { status: 200 }));
+
+    await diagnoseSdkConnectivity();
+
+    expect(suppressTracingSpy).toHaveBeenCalledTimes(1);
+  });
 });