Skip to content

Commit 3f9cd43

Browse files
authored
feat: Add @sentry-internal/browser-utils (#11381)
This PR creates a `browser-utils` package that contains browser specific utils that can be shared between the browser, replay, and feedback packages. Eventually we will move `browserTracingIntegration` outside of this package, but the instrumentation handlers will remain here. We will also move the browser related utils in `@sentry/utils` to this package. Given this removes `@sentry-internal/tracing` entirely, it is a part of #9885 ref #9832
1 parent 3d82cdb commit 3f9cd43

File tree

74 files changed

+56
-49
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+56
-49
lines changed

.craft.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ targets:
1616
- name: npm
1717
id: '@sentry/core'
1818
includeNames: /^sentry-core-\d.*\.tgz$/
19-
## 1.4 Tracing package
19+
## 1.4 Browser Utils package
2020
- name: npm
21-
id: '@sentry-internal/tracing'
22-
includeNames: /^sentry-internal-tracing-\d.*\.tgz$/
21+
id: '@sentry-internal/browser-utils'
22+
includeNames: /^sentry-internal-browser-utils-\d.*\.tgz$/
2323
## 1.5 Replay Internal package (browser only)
2424
- name: npm
2525
id: '@sentry-internal/replay'

.github/workflows/build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,12 @@ jobs:
9696
- 'scripts/**'
9797
- 'packages/core/**'
9898
- 'packages/rollup-utils/**'
99-
- 'packages/tracing/**'
100-
- 'packages/tracing-internal/**'
10199
- 'packages/utils/**'
102100
- 'packages/types/**'
103101
browser: &browser
104102
- *shared
105103
- 'packages/browser/**'
104+
- 'packages/browser-utils/**'
106105
- 'packages/replay/**'
107106
- 'packages/replay-canvas/**'
108107
- 'packages/feedback/**'

dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/subject.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addLcpInstrumentationHandler } from '@sentry-internal/tracing';
1+
import { addLcpInstrumentationHandler } from '@sentry-internal/browser-utils';
22

33
addLcpInstrumentationHandler(({ metric }) => {
44
const entry = metric.entries[metric.entries.length - 1];

dev-packages/e2e-tests/test-applications/nextjs-14/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@sentry-internal/event-proxy-server": "link:../../../event-proxy-server",
3030
"@sentry-internal/feedback": "latest || *",
3131
"@sentry-internal/replay-canvas": "latest || *",
32-
"@sentry-internal/tracing": "latest || *",
32+
"@sentry-internal/browser-utils": "latest || *",
3333
"@sentry/browser": "latest || *",
3434
"@sentry/core": "latest || *",
3535
"@sentry/nextjs": "latest || *",

dev-packages/e2e-tests/test-applications/nextjs-app-dir/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@sentry-internal/event-proxy-server": "link:../../../event-proxy-server",
3333
"@sentry-internal/feedback": "latest || *",
3434
"@sentry-internal/replay-canvas": "latest || *",
35-
"@sentry-internal/tracing": "latest || *",
35+
"@sentry-internal/browser-utils": "latest || *",
3636
"@sentry/browser": "latest || *",
3737
"@sentry/core": "latest || *",
3838
"@sentry/nextjs": "latest || *",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"packages/astro",
4949
"packages/aws-serverless",
5050
"packages/browser",
51+
"packages/browser-utils",
5152
"packages/bun",
5253
"packages/core",
5354
"packages/deno",
@@ -69,7 +70,6 @@
6970
"packages/replay-worker",
7071
"packages/svelte",
7172
"packages/sveltekit",
72-
"packages/tracing-internal",
7373
"packages/types",
7474
"packages/typescript",
7575
"packages/utils",
File renamed without changes.

packages/browser-utils/README.md

Lines changed: 23 additions & 0 deletions

packages/tracing-internal/package.json renamed to packages/browser-utils/package.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"name": "@sentry-internal/tracing",
2+
"name": "@sentry-internal/browser-utils",
33
"version": "8.0.0-alpha.7",
4-
"description": "Sentry Internal Tracing Package",
4+
"description": "Browser Utilities for all Sentry JavaScript SDKs",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
6-
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tracing-internal",
6+
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
77
"author": "Sentry",
88
"license": "MIT",
99
"engines": {
@@ -46,9 +46,6 @@
4646
"@sentry/types": "8.0.0-alpha.7",
4747
"@sentry/utils": "8.0.0-alpha.7"
4848
},
49-
"devDependencies": {
50-
"@types/express": "^4.17.14"
51-
},
5249
"scripts": {
5350
"build": "run-p build:transpile build:types",
5451
"build:dev": "yarn build",
@@ -61,7 +58,7 @@
6158
"build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
6259
"build:types:watch": "tsc -p tsconfig.types.json --watch",
6360
"build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build",
64-
"clean": "rimraf build coverage sentry-internal-tracing-*.tgz",
61+
"clean": "rimraf build coverage sentry-internal-browser-utils-*.tgz",
6562
"fix": "eslint . --format stylish --fix",
6663
"lint": "eslint . --format stylish",
6764
"test:unit": "jest",

packages/browser/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@sentry-internal/feedback": "8.0.0-alpha.7",
4646
"@sentry-internal/replay": "8.0.0-alpha.7",
4747
"@sentry-internal/replay-canvas": "8.0.0-alpha.7",
48-
"@sentry-internal/tracing": "8.0.0-alpha.7",
48+
"@sentry-internal/browser-utils": "8.0.0-alpha.7",
4949
"@sentry/core": "8.0.0-alpha.7",
5050
"@sentry/types": "8.0.0-alpha.7",
5151
"@sentry/utils": "8.0.0-alpha.7"

packages/browser/src/index.bundle.tracing.replay.feedback.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { feedbackIntegration, getFeedback } from '@sentry-internal/feedback';
2-
import { replayIntegration } from '@sentry-internal/replay';
31
import {
42
browserTracingIntegration,
53
startBrowserTracingNavigationSpan,
64
startBrowserTracingPageLoadSpan,
7-
} from '@sentry-internal/tracing';
5+
} from '@sentry-internal/browser-utils';
6+
import { feedbackIntegration, getFeedback } from '@sentry-internal/feedback';
7+
import { replayIntegration } from '@sentry-internal/replay';
88
import { addTracingExtensions } from '@sentry/core';
99

1010
// We are patching the global object with our hub extension methods

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
2-
import { replayIntegration } from '@sentry-internal/replay';
31
import {
42
browserTracingIntegration,
53
startBrowserTracingNavigationSpan,
64
startBrowserTracingPageLoadSpan,
7-
} from '@sentry-internal/tracing';
5+
} from '@sentry-internal/browser-utils';
6+
import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
7+
import { replayIntegration } from '@sentry-internal/replay';
88
import { addTracingExtensions } from '@sentry/core';
99

1010
// We are patching the global object with our hub extension methods

packages/browser/src/index.bundle.tracing.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// This is exported so the loader does not fail when switching off Replay
2-
import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
31
import {
42
browserTracingIntegration,
53
startBrowserTracingNavigationSpan,
64
startBrowserTracingPageLoadSpan,
7-
} from '@sentry-internal/tracing';
5+
} from '@sentry-internal/browser-utils';
6+
// This is exported so the loader does not fail when switching off Replay
7+
import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
88
import { addTracingExtensions } from '@sentry/core';
99

1010
// We are patching the global object with our hub extension methods

packages/browser/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ export {
4242
browserTracingIntegration,
4343
startBrowserTracingNavigationSpan,
4444
startBrowserTracingPageLoadSpan,
45-
} from '@sentry-internal/tracing';
46-
export type { RequestInstrumentationOptions } from '@sentry-internal/tracing';
45+
} from '@sentry-internal/browser-utils';
46+
export type { RequestInstrumentationOptions } from '@sentry-internal/browser-utils';
4747
export {
4848
addTracingExtensions,
4949
getActiveSpan,

packages/browser/src/profiling/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ export function isProfiledTransactionEvent(event: Event): event is ProfiledEvent
196196
}
197197

198198
/*
199-
See packages/tracing-internal/src/browser/router.ts
199+
See packages/browser-utils/src/browser/router.ts
200200
*/
201201
/**
202202
*

packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { browserTracingIntegration } from '@sentry-internal/tracing';
1+
import { browserTracingIntegration } from '@sentry-internal/browser-utils';
22
import { feedbackIntegration, replayIntegration } from '@sentry/browser';
33

44
import * as TracingReplayFeedbackBundle from '../../src/index.bundle.tracing.replay.feedback';

packages/browser/test/unit/index.bundle.tracing.replay.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { browserTracingIntegration } from '@sentry-internal/browser-utils';
12
import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
2-
import { browserTracingIntegration } from '@sentry-internal/tracing';
33
import { replayIntegration } from '@sentry/browser';
44

55
import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay';

packages/browser/test/unit/index.bundle.tracing.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { browserTracingIntegration } from '@sentry-internal/browser-utils';
12
import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
2-
import { browserTracingIntegration } from '@sentry-internal/tracing';
33

44
import * as TracingBundle from '../../src/index.bundle.tracing';
55

packages/nextjs/test/integration/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
"@sentry/node": "file:../../../node",
3131
"@sentry/opentelemetry": "file:../../../opentelemetry",
3232
"@sentry/react": "file:../../../react",
33+
"@sentry-internal/browser-utils": "file:../../../browser-utils",
3334
"@sentry-internal/replay": "file:../../../replay-internal",
3435
"@sentry-internal/replay-canvas": "file:../../../replay-canvas",
35-
"@sentry-internal/tracing": "file:../../../tracing-internal",
3636
"@sentry-internal/feedback": "file:../../../feedback",
3737
"@sentry/types": "file:../../../types",
3838
"@sentry/utils": "file:../../../utils",

packages/remix/test/integration/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
"@sentry/node": "file:../../../node",
2929
"@sentry/opentelemetry": "file:../../../opentelemetry",
3030
"@sentry/react": "file:../../../react",
31+
"@sentry-internal/browser-utils": "file:../../../browser-utils",
3132
"@sentry-internal/replay": "file:../../../replay-internal",
3233
"@sentry-internal/replay-canvas": "file:../../../replay-canvas",
33-
"@sentry-internal/tracing": "file:../../../tracing-internal",
3434
"@sentry-internal/feedback": "file:../../../feedback",
3535
"@sentry/types": "file:../../../types",
3636
"@sentry/utils": "file:../../../utils",

packages/replay-internal/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"jsdom-worker": "^0.2.1"
7777
},
7878
"dependencies": {
79-
"@sentry-internal/tracing": "8.0.0-alpha.7",
79+
"@sentry-internal/browser-utils": "8.0.0-alpha.7",
8080
"@sentry/core": "8.0.0-alpha.7",
8181
"@sentry/types": "8.0.0-alpha.7",
8282
"@sentry/utils": "8.0.0-alpha.7"

packages/replay-internal/src/coreHandlers/performanceObserver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addLcpInstrumentationHandler, addPerformanceInstrumentationHandler } from '@sentry-internal/tracing';
1+
import { addLcpInstrumentationHandler, addPerformanceInstrumentationHandler } from '@sentry-internal/browser-utils';
22

33
import type { ReplayContainer } from '../types';
44
import { getLargestContentfulPaint } from '../util/createPerformanceEntries';

packages/sveltekit/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
"@sveltejs/kit": "1.x || 2.x"
3838
},
3939
"dependencies": {
40-
"@sentry-internal/tracing": "8.0.0-alpha.7",
4140
"@sentry/core": "8.0.0-alpha.7",
4241
"@sentry/node": "8.0.0-alpha.7",
4342
"@sentry/opentelemetry": "8.0.0-alpha.7",

packages/tracing-internal/README.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

scripts/node-unit-tests.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const DEFAULT_SKIP_TESTS_PACKAGES = [
1717
'@sentry/angular',
1818
'@sentry/svelte',
1919
'@sentry/profiling-node',
20+
'@sentry-internal/browser-utils',
2021
'@sentry-internal/replay',
2122
'@sentry-internal/replay-canvas',
2223
'@sentry-internal/replay-worker',

0 commit comments

Comments
 (0)