Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,7 @@ jobs:
- bundle_min
- bundle_replay
- bundle_tracing
- bundle_logs_metrics
- bundle_tracing_logs_metrics
- bundle_tracing_replay
- bundle_tracing_replay_feedback
Expand Down
13 changes: 13 additions & 0 deletions .size-limit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down Expand Up @@ -225,6 +231,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'),
Expand Down
3 changes: 3 additions & 0 deletions dev-packages/browser-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
8 changes: 8 additions & 0 deletions packages/browser/rollup.bundle.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand All @@ -126,6 +133,7 @@ builds.push(
...makeBundleConfigVariants(tracingReplayBaseBundleConfig),
...makeBundleConfigVariants(replayFeedbackBaseBundleConfig),
...makeBundleConfigVariants(tracingReplayFeedbackBaseBundleConfig),
...makeBundleConfigVariants(logsMetricsBaseBundleConfig),
...makeBundleConfigVariants(tracingLogsMetricsBaseBundleConfig),
...makeBundleConfigVariants(tracingReplayFeedbackLogsMetricsBaseBundleConfig),
);
Expand Down
17 changes: 17 additions & 0 deletions packages/browser/src/index.bundle.logs.metrics.ts
Original file line number Diff line number Diff line change
@@ -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,
};
10 changes: 10 additions & 0 deletions packages/browser/test/index.bundle.logs.metrics.test.ts
Original file line number Diff line number Diff line change
@@ -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);
});
});
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unit test is incomplete compared to existing patterns

Low Severity · Bugbot Rules

The unit test only verifies logger and metrics exports, but all other bundle tests (e.g., index.bundle.test.ts, index.bundle.tracing.test.ts, index.bundle.tracing.logs.metrics.test.ts) also verify that integration shims are correctly exported. This test is missing assertions for browserTracingIntegration, feedbackIntegration, feedbackAsyncIntegration, replayIntegration (all should be shims), and consoleLoggingIntegration (should be the real implementation). This violates the review rule to "check that tests actually test the newly added behaviour" - incomplete coverage could miss regressions where shims are accidentally replaced with real implementations.

Fix in Cursor Fix in Web

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is simply not true.

Loading