more improvements

Author: mydea

packages/nextjs/src/client/browserTracingIntegration.ts

@@ -61,12 +61,16 @@ export function browserTracingIntegration(
     instrumentPageLoad: false,
   });
 
+  const fullOptions = {
+    ...browserTracingIntegrationInstance.options,
+    instrumentPageLoad: true,
+    instrumentNavigation: true,
+    ...options,
+  };
+
   return {
     ...browserTracingIntegrationInstance,
-    options: {
-      ...browserTracingIntegrationInstance.options,
-      ...options,
-    },
+    options: fullOptions,
     afterAllSetup(client) {
       const startPageloadCallback = (startSpanOptions: StartSpanOptions): void => {
         startBrowserTracingPageLoadSpan(client, startSpanOptions);
@@ -84,7 +88,7 @@ export function browserTracingIntegration(
       nextRouterInstrumentation(
         () => undefined,
         false,
-        options?.instrumentNavigation,
+        fullOptions.instrumentNavigation,
         startPageloadCallback,
         startNavigationCallback,
       );
@@ -94,7 +98,7 @@ export function browserTracingIntegration(
       // eslint-disable-next-line deprecation/deprecation
       nextRouterInstrumentation(
         () => undefined,
-        options?.instrumentPageLoad,
+        fullOptions.instrumentPageLoad,
         false,
         startPageloadCallback,
         startNavigationCallback,

packages/nextjs/test/clientSdk.test.ts

@@ -1,4 +1,10 @@
-import { BaseClient, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, getActiveSpan, spanToJSON } from '@sentry/core';
+import {
+  BaseClient,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  getActiveSpan,
+  getIsolationScope,
+  spanToJSON,
+} from '@sentry/core';
 import * as SentryReact from '@sentry/react';
 import type { BrowserClient } from '@sentry/react';
 import { browserTracingIntegration } from '@sentry/react';
@@ -35,6 +41,11 @@ function findIntegrationByName(integrations: Integration[] = [], name: string):
 const TEST_DSN = 'https://[email protected]/1337';
 
 describe('Client init()', () => {
+  beforeEach(() => {
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+  });
+
   afterEach(() => {
     jest.clearAllMocks();
     WINDOW.__SENTRY__.hub = undefined;

packages/sveltekit/src/client/browserTracingIntegration.ts

@@ -45,20 +45,24 @@ export function browserTracingIntegration(
     }),
   };
 
+  const fullOptions = {
+    ...integration.options,
+    instrumentPageLoad: true,
+    instrumentNavigation: true,
+    ...options,
+  };
+
   return {
     ...integration,
-    options: {
-      ...integration.options,
-      ...options,
-    },
+    options: fullOptions,
     afterAllSetup: client => {
       integration.afterAllSetup(client);
 
-      if (options.instrumentPageLoad !== false) {
+      if (fullOptions.instrumentPageLoad) {
         _instrumentPageload(client);
       }
 
-      if (options.instrumentNavigation !== false) {
+      if (fullOptions.instrumentNavigation) {
         _instrumentNavigations(client);
       }
     },

packages/sveltekit/test/client/sdk.test.ts

@@ -1,4 +1,11 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, getActiveSpan, getClient, getCurrentScope, spanToJSON } from '@sentry/core';
+import {
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  getActiveSpan,
+  getClient,
+  getCurrentScope,
+  getIsolationScope,
+  spanToJSON,
+} from '@sentry/core';
 import type { BrowserClient } from '@sentry/svelte';
 import * as SentrySvelte from '@sentry/svelte';
 import { SDK_VERSION, WINDOW, browserTracingIntegration } from '@sentry/svelte';
@@ -16,6 +23,11 @@ describe('Sentry client SDK', () => {
       WINDOW.__SENTRY__.hub = undefined;
     });
 
+    beforeEach(() => {
+      getCurrentScope().clear();
+      getIsolationScope().clear();
+    });
+
     it('adds SvelteKit metadata to the SDK options', () => {
       expect(svelteInit).not.toHaveBeenCalled();