fix(cdn): Fix SDK source for CDN bundles

.size-limit.js

@@ -170,7 +170,7 @@ module.exports = [
     path: createCDNPath('bundle.tracing.min.js'),
     gzip: false,
     brotli: false,
-    limit: '111 KB',
+    limit: '113 KB',
   },
   {
     name: 'CDN Bundle (incl. Tracing, Replay) - uncompressed',

dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/captureException/test.ts

@@ -1,4 +1,5 @@
 import { expect } from '@playwright/test';
+import { SDK_VERSION } from '@sentry/browser';
 
 import { sentryTest } from '../../../../utils/fixtures';
 import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
@@ -11,3 +12,22 @@ sentryTest('captureException works', async ({ getLocalTestUrl, page }) => {
 
   expect(eventData.message).toBe('Test exception');
 });
+
+sentryTest('should capture correct SDK metadata', async ({ getLocalTestUrl, page }) => {
+  const url = await getLocalTestUrl({ testDir: __dirname });
+  const req = await waitForErrorRequestOnUrl(page, url);
+
+  const eventData = envelopeRequestParser(req);
+
+  expect(eventData.sdk).toMatchObject({
+    name: 'sentry.javascript.browser',
+    version: SDK_VERSION,
+    integrations: expect.any(Object),
+    packages: [
+      {
+        name: 'loader:@sentry/browser',
+        version: SDK_VERSION,
+      },
+    ],
+  });
+});

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

@@ -1,13 +1,13 @@
 import { expect } from '@playwright/test';
-import type { Event } from '@sentry/types';
+import { SDK_VERSION } from '@sentry/browser';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
 
-sentryTest('should capture a simple error with message', async ({ getLocalTestPath, page }) => {
-  const url = await getLocalTestPath({ testDir: __dirname });
-
-  const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
+sentryTest('should capture a simple error with message', async ({ getLocalTestUrl, page }) => {
+  const url = await getLocalTestUrl({ testDir: __dirname });
+  const req = await waitForErrorRequestOnUrl(page, url);
+  const eventData = envelopeRequestParser(req);
 
   expect(eventData.exception?.values).toHaveLength(1);
   expect(eventData.exception?.values?.[0]).toMatchObject({
@@ -22,3 +22,23 @@ sentryTest('should capture a simple error with message', async ({ getLocalTestPa
     },
   });
 });
+
+sentryTest('should capture correct SDK metadata', async ({ getLocalTestUrl, page }) => {
+  const isCdn = (process.env.PW_BUNDLE || '').startsWith('bundle');
+
+  const url = await getLocalTestUrl({ testDir: __dirname });
+  const req = await waitForErrorRequestOnUrl(page, url);
+  const eventData = envelopeRequestParser(req);
+
+  expect(eventData.sdk).toEqual({
+    name: 'sentry.javascript.browser',
+    version: SDK_VERSION,
+    integrations: expect.any(Object),
+    packages: [
+      {
+        name: `${isCdn ? 'cdn' : 'npm'}:@sentry/browser`,
+        version: SDK_VERSION,
+      },
+    ],
+  });
+});

dev-packages/rollup-utils/npmHelpers.mjs

@@ -19,7 +19,6 @@ import {
   makeImportMetaUrlReplacePlugin,
   makeNodeResolvePlugin,
   makeRrwebBuildPlugin,
-  makeSetSDKSourcePlugin,
   makeSucrasePlugin,
 } from './plugins/index.mjs';
 import { makePackageNodeEsm } from './plugins/make-esm-plugin.mjs';
@@ -45,7 +44,6 @@ export function makeBaseNPMConfig(options = {}) {
   const importMetaUrlReplacePlugin = makeImportMetaUrlReplacePlugin();
   const cleanupPlugin = makeCleanupPlugin();
   const extractPolyfillsPlugin = makeExtractPolyfillsPlugin();
-  const setSdkSourcePlugin = makeSetSDKSourcePlugin('npm');
   const rrwebBuildPlugin = makeRrwebBuildPlugin({
     excludeShadowDom: undefined,
     excludeIframe: undefined,
@@ -106,7 +104,6 @@ export function makeBaseNPMConfig(options = {}) {
 
     plugins: [
       nodeResolvePlugin,
-      setSdkSourcePlugin,
       sucrasePlugin,
       debugBuildStatementReplacePlugin,
       importMetaUrlReplacePlugin,

dev-packages/rollup-utils/plugins/bundlePlugins.mjs

@@ -63,8 +63,9 @@ export function makeIsDebugBuildPlugin(includeDebugging) {
 export function makeSetSDKSourcePlugin(sdkSource) {
   return replace({
     preventAssignment: false,
+    delimiters: ['', ''],
     values: {
-      __SENTRY_SDK_SOURCE__: JSON.stringify(sdkSource),
+      '/* __SENTRY_SDK_SOURCE__ */': `return ${JSON.stringify(sdkSource)};`,
     },
   });
 }

packages/utils/src/env.ts

@@ -30,6 +30,6 @@ export function isBrowserBundle(): boolean {
  * Get source of SDK.
  */
 export function getSDKSource(): SdkSource {
-  // @ts-expect-error __SENTRY_SDK_SOURCE__ is injected by rollup during build process
-  return __SENTRY_SDK_SOURCE__;
+  // This comment is used to identify this line in the CDN bundle build step and replace this with "return 'cdn';"
+  /* __SENTRY_SDK_SOURCE__ */ return 'npm';
 }