Merge branch 'develop' into cg/JS-1567/add-replaylogsmetrics-bundle

chargome · web-flow · commit 3595ab760350 · 2026-01-28T13:08:04.000+01:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -12,10 +12,6 @@ updates:
     directory: '/'
     schedule:
       interval: 'weekly'
-    allow:
-      - dependency-name: '@sentry/*'
-      - dependency-name: '@playwright/test'
-      - dependency-name: '@opentelemetry/*'
     ignore:
       - dependency-name: '@opentelemetry/instrumentation'
       - dependency-name: '@opentelemetry/instrumentation-*'
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -568,6 +568,7 @@ jobs:
           - bundle_min
           - bundle_replay
           - bundle_tracing
+          - bundle_logs_metrics
           - bundle_tracing_logs_metrics
           - bundle_replay_logs_metrics
           - bundle_tracing_replay
diff --git a/.size-limit.js b/.size-limit.js
@@ -186,6 +186,12 @@ module.exports = [
     gzip: true,
     limit: '43 KB',
   },
+  {
+    name: 'CDN Bundle (incl. Logs, Metrics)',
+    path: createCDNPath('bundle.logs.metrics.min.js'),
+    gzip: true,
+    limit: '29 KB',
+  },
   {
     name: 'CDN Bundle (incl. Tracing, Logs, Metrics)',
     path: createCDNPath('bundle.tracing.logs.metrics.min.js'),
@@ -231,6 +237,13 @@ module.exports = [
     brotli: false,
     limit: '128 KB',
   },
+  {
+    name: 'CDN Bundle (incl. Logs, Metrics) - uncompressed',
+    path: createCDNPath('bundle.logs.metrics.min.js'),
+    gzip: false,
+    brotli: false,
+    limit: '86 KB',
+  },
   {
     name: 'CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed',
     path: createCDNPath('bundle.tracing.logs.metrics.min.js'),
diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
@@ -23,6 +23,9 @@
     "test:bundle:replay:min": "PW_BUNDLE=bundle_replay_min yarn test",
     "test:bundle:tracing": "PW_BUNDLE=bundle_tracing yarn test",
     "test:bundle:tracing:min": "PW_BUNDLE=bundle_tracing_min yarn test",
+    "test:bundle:logs_metrics": "PW_BUNDLE=bundle_logs_metrics yarn test",
+    "test:bundle:logs_metrics:min": "PW_BUNDLE=bundle_logs_metrics_min yarn test",
+    "test:bundle:logs_metrics:debug_min": "PW_BUNDLE=bundle_logs_metrics_debug_min yarn test",
     "test:bundle:tracing_logs_metrics": "PW_BUNDLE=bundle_tracing_logs_metrics yarn test",
     "test:bundle:tracing_logs_metrics:min": "PW_BUNDLE=bundle_tracing_logs_metrics_min yarn test",
     "test:bundle:tracing_logs_metrics:debug_min": "PW_BUNDLE=bundle_tracing_logs_metrics_debug_min yarn test",
diff --git a/dev-packages/browser-integration-tests/suites/public-api/metrics/simple/test.ts b/dev-packages/browser-integration-tests/suites/public-api/metrics/simple/test.ts
@@ -5,11 +5,13 @@ import {
   getFirstSentryEnvelopeRequest,
   properFullEnvelopeRequestParser,
   shouldSkipMetricsTest,
+  shouldSkipTracingTest,
 } from '../../../../utils/helpers';
 
 sentryTest('should capture all metric types', async ({ getLocalTestUrl, page }) => {
-  // Only run this for npm package exports and CDN bundles with metrics
-  if (shouldSkipMetricsTest()) {
+  // Only run this for npm package exports and CDN bundles with metrics and tracing
+  // (the test uses Sentry.startSpan which requires tracing)
+  if (shouldSkipMetricsTest() || shouldSkipTracingTest()) {
     sentryTest.skip();
   }
 
diff --git a/dev-packages/browser-integration-tests/suites/wasm/webWorker/assets/worker.js b/dev-packages/browser-integration-tests/suites/wasm/webWorker/assets/worker.js
@@ -48,6 +48,10 @@ function getBuildId(module) {
 
 // Handle messages from the main thread
 self.addEventListener('message', async event => {
+  if (event.origin !== '' && event.origin !== self.location.origin) {
+    return;
+  }
+
   function crash() {
     throw new Error('WASM error from worker');
   }
diff --git a/dev-packages/browser-integration-tests/utils/generatePlugin.ts b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
@@ -56,6 +56,9 @@ const BUNDLE_PATHS: Record<string, Record<string, string>> = {
     bundle_replay_min: 'build/bundles/bundle.replay.min.js',
     bundle_tracing: 'build/bundles/bundle.tracing.js',
     bundle_tracing_min: 'build/bundles/bundle.tracing.min.js',
+    bundle_logs_metrics: 'build/bundles/bundle.logs.metrics.js',
+    bundle_logs_metrics_min: 'build/bundles/bundle.logs.metrics.min.js',
+    bundle_logs_metrics_debug_min: 'build/bundles/bundle.logs.metrics.debug.min.js',
     bundle_tracing_logs_metrics: 'build/bundles/bundle.tracing.logs.metrics.js',
     bundle_tracing_logs_metrics_min: 'build/bundles/bundle.tracing.logs.metrics.min.js',
     bundle_tracing_logs_metrics_debug_min: 'build/bundles/bundle.tracing.logs.metrics.debug.min.js',
diff --git a/dev-packages/cloudflare-integration-tests/package.json b/dev-packages/cloudflare-integration-tests/package.json
@@ -22,7 +22,7 @@
     "@sentry-internal/test-utils": "10.37.0",
     "eslint-plugin-regexp": "^1.15.0",
     "vitest": "^3.2.4",
-    "wrangler": "4.22.0"
+    "wrangler": "4.61.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-hono/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-hono/package.json
@@ -12,14 +12,14 @@
   },
   "dependencies": {
     "@sentry/cloudflare": "latest || *",
-    "hono": "4.11.4"
+    "hono": "4.11.7"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.8.31",
     "@cloudflare/workers-types": "^4.20250521.0",
     "typescript": "^5.9.3",
     "vitest": "3.1.0",
-    "wrangler": "4.22.0"
+    "wrangler": "4.61.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/package.json
@@ -27,7 +27,7 @@
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "typescript": "^5.5.2",
     "vitest": "~3.2.0",
-    "wrangler": "^4.23.0",
+    "wrangler": "^4.61.0",
     "ws": "^8.18.3"
   },
   "volta": {
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-workers/package.json
@@ -24,7 +24,7 @@
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "typescript": "^5.5.2",
     "vitest": "~3.2.0",
-    "wrangler": "^4.23.0",
+    "wrangler": "^4.61.0",
     "ws": "^8.18.3"
   },
   "volta": {
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/package.json b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/package.json
@@ -26,7 +26,7 @@
     "@sentry/nextjs": "latest || *",
     "@sentry/core": "latest || *",
     "import-in-the-middle": "^1",
-    "next": "16.0.9",
+    "next": "16.1.5",
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "require-in-the-middle": "^7",
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cf-workers/package.json b/dev-packages/e2e-tests/test-applications/nextjs-16-cf-workers/package.json
@@ -33,7 +33,7 @@
     "eslint": "^9",
     "eslint-config-next": "canary",
     "typescript": "^5",
-    "wrangler": "^4.59.2"
+    "wrangler": "^4.61.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/package.json b/dev-packages/e2e-tests/test-applications/sveltekit-cloudflare-pages/package.json
@@ -26,7 +26,7 @@
     "svelte-check": "^4.1.4",
     "typescript": "^5.0.0",
     "vite": "^6.1.1",
-    "wrangler": "4.22.0"
+    "wrangler": "4.61.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/browser/rollup.bundle.config.mjs b/packages/browser/rollup.bundle.config.mjs
@@ -104,6 +104,13 @@ const tracingReplayFeedbackBaseBundleConfig = makeBaseBundleConfig({
   outputFileBase: () => 'bundles/bundle.tracing.replay.feedback',
 });
 
+const logsMetricsBaseBundleConfig = makeBaseBundleConfig({
+  bundleType: 'standalone',
+  entrypoints: ['src/index.bundle.logs.metrics.ts'],
+  licenseTitle: '@sentry/browser (Logs and Metrics)',
+  outputFileBase: () => 'bundles/bundle.logs.metrics',
+});
+
 const tracingLogsMetricsBaseBundleConfig = makeBaseBundleConfig({
   bundleType: 'standalone',
   entrypoints: ['src/index.bundle.tracing.logs.metrics.ts'],
@@ -133,6 +140,7 @@ builds.push(
   ...makeBundleConfigVariants(tracingReplayBaseBundleConfig),
   ...makeBundleConfigVariants(replayFeedbackBaseBundleConfig),
   ...makeBundleConfigVariants(tracingReplayFeedbackBaseBundleConfig),
+  ...makeBundleConfigVariants(logsMetricsBaseBundleConfig),
   ...makeBundleConfigVariants(tracingLogsMetricsBaseBundleConfig),
   ...makeBundleConfigVariants(replayLogsMetricsBaseBundleConfig),
   ...makeBundleConfigVariants(tracingReplayFeedbackLogsMetricsBaseBundleConfig),
diff --git a/packages/browser/src/index.bundle.logs.metrics.ts b/packages/browser/src/index.bundle.logs.metrics.ts
@@ -0,0 +1,17 @@
+import {
+  browserTracingIntegrationShim,
+  feedbackIntegrationShim,
+  replayIntegrationShim,
+} from '@sentry-internal/integration-shims';
+
+export * from './index.bundle.base';
+
+// TODO(v11): Export metrics here once we remove it from the base bundle.
+export { logger, consoleLoggingIntegration } from '@sentry/core';
+
+export {
+  browserTracingIntegrationShim as browserTracingIntegration,
+  feedbackIntegrationShim as feedbackAsyncIntegration,
+  feedbackIntegrationShim as feedbackIntegration,
+  replayIntegrationShim as replayIntegration,
+};
diff --git a/packages/browser/test/index.bundle.logs.metrics.test.ts b/packages/browser/test/index.bundle.logs.metrics.test.ts
@@ -0,0 +1,10 @@
+import { logger as coreLogger, metrics as coreMetrics } from '@sentry/core';
+import { describe, expect, it } from 'vitest';
+import * as LogsMetricsBundle from '../src/index.bundle.logs.metrics';
+
+describe('index.bundle.logs.metrics', () => {
+  it('has correct exports', () => {
+    expect(LogsMetricsBundle.logger).toBe(coreLogger);
+    expect(LogsMetricsBundle.metrics).toBe(coreMetrics);
+  });
+});
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
@@ -63,7 +63,7 @@
   "devDependencies": {
     "@cloudflare/workers-types": "4.20250922.0",
     "@types/node": "^18.19.1",
-    "wrangler": "4.22.0"
+    "wrangler": "4.61.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json
@@ -78,7 +78,7 @@
     "@testing-library/jest-dom": "^6.4.5",
     "@testing-library/user-event": "^14.5.2",
     "solid-js": "^1.8.4",
-    "vinxi": "^0.3.12",
+    "vinxi": "^0.5.11",
     "vite": "^5.4.11",
     "vite-plugin-solid": "^2.11.6"
   },
diff --git a/yarn.lock b/yarn.lock
