feat(sveltekit): Always add browserTracingIntegration (#13322)

closes #13011 ref: #13318
getsentry · Aug 13, 2024 · 0e7c492 · 0e7c492
1 parent 899c571
commit 0e7c492
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/packages/sveltekit/src/client/sdk.ts b/packages/sveltekit/src/client/sdk.ts
@@ -1,4 +1,4 @@
-import { applySdkMetadata, hasTracingEnabled } from '@sentry/core';
+import { applySdkMetadata } from '@sentry/core';
 import type { BrowserOptions } from '@sentry/svelte';
 import { getDefaultIntegrations as getDefaultSvelteIntegrations } from '@sentry/svelte';
 import { WINDOW, init as initSvelteSdk } from '@sentry/svelte';
@@ -41,15 +41,13 @@ export function init(options: BrowserOptions): Client | undefined {
 }
 
 function getDefaultIntegrations(options: BrowserOptions): Integration[] | undefined {
-  // This evaluates to true unless __SENTRY_TRACING__ is text-replaced with "false", in which case everything inside
-  // will get treeshaken away
+  // This evaluates to true unless __SENTRY_TRACING__ is text-replaced with "false",
+  // in which case everything inside will get tree-shaken away
   if (typeof __SENTRY_TRACING__ === 'undefined' || __SENTRY_TRACING__) {
-    if (hasTracingEnabled(options)) {
-      return [...getDefaultSvelteIntegrations(options), svelteKitBrowserTracingIntegration()];
-    }
+    return [...getDefaultSvelteIntegrations(options), svelteKitBrowserTracingIntegration()];
   }
 
-  return undefined;
+  return getDefaultSvelteIntegrations(options);
 }
 
 /**

diff --git a/packages/sveltekit/test/client/sdk.test.ts b/packages/sveltekit/test/client/sdk.test.ts
@@ -46,6 +46,7 @@ describe('Sentry client SDK', () => {
         ['tracesSampleRate', { tracesSampleRate: 0 }],
         ['tracesSampler', { tracesSampler: () => 1.0 }],
         ['enableTracing', { enableTracing: true }],
+        ['no tracing option set', {}],
       ])('adds a browserTracingIntegration if tracing is enabled via %s', (_, tracingOptions) => {
         init({
           dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -56,19 +57,6 @@ describe('Sentry client SDK', () => {
         expect(browserTracing).toBeDefined();
       });
 
-      it.each([
-        ['enableTracing', { enableTracing: false }],
-        ['no tracing option set', {}],
-      ])("doesn't add a browserTracingIntegration integration if tracing is disabled via %s", (_, tracingOptions) => {
-        init({
-          dsn: 'https://public@dsn.ingest.sentry.io/1337',
-          ...tracingOptions,
-        });
-
-        const browserTracing = getClient<BrowserClient>()?.getIntegrationByName('BrowserTracing');
-        expect(browserTracing).toBeUndefined();
-      });
-
       it("doesn't add a browserTracingIntegration if `__SENTRY_TRACING__` is set to false", () => {
         // This is the closest we can get to unit-testing the `__SENTRY_TRACING__` tree-shaking guard
         // IRL, the code to add the integration would most likely be removed by the bundler.