feat(browser): Add tracing.replay.logs.metrics bundle

.github/workflows/build.yml

@@ -566,12 +566,13 @@ jobs:
           - esm
           - bundle
           - bundle_min
+          - bundle_logs_metrics
           - bundle_replay
+          - bundle_replay_logs_metrics
           - bundle_tracing
-          - bundle_logs_metrics
           - bundle_tracing_logs_metrics
-          - bundle_replay_logs_metrics
           - bundle_tracing_replay
+          - bundle_tracing_replay_logs_metrics
           - bundle_tracing_replay_feedback
           - bundle_tracing_replay_feedback_min
           - bundle_tracing_replay_feedback_logs_metrics

.size-limit.js

@@ -210,6 +210,12 @@ module.exports = [
     gzip: true,
     limit: '80 KB',
   },
+  {
+    name: 'CDN Bundle (incl. Tracing, Replay, Logs, Metrics)',
+    path: createCDNPath('bundle.tracing.replay.logs.metrics.min.js'),
+    gzip: true,
+    limit: '81 KB',
+  },
   {
     name: 'CDN Bundle (incl. Tracing, Replay, Feedback)',
     path: createCDNPath('bundle.tracing.replay.feedback.min.js'),
@@ -265,6 +271,13 @@ module.exports = [
     brotli: false,
     limit: '245 KB',
   },
+  {
+    name: 'CDN Bundle (incl. Tracing, Replay, Logs, Metrics) - uncompressed',
+    path: createCDNPath('bundle.tracing.replay.logs.metrics.min.js'),
+    gzip: false,
+    brotli: false,
+    limit: '250 KB',
+  },
   {
     name: 'CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed',
     path: createCDNPath('bundle.tracing.replay.feedback.min.js'),

dev-packages/browser-integration-tests/package.json

@@ -19,19 +19,24 @@
     "test:all": "npx playwright test -c playwright.browser.config.ts",
     "test:bundle": "PW_BUNDLE=bundle yarn test",
     "test:bundle:min": "PW_BUNDLE=bundle_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:replay": "PW_BUNDLE=bundle_replay yarn test",
     "test:bundle:replay:min": "PW_BUNDLE=bundle_replay_min yarn test",
+    "test:bundle:replay_logs_metrics": "PW_BUNDLE=bundle_replay_logs_metrics yarn test",
+    "test:bundle:replay_logs_metrics:min": "PW_BUNDLE=bundle_replay_logs_metrics_min yarn test",
+    "test:bundle:replay_logs_metrics:debug_min": "PW_BUNDLE=bundle_replay_logs_metrics_debug_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",
-    "test:bundle:replay_logs_metrics": "PW_BUNDLE=bundle_replay_logs_metrics yarn test",
-    "test:bundle:replay_logs_metrics:min": "PW_BUNDLE=bundle_replay_logs_metrics_min yarn test",
-    "test:bundle:replay_logs_metrics:debug_min": "PW_BUNDLE=bundle_replay_logs_metrics_debug_min yarn test",
+    "test:bundle:tracing_replay": "PW_BUNDLE=bundle_tracing_replay yarn test",
+    "test:bundle:tracing_replay:min": "PW_BUNDLE=bundle_tracing_replay_min yarn test",
+    "test:bundle:tracing_replay_logs_metrics": "PW_BUNDLE=bundle_tracing_replay_logs_metrics yarn test",
+    "test:bundle:tracing_replay_logs_metrics:min": "PW_BUNDLE=bundle_tracing_replay_logs_metrics_min yarn test",
+    "test:bundle:tracing_replay_logs_metrics:debug_min": "PW_BUNDLE=bundle_tracing_replay_logs_metrics_debug_min yarn test",
     "test:bundle:full": "PW_BUNDLE=bundle_tracing_replay_feedback yarn test",
     "test:bundle:full:min": "PW_BUNDLE=bundle_tracing_replay_feedback_min yarn test",
     "test:bundle:tracing_replay_feedback_logs_metrics": "PW_BUNDLE=bundle_tracing_replay_feedback_logs_metrics yarn test",

dev-packages/browser-integration-tests/utils/generatePlugin.ts

@@ -52,21 +52,24 @@ const BUNDLE_PATHS: Record<string, Record<string, string>> = {
     esm: 'build/npm/esm/prod/index.js',
     bundle: 'build/bundles/bundle.js',
     bundle_min: 'build/bundles/bundle.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_replay: 'build/bundles/bundle.replay.js',
     bundle_replay_min: 'build/bundles/bundle.replay.min.js',
+    bundle_replay_logs_metrics: 'build/bundles/bundle.replay.logs.metrics.js',
+    bundle_replay_logs_metrics_min: 'build/bundles/bundle.replay.logs.metrics.min.js',
+    bundle_replay_logs_metrics_debug_min: 'build/bundles/bundle.replay.logs.metrics.debug.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',
-    bundle_replay_logs_metrics: 'build/bundles/bundle.replay.logs.metrics.js',
-    bundle_replay_logs_metrics_min: 'build/bundles/bundle.replay.logs.metrics.min.js',
-    bundle_replay_logs_metrics_debug_min: 'build/bundles/bundle.replay.logs.metrics.debug.min.js',
     bundle_tracing_replay: 'build/bundles/bundle.tracing.replay.js',
     bundle_tracing_replay_min: 'build/bundles/bundle.tracing.replay.min.js',
+    bundle_tracing_replay_logs_metrics: 'build/bundles/bundle.tracing.replay.logs.metrics.js',
+    bundle_tracing_replay_logs_metrics_min: 'build/bundles/bundle.tracing.replay.logs.metrics.min.js',
+    bundle_tracing_replay_logs_metrics_debug_min: 'build/bundles/bundle.tracing.replay.logs.metrics.debug.min.js',
     bundle_tracing_replay_feedback: 'build/bundles/bundle.tracing.replay.feedback.js',
     bundle_tracing_replay_feedback_min: 'build/bundles/bundle.tracing.replay.feedback.min.js',
     bundle_tracing_replay_feedback_logs_metrics: 'build/bundles/bundle.tracing.replay.feedback.logs.metrics.js',

packages/browser/rollup.bundle.config.mjs

@@ -62,32 +62,25 @@ const baseBundleConfig = makeBaseBundleConfig({
   outputFileBase: () => 'bundles/bundle',
 });
 
-const tracingBaseBundleConfig = makeBaseBundleConfig({
-  bundleType: 'standalone',
-  entrypoints: ['src/index.bundle.tracing.ts'],
-  licenseTitle: '@sentry/browser (Performance Monitoring)',
-  outputFileBase: () => 'bundles/bundle.tracing',
-});
-
-const replayBaseBundleConfig = makeBaseBundleConfig({
-  bundleType: 'standalone',
-  entrypoints: ['src/index.bundle.replay.ts'],
-  licenseTitle: '@sentry/browser (Replay)',
-  outputFileBase: () => 'bundles/bundle.replay',
-});
-
 const feedbackBaseBundleConfig = makeBaseBundleConfig({
   bundleType: 'standalone',
   entrypoints: ['src/index.bundle.feedback.ts'],
   licenseTitle: '@sentry/browser & @sentry/feedback',
   outputFileBase: () => 'bundles/bundle.feedback',
 });
 
-const tracingReplayBaseBundleConfig = makeBaseBundleConfig({
+const logsMetricsBaseBundleConfig = makeBaseBundleConfig({
   bundleType: 'standalone',
-  entrypoints: ['src/index.bundle.tracing.replay.ts'],
-  licenseTitle: '@sentry/browser (Performance Monitoring and Replay)',
-  outputFileBase: () => 'bundles/bundle.tracing.replay',
+  entrypoints: ['src/index.bundle.logs.metrics.ts'],
+  licenseTitle: '@sentry/browser (Logs and Metrics)',
+  outputFileBase: () => 'bundles/bundle.logs.metrics',
+});
+
+const replayBaseBundleConfig = makeBaseBundleConfig({
+  bundleType: 'standalone',
+  entrypoints: ['src/index.bundle.replay.ts'],
+  licenseTitle: '@sentry/browser (Replay)',
+  outputFileBase: () => 'bundles/bundle.replay',
 });
 
 const replayFeedbackBaseBundleConfig = makeBaseBundleConfig({
@@ -97,18 +90,19 @@ const replayFeedbackBaseBundleConfig = makeBaseBundleConfig({
   outputFileBase: () => 'bundles/bundle.replay.feedback',
 });
 
-const tracingReplayFeedbackBaseBundleConfig = makeBaseBundleConfig({
+const replayLogsMetricsBaseBundleConfig = makeBaseBundleConfig({
   bundleType: 'standalone',
-  entrypoints: ['src/index.bundle.tracing.replay.feedback.ts'],
-  licenseTitle: '@sentry/browser (Performance Monitoring, Replay, and Feedback)',
-  outputFileBase: () => 'bundles/bundle.tracing.replay.feedback',
+  entrypoints: ['src/index.bundle.replay.logs.metrics.ts'],
+  licenseTitle: '@sentry/browser (Replay, Logs, and Metrics)',
+  outputFileBase: () => 'bundles/bundle.replay.logs.metrics',
 });
 
-const logsMetricsBaseBundleConfig = makeBaseBundleConfig({
+// Tracing
+const tracingBaseBundleConfig = makeBaseBundleConfig({
   bundleType: 'standalone',
-  entrypoints: ['src/index.bundle.logs.metrics.ts'],
-  licenseTitle: '@sentry/browser (Logs and Metrics)',
-  outputFileBase: () => 'bundles/bundle.logs.metrics',
+  entrypoints: ['src/index.bundle.tracing.ts'],
+  licenseTitle: '@sentry/browser (Performance Monitoring)',
+  outputFileBase: () => 'bundles/bundle.tracing',
 });
 
 const tracingLogsMetricsBaseBundleConfig = makeBaseBundleConfig({
@@ -118,11 +112,25 @@ const tracingLogsMetricsBaseBundleConfig = makeBaseBundleConfig({
   outputFileBase: () => 'bundles/bundle.tracing.logs.metrics',
 });
 
-const replayLogsMetricsBaseBundleConfig = makeBaseBundleConfig({
+const tracingReplayBaseBundleConfig = makeBaseBundleConfig({
   bundleType: 'standalone',
-  entrypoints: ['src/index.bundle.replay.logs.metrics.ts'],
-  licenseTitle: '@sentry/browser (Replay, Logs, and Metrics)',
-  outputFileBase: () => 'bundles/bundle.replay.logs.metrics',
+  entrypoints: ['src/index.bundle.tracing.replay.ts'],
+  licenseTitle: '@sentry/browser (Performance Monitoring and Replay)',
+  outputFileBase: () => 'bundles/bundle.tracing.replay',
+});
+
+const tracingReplayLogsMetricsBaseBundleConfig = makeBaseBundleConfig({
+  bundleType: 'standalone',
+  entrypoints: ['src/index.bundle.tracing.replay.logs.metrics.ts'],
+  licenseTitle: '@sentry/browser (Performance Monitoring, Replay, Logs, and Metrics)',
+  outputFileBase: () => 'bundles/bundle.tracing.replay.logs.metrics',
+});
+
+const tracingReplayFeedbackBaseBundleConfig = makeBaseBundleConfig({
+  bundleType: 'standalone',
+  entrypoints: ['src/index.bundle.tracing.replay.feedback.ts'],
+  licenseTitle: '@sentry/browser (Performance Monitoring, Replay, and Feedback)',
+  outputFileBase: () => 'bundles/bundle.tracing.replay.feedback',
 });
 
 const tracingReplayFeedbackLogsMetricsBaseBundleConfig = makeBaseBundleConfig({
@@ -134,15 +142,16 @@ const tracingReplayFeedbackLogsMetricsBaseBundleConfig = makeBaseBundleConfig({
 
 builds.push(
   ...makeBundleConfigVariants(baseBundleConfig),
-  ...makeBundleConfigVariants(tracingBaseBundleConfig),
-  ...makeBundleConfigVariants(replayBaseBundleConfig),
   ...makeBundleConfigVariants(feedbackBaseBundleConfig),
-  ...makeBundleConfigVariants(tracingReplayBaseBundleConfig),
-  ...makeBundleConfigVariants(replayFeedbackBaseBundleConfig),
-  ...makeBundleConfigVariants(tracingReplayFeedbackBaseBundleConfig),
   ...makeBundleConfigVariants(logsMetricsBaseBundleConfig),
-  ...makeBundleConfigVariants(tracingLogsMetricsBaseBundleConfig),
+  ...makeBundleConfigVariants(replayBaseBundleConfig),
+  ...makeBundleConfigVariants(replayFeedbackBaseBundleConfig),
   ...makeBundleConfigVariants(replayLogsMetricsBaseBundleConfig),
+  ...makeBundleConfigVariants(tracingBaseBundleConfig),
+  ...makeBundleConfigVariants(tracingLogsMetricsBaseBundleConfig),
+  ...makeBundleConfigVariants(tracingReplayBaseBundleConfig),
+  ...makeBundleConfigVariants(tracingReplayLogsMetricsBaseBundleConfig),
+  ...makeBundleConfigVariants(tracingReplayFeedbackBaseBundleConfig),
   ...makeBundleConfigVariants(tracingReplayFeedbackLogsMetricsBaseBundleConfig),
 );
 

packages/browser/src/index.bundle.tracing.replay.logs.metrics.ts

@@ -0,0 +1,33 @@
+import { registerSpanErrorInstrumentation } from '@sentry/core';
+import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
+
+registerSpanErrorInstrumentation();
+
+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 {
+  getActiveSpan,
+  getRootSpan,
+  getSpanDescendants,
+  setMeasurement,
+  startInactiveSpan,
+  startNewTrace,
+  startSpan,
+  startSpanManual,
+  withActiveSpan,
+} from '@sentry/core';
+
+export {
+  browserTracingIntegration,
+  startBrowserTracingNavigationSpan,
+  startBrowserTracingPageLoadSpan,
+} from './tracing/browserTracingIntegration';
+export { reportPageLoaded } from './tracing/reportPageLoaded';
+export { setActiveSpanInBrowser } from './tracing/setActiveSpan';
+
+export { feedbackIntegrationShim as feedbackAsyncIntegration, feedbackIntegrationShim as feedbackIntegration };
+
+export { replayIntegration, getReplay } from '@sentry-internal/replay';

packages/browser/test/index.bundle.tracing.replay.logs.metrics.test.ts

@@ -0,0 +1,17 @@
+import { logger as coreLogger, metrics as coreMetrics } from '@sentry/core';
+import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
+import { describe, expect, it } from 'vitest';
+import { browserTracingIntegration, replayIntegration } from '../src';
+import * as TracingReplayLogsMetricsBundle from '../src/index.bundle.tracing.replay.logs.metrics';
+
+describe('index.bundle.tracing.replay.logs.metrics', () => {
+  it('has correct exports', () => {
+    expect(TracingReplayLogsMetricsBundle.browserTracingIntegration).toBe(browserTracingIntegration);
+    expect(TracingReplayLogsMetricsBundle.feedbackAsyncIntegration).toBe(feedbackIntegrationShim);
+    expect(TracingReplayLogsMetricsBundle.feedbackIntegration).toBe(feedbackIntegrationShim);
+    expect(TracingReplayLogsMetricsBundle.replayIntegration).toBe(replayIntegration);
+
+    expect(TracingReplayLogsMetricsBundle.logger).toBe(coreLogger);
+    expect(TracingReplayLogsMetricsBundle.metrics).toBe(coreMetrics);
+  });
+});