Merge branch 'develop' into sig/astro-waitUntil

Author: s1gr1d

dev-packages/browser-integration-tests/suites/manual-client/force-init-chrome-extension/init.js

@@ -0,0 +1,11 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+// We mock this here to simulate a Chrome browser extension
+window.chrome = { runtime: { id: 'mock-extension-id' } };
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  skipBrowserExtensionCheck: true,
+});

dev-packages/browser-integration-tests/suites/manual-client/force-init-chrome-extension/test.ts

@@ -0,0 +1,16 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../utils/fixtures';
+
+sentryTest(
+  'initializes inside a Chrome browser extension if `skipBrowserExtensionCheck` is set',
+  async ({ getLocalTestUrl, page }) => {
+    const url = await getLocalTestUrl({ testDir: __dirname });
+    await page.goto(url);
+
+    const isInitialized = await page.evaluate(() => {
+      return !!(window as any).Sentry.isInitialized();
+    });
+
+    expect(isInitialized).toBe(true);
+  },
+);

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

@@ -0,0 +1,11 @@
+async function run() {
+  Sentry.startSpan({ name: 'parent_span' }, () => {
+    Sentry.startSpan({ name: 'child_span', attributes: { someAttribute: '' } }, () => {
+      // whatever a user would do here
+    });
+  });
+}
+
+(async () => {
+  await run();
+})();

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

@@ -0,0 +1,21 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import {
+  envelopeRequestParser,
+  shouldSkipTracingTest,
+  waitForTransactionRequestOnUrl,
+} from '../../../../utils/helpers';
+
+sentryTest('sends an empty string attribute', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
+  const url = await getLocalTestPath({ testDir: __dirname });
+  const req = await waitForTransactionRequestOnUrl(page, url);
+  const transaction = envelopeRequestParser(req);
+
+  const childSpan = transaction.spans?.[0];
+  expect(childSpan?.data?.someAttribute).toBe('');
+});

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

@@ -513,6 +513,7 @@ export interface ResourceEntry extends Record<string, unknown> {
   encodedBodySize?: number;
   decodedBodySize?: number;
   renderBlockingStatus?: string;
+  deliveryType?: string;
 }
 
 /** Create resource-related spans */
@@ -539,6 +540,10 @@ export function _addResourceSpans(
   setResourceEntrySizeData(attributes, entry, 'encodedBodySize', 'http.response_content_length');
   setResourceEntrySizeData(attributes, entry, 'decodedBodySize', 'http.decoded_response_content_length');
 
+  if (entry.deliveryType != null) {
+    attributes['http.response_delivery_type'] = entry.deliveryType;
+  }
+
   if ('renderBlockingStatus' in entry) {
     attributes['resource.render_blocking_status'] = entry.renderBlockingStatus;
   }

packages/browser-utils/test/browser/browserMetrics.test.ts

@@ -338,6 +338,32 @@ describe('_addResourceSpans', () => {
       }),
     );
   });
+
+  // resource delivery types: https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming/deliveryType
+  // i.e. better but not yet widely supported way to check for browser cache hit
+  it.each(['cache', 'navigational-prefetch', ''])(
+    'attaches delivery type ("%s") to resource spans if available',
+    deliveryType => {
+      const spans: Span[] = [];
+
+      getClient()?.on('spanEnd', span => {
+        spans.push(span);
+      });
+
+      const entry: ResourceEntry = {
+        initiatorType: 'css',
+        transferSize: 0,
+        encodedBodySize: 0,
+        decodedBodySize: 0,
+        deliveryType,
+      };
+
+      _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);
+
+      expect(spans).toHaveLength(1);
+      expect(spanToJSON(spans[0]!).data).toMatchObject({ 'http.response_delivery_type': deliveryType });
+    },
+  );
 });
 
 const setGlobalLocation = (location: Location) => {

packages/browser/src/client.ts

@@ -26,7 +26,26 @@ import { createUserFeedbackEnvelope } from './userfeedback';
  */
 export type BrowserOptions = Options<BrowserTransportOptions> &
   BrowserClientReplayOptions &
-  BrowserClientProfilingOptions;
+  BrowserClientProfilingOptions & {
+    /**
+     * Important: Only set this option if you know what you are doing!
+     *
+     * By default, the SDK will check if `Sentry.init` is called in a browser extension.
+     * In case it is, it will stop initialization and log a warning
+     * because browser extensions require a different Sentry initialization process:
+     * https://docs.sentry.io/platforms/javascript/best-practices/shared-environments/
+     *
+     * Setting up the SDK in a browser extension with global error monitoring is not recommended
+     * and will likely flood you with errors from other web sites or extensions. This can heavily
+     * impact your quota and cause interference with your and other Sentry SDKs in shared environments.
+     *
+     * If this check wrongfully flags your setup as a browser extension, you can set this
+     * option to `true` to skip the check.
+     *
+     * @default false
+     */
+    skipBrowserExtensionCheck?: boolean;
+  };
 
 /**
  * Configuration options for the Sentry Browser SDK Client class

packages/browser/src/sdk.ts

@@ -160,7 +160,7 @@ declare const __SENTRY_RELEASE__: string | undefined;
 export function init(browserOptions: BrowserOptions = {}): Client | undefined {
   const options = applyDefaultOptions(browserOptions);
 
-  if (shouldShowBrowserExtensionError()) {
+  if (!options.skipBrowserExtensionCheck && shouldShowBrowserExtensionError()) {
     consoleSandbox(() => {
       // eslint-disable-next-line no-console
       console.error(

packages/ember/config/ember-try.js

@@ -25,8 +25,7 @@
     "lint:ts": "tsc",
     "fix": "eslint . --format stylish --fix",
     "start": "ember serve",
-    "test": "ember b --prod && yarn ember test",
-    "test:all": "ember try:each",
+    "test": "ember b --prod && ember test",
     "prepack": "ember ts:precompile",
     "postpack": "ember ts:clean"
   },
@@ -44,42 +43,34 @@
   },
   "devDependencies": {
     "@ember/optional-features": "~1.3.0",
-    "@ember/test-helpers": "2.9.4",
+    "@ember/test-helpers": "4.0.4",
     "@embroider/test-setup": "~4.0.0",
     "@glimmer/component": "~1.1.2",
     "@glimmer/tracking": "~1.1.2",
     "@types/ember": "~3.16.5",
-    "@types/ember-qunit": "~3.4.9",
     "@types/ember-resolver": "5.0.13",
     "@types/ember__debug": "^3.16.5",
-    "@types/qunit": "~2.9.1",
+    "@types/qunit": "~2.19.11",
     "@types/rsvp": "~4.0.3",
     "babel-eslint": "~10.1.0",
     "broccoli-asset-rev": "~3.0.0",
-    "ember-cli": "~4.8.0",
-    "ember-cli-dependency-checker": "~3.3.1",
+    "ember-cli": "~4.12.3",
+    "ember-cli-dependency-checker": "~3.3.2",
     "ember-cli-inject-live-reload": "~2.1.0",
-    "ember-cli-sri": "~2.1.1",
     "ember-cli-terser": "~4.0.2",
-    "ember-cli-typescript-blueprints": "~3.0.0",
-    "ember-disable-prototype-extensions": "~1.1.3",
     "ember-load-initializers": "~2.1.1",
-    "ember-maybe-import-regenerator": "1.0.0",
-    "ember-qunit": "~6.0.0",
-    "ember-resolver": "11.0.0",
-    "ember-sinon-qunit": "7.1.4",
-    "ember-source": "~4.8.0",
-    "ember-source-channel-url": "~2.0.1",
+    "ember-qunit": "~8.1.0",
+    "ember-resolver": "13.0.2",
+    "ember-sinon-qunit": "7.5.0",
+    "ember-source": "~4.12.4",
     "ember-template-lint": "~4.16.1",
-    "ember-try": "~2.0.0",
-    "ember-window-mock": "~0.8.1",
     "eslint-plugin-ember": "11.9.0",
     "eslint-plugin-n": "16.0.1",
     "eslint-plugin-qunit": "8.0.0",
     "loader.js": "~4.7.0",
-    "qunit": "~2.19.2",
-    "qunit-dom": "~2.0.0",
-    "sinon": "15.2.0",
+    "qunit": "~2.22.0",
+    "qunit-dom": "~3.2.1",
+    "sinon": "19.0.2",
     "webpack": "~5.95.0"
   },
   "engines": {