diff --git a/.craft.yml b/.craft.yml index 27ff96e235d9..1e3c27f319a2 100644 --- a/.craft.yml +++ b/.craft.yml @@ -16,10 +16,10 @@ targets: - name: npm id: '@sentry/core' includeNames: /^sentry-core-\d.*\.tgz$/ - ## 1.4 Tracing package + ## 1.4 Browser Utils package - name: npm - id: '@sentry-internal/tracing' - includeNames: /^sentry-internal-tracing-\d.*\.tgz$/ + id: '@sentry-internal/browser-utils' + includeNames: /^sentry-internal-browser-utils-\d.*\.tgz$/ ## 1.5 Replay Internal package (browser only) - name: npm id: '@sentry-internal/replay' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7979bb36eb9..f59daaa09b98 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,13 +96,12 @@ jobs: - 'scripts/**' - 'packages/core/**' - 'packages/rollup-utils/**' - - 'packages/tracing/**' - - 'packages/tracing-internal/**' - 'packages/utils/**' - 'packages/types/**' browser: &browser - *shared - 'packages/browser/**' + - 'packages/browser-utils/**' - 'packages/replay/**' - 'packages/replay-canvas/**' - 'packages/feedback/**' diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/subject.js b/dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/subject.js index d0f8df871ee3..784df44a0c17 100644 --- a/dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/subject.js +++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/subject.js @@ -1,4 +1,4 @@ -import { addLcpInstrumentationHandler } from '@sentry-internal/tracing'; +import { addLcpInstrumentationHandler } from '@sentry-internal/browser-utils'; addLcpInstrumentationHandler(({ metric }) => { const entry = metric.entries[metric.entries.length - 1]; diff --git a/dev-packages/e2e-tests/test-applications/nextjs-14/package.json b/dev-packages/e2e-tests/test-applications/nextjs-14/package.json index 87ec5b57b91d..cb4fd020441d 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-14/package.json +++ b/dev-packages/e2e-tests/test-applications/nextjs-14/package.json @@ -29,7 +29,7 @@ "@sentry-internal/event-proxy-server": "link:../../../event-proxy-server", "@sentry-internal/feedback": "latest || *", "@sentry-internal/replay-canvas": "latest || *", - "@sentry-internal/tracing": "latest || *", + "@sentry-internal/browser-utils": "latest || *", "@sentry/browser": "latest || *", "@sentry/core": "latest || *", "@sentry/nextjs": "latest || *", diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/package.json b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/package.json index 501b9615dede..4bfb163d9885 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/package.json +++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/package.json @@ -32,7 +32,7 @@ "@sentry-internal/event-proxy-server": "link:../../../event-proxy-server", "@sentry-internal/feedback": "latest || *", "@sentry-internal/replay-canvas": "latest || *", - "@sentry-internal/tracing": "latest || *", + "@sentry-internal/browser-utils": "latest || *", "@sentry/browser": "latest || *", "@sentry/core": "latest || *", "@sentry/nextjs": "latest || *", diff --git a/package.json b/package.json index 6ef476c56358..00945d179e72 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "packages/astro", "packages/aws-serverless", "packages/browser", + "packages/browser-utils", "packages/bun", "packages/core", "packages/deno", @@ -69,7 +70,6 @@ "packages/replay-worker", "packages/svelte", "packages/sveltekit", - "packages/tracing-internal", "packages/types", "packages/typescript", "packages/utils", diff --git a/packages/tracing-internal/.eslintrc.js b/packages/browser-utils/.eslintrc.js similarity index 100% rename from packages/tracing-internal/.eslintrc.js rename to packages/browser-utils/.eslintrc.js diff --git a/packages/tracing-internal/LICENSE b/packages/browser-utils/LICENSE similarity index 100% rename from packages/tracing-internal/LICENSE rename to packages/browser-utils/LICENSE diff --git a/packages/browser-utils/README.md b/packages/browser-utils/README.md new file mode 100644 index 000000000000..108f3f3613c7 --- /dev/null +++ b/packages/browser-utils/README.md @@ -0,0 +1,23 @@ +

+ + Sentry + +

+ +# Sentry JavaScript SDK Browser Utilities + +[![npm version](https://img.shields.io/npm/v/@sentry-internal/browser-utils.svg)](https://www.npmjs.com/package/@sentry-internal/browser-utils) +[![npm dm](https://img.shields.io/npm/dm/@sentry-internal/browser-utils.svg)](https://www.npmjs.com/package/@sentry-internal/browser-utils) +[![npm dt](https://img.shields.io/npm/dt/@sentry-internal/browser-utils.svg)](https://www.npmjs.com/package/@sentry-internal/browser-utils) + +## Links + +- [Official SDK Docs](https://docs.sentry.io/quickstart/) +- [TypeDoc](http://getsentry.github.io/sentry-javascript/) + +## General + +Common utilities used by the Sentry JavaScript SDKs. + +Note: This package is only meant to be used internally, and as such is not part of our public API contract and does not +follow semver. diff --git a/packages/tracing-internal/jest.config.js b/packages/browser-utils/jest.config.js similarity index 100% rename from packages/tracing-internal/jest.config.js rename to packages/browser-utils/jest.config.js diff --git a/packages/tracing-internal/package.json b/packages/browser-utils/package.json similarity index 89% rename from packages/tracing-internal/package.json rename to packages/browser-utils/package.json index 8f02714c7d72..977fc67d9675 100644 --- a/packages/tracing-internal/package.json +++ b/packages/browser-utils/package.json @@ -1,9 +1,9 @@ { - "name": "@sentry-internal/tracing", + "name": "@sentry-internal/browser-utils", "version": "8.0.0-alpha.7", - "description": "Sentry Internal Tracing Package", + "description": "Browser Utilities for all Sentry JavaScript SDKs", "repository": "git://github.com/getsentry/sentry-javascript.git", - "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tracing-internal", + "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils", "author": "Sentry", "license": "MIT", "engines": { @@ -46,9 +46,6 @@ "@sentry/types": "8.0.0-alpha.7", "@sentry/utils": "8.0.0-alpha.7" }, - "devDependencies": { - "@types/express": "^4.17.14" - }, "scripts": { "build": "run-p build:transpile build:types", "build:dev": "yarn build", @@ -61,7 +58,7 @@ "build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch", "build:types:watch": "tsc -p tsconfig.types.json --watch", "build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build", - "clean": "rimraf build coverage sentry-internal-tracing-*.tgz", + "clean": "rimraf build coverage sentry-internal-browser-utils-*.tgz", "fix": "eslint . --format stylish --fix", "lint": "eslint . --format stylish", "test:unit": "jest", diff --git a/packages/tracing-internal/rollup.npm.config.mjs b/packages/browser-utils/rollup.npm.config.mjs similarity index 100% rename from packages/tracing-internal/rollup.npm.config.mjs rename to packages/browser-utils/rollup.npm.config.mjs diff --git a/packages/tracing-internal/src/browser/backgroundtab.ts b/packages/browser-utils/src/browser/backgroundtab.ts similarity index 100% rename from packages/tracing-internal/src/browser/backgroundtab.ts rename to packages/browser-utils/src/browser/backgroundtab.ts diff --git a/packages/tracing-internal/src/browser/browserTracingIntegration.ts b/packages/browser-utils/src/browser/browserTracingIntegration.ts similarity index 100% rename from packages/tracing-internal/src/browser/browserTracingIntegration.ts rename to packages/browser-utils/src/browser/browserTracingIntegration.ts diff --git a/packages/tracing-internal/src/browser/index.ts b/packages/browser-utils/src/browser/index.ts similarity index 100% rename from packages/tracing-internal/src/browser/index.ts rename to packages/browser-utils/src/browser/index.ts diff --git a/packages/tracing-internal/src/browser/instrument.ts b/packages/browser-utils/src/browser/instrument.ts similarity index 100% rename from packages/tracing-internal/src/browser/instrument.ts rename to packages/browser-utils/src/browser/instrument.ts diff --git a/packages/tracing-internal/src/browser/metrics/index.ts b/packages/browser-utils/src/browser/metrics/index.ts similarity index 100% rename from packages/tracing-internal/src/browser/metrics/index.ts rename to packages/browser-utils/src/browser/metrics/index.ts diff --git a/packages/tracing-internal/src/browser/metrics/utils.ts b/packages/browser-utils/src/browser/metrics/utils.ts similarity index 100% rename from packages/tracing-internal/src/browser/metrics/utils.ts rename to packages/browser-utils/src/browser/metrics/utils.ts diff --git a/packages/tracing-internal/src/browser/request.ts b/packages/browser-utils/src/browser/request.ts similarity index 100% rename from packages/tracing-internal/src/browser/request.ts rename to packages/browser-utils/src/browser/request.ts diff --git a/packages/tracing-internal/src/browser/types.ts b/packages/browser-utils/src/browser/types.ts similarity index 100% rename from packages/tracing-internal/src/browser/types.ts rename to packages/browser-utils/src/browser/types.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/README.md b/packages/browser-utils/src/browser/web-vitals/README.md similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/README.md rename to packages/browser-utils/src/browser/web-vitals/README.md diff --git a/packages/tracing-internal/src/browser/web-vitals/getCLS.ts b/packages/browser-utils/src/browser/web-vitals/getCLS.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/getCLS.ts rename to packages/browser-utils/src/browser/web-vitals/getCLS.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/getFID.ts b/packages/browser-utils/src/browser/web-vitals/getFID.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/getFID.ts rename to packages/browser-utils/src/browser/web-vitals/getFID.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/getINP.ts b/packages/browser-utils/src/browser/web-vitals/getINP.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/getINP.ts rename to packages/browser-utils/src/browser/web-vitals/getINP.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/getLCP.ts b/packages/browser-utils/src/browser/web-vitals/getLCP.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/getLCP.ts rename to packages/browser-utils/src/browser/web-vitals/getLCP.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/lib/bindReporter.ts b/packages/browser-utils/src/browser/web-vitals/lib/bindReporter.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/lib/bindReporter.ts rename to packages/browser-utils/src/browser/web-vitals/lib/bindReporter.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/lib/generateUniqueID.ts b/packages/browser-utils/src/browser/web-vitals/lib/generateUniqueID.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/lib/generateUniqueID.ts rename to packages/browser-utils/src/browser/web-vitals/lib/generateUniqueID.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/lib/getActivationStart.ts b/packages/browser-utils/src/browser/web-vitals/lib/getActivationStart.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/lib/getActivationStart.ts rename to packages/browser-utils/src/browser/web-vitals/lib/getActivationStart.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/lib/getNavigationEntry.ts b/packages/browser-utils/src/browser/web-vitals/lib/getNavigationEntry.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/lib/getNavigationEntry.ts rename to packages/browser-utils/src/browser/web-vitals/lib/getNavigationEntry.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/lib/getVisibilityWatcher.ts b/packages/browser-utils/src/browser/web-vitals/lib/getVisibilityWatcher.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/lib/getVisibilityWatcher.ts rename to packages/browser-utils/src/browser/web-vitals/lib/getVisibilityWatcher.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/lib/initMetric.ts b/packages/browser-utils/src/browser/web-vitals/lib/initMetric.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/lib/initMetric.ts rename to packages/browser-utils/src/browser/web-vitals/lib/initMetric.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/lib/observe.ts b/packages/browser-utils/src/browser/web-vitals/lib/observe.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/lib/observe.ts rename to packages/browser-utils/src/browser/web-vitals/lib/observe.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/lib/onHidden.ts b/packages/browser-utils/src/browser/web-vitals/lib/onHidden.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/lib/onHidden.ts rename to packages/browser-utils/src/browser/web-vitals/lib/onHidden.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/lib/polyfills/interactionCountPolyfill.ts b/packages/browser-utils/src/browser/web-vitals/lib/polyfills/interactionCountPolyfill.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/lib/polyfills/interactionCountPolyfill.ts rename to packages/browser-utils/src/browser/web-vitals/lib/polyfills/interactionCountPolyfill.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/lib/runOnce.ts b/packages/browser-utils/src/browser/web-vitals/lib/runOnce.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/lib/runOnce.ts rename to packages/browser-utils/src/browser/web-vitals/lib/runOnce.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/lib/whenActivated.ts b/packages/browser-utils/src/browser/web-vitals/lib/whenActivated.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/lib/whenActivated.ts rename to packages/browser-utils/src/browser/web-vitals/lib/whenActivated.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/onFCP.ts b/packages/browser-utils/src/browser/web-vitals/onFCP.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/onFCP.ts rename to packages/browser-utils/src/browser/web-vitals/onFCP.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/onTTFB.ts b/packages/browser-utils/src/browser/web-vitals/onTTFB.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/onTTFB.ts rename to packages/browser-utils/src/browser/web-vitals/onTTFB.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/types.ts b/packages/browser-utils/src/browser/web-vitals/types.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/types.ts rename to packages/browser-utils/src/browser/web-vitals/types.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/types/base.ts b/packages/browser-utils/src/browser/web-vitals/types/base.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/types/base.ts rename to packages/browser-utils/src/browser/web-vitals/types/base.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/types/cls.ts b/packages/browser-utils/src/browser/web-vitals/types/cls.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/types/cls.ts rename to packages/browser-utils/src/browser/web-vitals/types/cls.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/types/fcp.ts b/packages/browser-utils/src/browser/web-vitals/types/fcp.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/types/fcp.ts rename to packages/browser-utils/src/browser/web-vitals/types/fcp.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/types/fid.ts b/packages/browser-utils/src/browser/web-vitals/types/fid.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/types/fid.ts rename to packages/browser-utils/src/browser/web-vitals/types/fid.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/types/inp.ts b/packages/browser-utils/src/browser/web-vitals/types/inp.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/types/inp.ts rename to packages/browser-utils/src/browser/web-vitals/types/inp.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/types/lcp.ts b/packages/browser-utils/src/browser/web-vitals/types/lcp.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/types/lcp.ts rename to packages/browser-utils/src/browser/web-vitals/types/lcp.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/types/polyfills.ts b/packages/browser-utils/src/browser/web-vitals/types/polyfills.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/types/polyfills.ts rename to packages/browser-utils/src/browser/web-vitals/types/polyfills.ts diff --git a/packages/tracing-internal/src/browser/web-vitals/types/ttfb.ts b/packages/browser-utils/src/browser/web-vitals/types/ttfb.ts similarity index 100% rename from packages/tracing-internal/src/browser/web-vitals/types/ttfb.ts rename to packages/browser-utils/src/browser/web-vitals/types/ttfb.ts diff --git a/packages/tracing-internal/src/common/debug-build.ts b/packages/browser-utils/src/common/debug-build.ts similarity index 100% rename from packages/tracing-internal/src/common/debug-build.ts rename to packages/browser-utils/src/common/debug-build.ts diff --git a/packages/tracing-internal/src/index.ts b/packages/browser-utils/src/index.ts similarity index 100% rename from packages/tracing-internal/src/index.ts rename to packages/browser-utils/src/index.ts diff --git a/packages/tracing-internal/test/browser/backgroundtab.test.ts b/packages/browser-utils/test/browser/backgroundtab.test.ts similarity index 100% rename from packages/tracing-internal/test/browser/backgroundtab.test.ts rename to packages/browser-utils/test/browser/backgroundtab.test.ts diff --git a/packages/tracing-internal/test/browser/browserTracingIntegration.test.ts b/packages/browser-utils/test/browser/browserTracingIntegration.test.ts similarity index 100% rename from packages/tracing-internal/test/browser/browserTracingIntegration.test.ts rename to packages/browser-utils/test/browser/browserTracingIntegration.test.ts diff --git a/packages/tracing-internal/test/browser/metrics/index.test.ts b/packages/browser-utils/test/browser/metrics/index.test.ts similarity index 100% rename from packages/tracing-internal/test/browser/metrics/index.test.ts rename to packages/browser-utils/test/browser/metrics/index.test.ts diff --git a/packages/tracing-internal/test/browser/metrics/utils.test.ts b/packages/browser-utils/test/browser/metrics/utils.test.ts similarity index 100% rename from packages/tracing-internal/test/browser/metrics/utils.test.ts rename to packages/browser-utils/test/browser/metrics/utils.test.ts diff --git a/packages/tracing-internal/test/browser/request.test.ts b/packages/browser-utils/test/browser/request.test.ts similarity index 100% rename from packages/tracing-internal/test/browser/request.test.ts rename to packages/browser-utils/test/browser/request.test.ts diff --git a/packages/tracing-internal/test/utils/TestClient.ts b/packages/browser-utils/test/utils/TestClient.ts similarity index 100% rename from packages/tracing-internal/test/utils/TestClient.ts rename to packages/browser-utils/test/utils/TestClient.ts diff --git a/packages/tracing-internal/tsconfig.json b/packages/browser-utils/tsconfig.json similarity index 100% rename from packages/tracing-internal/tsconfig.json rename to packages/browser-utils/tsconfig.json diff --git a/packages/tracing-internal/tsconfig.test.json b/packages/browser-utils/tsconfig.test.json similarity index 100% rename from packages/tracing-internal/tsconfig.test.json rename to packages/browser-utils/tsconfig.test.json diff --git a/packages/tracing-internal/tsconfig.types.json b/packages/browser-utils/tsconfig.types.json similarity index 100% rename from packages/tracing-internal/tsconfig.types.json rename to packages/browser-utils/tsconfig.types.json diff --git a/packages/browser/package.json b/packages/browser/package.json index f099748dc96d..9cf3fba1d573 100644 --- a/packages/browser/package.json +++ b/packages/browser/package.json @@ -45,7 +45,7 @@ "@sentry-internal/feedback": "8.0.0-alpha.7", "@sentry-internal/replay": "8.0.0-alpha.7", "@sentry-internal/replay-canvas": "8.0.0-alpha.7", - "@sentry-internal/tracing": "8.0.0-alpha.7", + "@sentry-internal/browser-utils": "8.0.0-alpha.7", "@sentry/core": "8.0.0-alpha.7", "@sentry/types": "8.0.0-alpha.7", "@sentry/utils": "8.0.0-alpha.7" diff --git a/packages/browser/src/index.bundle.tracing.replay.feedback.ts b/packages/browser/src/index.bundle.tracing.replay.feedback.ts index 0b137749fd85..6133fc2870f5 100644 --- a/packages/browser/src/index.bundle.tracing.replay.feedback.ts +++ b/packages/browser/src/index.bundle.tracing.replay.feedback.ts @@ -1,10 +1,10 @@ -import { feedbackIntegration, getFeedback } from '@sentry-internal/feedback'; -import { replayIntegration } from '@sentry-internal/replay'; import { browserTracingIntegration, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan, -} from '@sentry-internal/tracing'; +} from '@sentry-internal/browser-utils'; +import { feedbackIntegration, getFeedback } from '@sentry-internal/feedback'; +import { replayIntegration } from '@sentry-internal/replay'; import { addTracingExtensions } from '@sentry/core'; // We are patching the global object with our hub extension methods diff --git a/packages/browser/src/index.bundle.tracing.replay.ts b/packages/browser/src/index.bundle.tracing.replay.ts index ddd1aa6d9ded..f949ea43541a 100644 --- a/packages/browser/src/index.bundle.tracing.replay.ts +++ b/packages/browser/src/index.bundle.tracing.replay.ts @@ -1,10 +1,10 @@ -import { feedbackIntegrationShim } from '@sentry-internal/integration-shims'; -import { replayIntegration } from '@sentry-internal/replay'; import { browserTracingIntegration, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan, -} from '@sentry-internal/tracing'; +} from '@sentry-internal/browser-utils'; +import { feedbackIntegrationShim } from '@sentry-internal/integration-shims'; +import { replayIntegration } from '@sentry-internal/replay'; import { addTracingExtensions } from '@sentry/core'; // We are patching the global object with our hub extension methods diff --git a/packages/browser/src/index.bundle.tracing.ts b/packages/browser/src/index.bundle.tracing.ts index 17df8ff7be33..1b4f89f935df 100644 --- a/packages/browser/src/index.bundle.tracing.ts +++ b/packages/browser/src/index.bundle.tracing.ts @@ -1,10 +1,10 @@ -// This is exported so the loader does not fail when switching off Replay -import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims'; import { browserTracingIntegration, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan, -} from '@sentry-internal/tracing'; +} from '@sentry-internal/browser-utils'; +// This is exported so the loader does not fail when switching off Replay +import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims'; import { addTracingExtensions } from '@sentry/core'; // We are patching the global object with our hub extension methods diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts index 3c52590289cb..54dd27f8b8b5 100644 --- a/packages/browser/src/index.ts +++ b/packages/browser/src/index.ts @@ -42,8 +42,8 @@ export { browserTracingIntegration, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan, -} from '@sentry-internal/tracing'; -export type { RequestInstrumentationOptions } from '@sentry-internal/tracing'; +} from '@sentry-internal/browser-utils'; +export type { RequestInstrumentationOptions } from '@sentry-internal/browser-utils'; export { addTracingExtensions, getActiveSpan, diff --git a/packages/browser/src/profiling/utils.ts b/packages/browser/src/profiling/utils.ts index 46ae0c07442a..a9dd735a3812 100644 --- a/packages/browser/src/profiling/utils.ts +++ b/packages/browser/src/profiling/utils.ts @@ -196,7 +196,7 @@ export function isProfiledTransactionEvent(event: Event): event is ProfiledEvent } /* - See packages/tracing-internal/src/browser/router.ts + See packages/browser-utils/src/browser/router.ts */ /** * diff --git a/packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts b/packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts index 279d72079bc5..a8440d160e2b 100644 --- a/packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts +++ b/packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts @@ -1,4 +1,4 @@ -import { browserTracingIntegration } from '@sentry-internal/tracing'; +import { browserTracingIntegration } from '@sentry-internal/browser-utils'; import { feedbackIntegration, replayIntegration } from '@sentry/browser'; import * as TracingReplayFeedbackBundle from '../../src/index.bundle.tracing.replay.feedback'; diff --git a/packages/browser/test/unit/index.bundle.tracing.replay.test.ts b/packages/browser/test/unit/index.bundle.tracing.replay.test.ts index 6519f4525300..18c286edffc9 100644 --- a/packages/browser/test/unit/index.bundle.tracing.replay.test.ts +++ b/packages/browser/test/unit/index.bundle.tracing.replay.test.ts @@ -1,5 +1,5 @@ +import { browserTracingIntegration } from '@sentry-internal/browser-utils'; import { feedbackIntegrationShim } from '@sentry-internal/integration-shims'; -import { browserTracingIntegration } from '@sentry-internal/tracing'; import { replayIntegration } from '@sentry/browser'; import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay'; diff --git a/packages/browser/test/unit/index.bundle.tracing.test.ts b/packages/browser/test/unit/index.bundle.tracing.test.ts index 62e40d0fad39..1bb1ca19eec1 100644 --- a/packages/browser/test/unit/index.bundle.tracing.test.ts +++ b/packages/browser/test/unit/index.bundle.tracing.test.ts @@ -1,5 +1,5 @@ +import { browserTracingIntegration } from '@sentry-internal/browser-utils'; import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims'; -import { browserTracingIntegration } from '@sentry-internal/tracing'; import * as TracingBundle from '../../src/index.bundle.tracing'; diff --git a/packages/nextjs/test/integration/package.json b/packages/nextjs/test/integration/package.json index 8ac72bc27f13..f4c547b5b687 100644 --- a/packages/nextjs/test/integration/package.json +++ b/packages/nextjs/test/integration/package.json @@ -30,9 +30,9 @@ "@sentry/node": "file:../../../node", "@sentry/opentelemetry": "file:../../../opentelemetry", "@sentry/react": "file:../../../react", + "@sentry-internal/browser-utils": "file:../../../browser-utils", "@sentry-internal/replay": "file:../../../replay-internal", "@sentry-internal/replay-canvas": "file:../../../replay-canvas", - "@sentry-internal/tracing": "file:../../../tracing-internal", "@sentry-internal/feedback": "file:../../../feedback", "@sentry/types": "file:../../../types", "@sentry/utils": "file:../../../utils", diff --git a/packages/remix/test/integration/package.json b/packages/remix/test/integration/package.json index d4f0237223b0..63560ec64e8b 100644 --- a/packages/remix/test/integration/package.json +++ b/packages/remix/test/integration/package.json @@ -28,9 +28,9 @@ "@sentry/node": "file:../../../node", "@sentry/opentelemetry": "file:../../../opentelemetry", "@sentry/react": "file:../../../react", + "@sentry-internal/browser-utils": "file:../../../browser-utils", "@sentry-internal/replay": "file:../../../replay-internal", "@sentry-internal/replay-canvas": "file:../../../replay-canvas", - "@sentry-internal/tracing": "file:../../../tracing-internal", "@sentry-internal/feedback": "file:../../../feedback", "@sentry/types": "file:../../../types", "@sentry/utils": "file:../../../utils", diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json index 6078b4bf8f60..2c84ed0509e4 100644 --- a/packages/replay-internal/package.json +++ b/packages/replay-internal/package.json @@ -76,7 +76,7 @@ "jsdom-worker": "^0.2.1" }, "dependencies": { - "@sentry-internal/tracing": "8.0.0-alpha.7", + "@sentry-internal/browser-utils": "8.0.0-alpha.7", "@sentry/core": "8.0.0-alpha.7", "@sentry/types": "8.0.0-alpha.7", "@sentry/utils": "8.0.0-alpha.7" diff --git a/packages/replay-internal/src/coreHandlers/performanceObserver.ts b/packages/replay-internal/src/coreHandlers/performanceObserver.ts index 8039c659ca6c..45b843760e52 100644 --- a/packages/replay-internal/src/coreHandlers/performanceObserver.ts +++ b/packages/replay-internal/src/coreHandlers/performanceObserver.ts @@ -1,4 +1,4 @@ -import { addLcpInstrumentationHandler, addPerformanceInstrumentationHandler } from '@sentry-internal/tracing'; +import { addLcpInstrumentationHandler, addPerformanceInstrumentationHandler } from '@sentry-internal/browser-utils'; import type { ReplayContainer } from '../types'; import { getLargestContentfulPaint } from '../util/createPerformanceEntries'; diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json index fb572a1e1ec6..e236e663c52f 100644 --- a/packages/sveltekit/package.json +++ b/packages/sveltekit/package.json @@ -37,7 +37,6 @@ "@sveltejs/kit": "1.x || 2.x" }, "dependencies": { - "@sentry-internal/tracing": "8.0.0-alpha.7", "@sentry/core": "8.0.0-alpha.7", "@sentry/node": "8.0.0-alpha.7", "@sentry/opentelemetry": "8.0.0-alpha.7", diff --git a/packages/tracing-internal/README.md b/packages/tracing-internal/README.md deleted file mode 100644 index 76f035499f0d..000000000000 --- a/packages/tracing-internal/README.md +++ /dev/null @@ -1,12 +0,0 @@ -

- - Sentry - -

- -## Sentry Internal Tracing Package - Do not use directly, for internal use only - -This is an internal package that is being used to migrate @sentry/tracing code to its respective runtime packages. - -For v8, @sentry/tracing will be dropped and the code in this package will be split into @sentry/browser and -@sentry/node. diff --git a/scripts/node-unit-tests.ts b/scripts/node-unit-tests.ts index 94802525b4dd..bf46320334df 100644 --- a/scripts/node-unit-tests.ts +++ b/scripts/node-unit-tests.ts @@ -17,6 +17,7 @@ const DEFAULT_SKIP_TESTS_PACKAGES = [ '@sentry/angular', '@sentry/svelte', '@sentry/profiling-node', + '@sentry-internal/browser-utils', '@sentry-internal/replay', '@sentry-internal/replay-canvas', '@sentry-internal/replay-worker',