Merge branch 'main' into aymeric/warn-user-when-heavy-context

DataDog · Mar 29, 2023 · 2ee8991 · 2ee8991
2 parents d8598e9 + 0b18707
commit 2ee8991
Show file tree

Hide file tree

Showing 103 changed files with 258 additions and 250 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,16 @@
 
 ---
 
+## v4.37.0
+
+- ♻️[RUMF-1517] split rum-core specHelper ([#2106](https://github.com/DataDog/browser-sdk/pull/2106))
+- ♻️[RUMF-1517] split scripts utils ([#2102](https://github.com/DataDog/browser-sdk/pull/2102))
+- ✨[RUMF-1500] Remove some references to legacy bundles ([#2097](https://github.com/DataDog/browser-sdk/pull/2097))
+- 📝 RUMF-1497 Update logger API documentation ([#2098](https://github.com/DataDog/browser-sdk/pull/2098))
+- ✨ [RUMF-1518] implement a new API to stop the RUM session ([#2064](https://github.com/DataDog/browser-sdk/pull/2064))
+- 🐛 ♻️ [RUMF 1470] Fix serialization issues ([#1971](https://github.com/DataDog/browser-sdk/pull/1971))
+- ♻️ [RUMF-1505] introduce a safe `setInterval` helper function ([#2044](https://github.com/DataDog/browser-sdk/pull/2044))
+
 ## v4.36.0
 
 - ✨ [RUMF-1497] Allow logger APIs to pass an Error parameter ([#2029](https://github.com/DataDog/browser-sdk/pull/2029))

diff --git a/developer-extension/package.json b/developer-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-sdk-developer-extension",
-  "version": "4.36.0",
+  "version": "4.37.0",
   "private": true,
   "scripts": {
     "build": "rm -rf dist && webpack --mode production",

diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "4.36.0",
+  "version": "4.37.0",
   "publishConfig": {
     "access": "public"
   }

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-core",
-  "version": "4.36.0",
+  "version": "4.37.0",
   "license": "Apache-2.0",
   "main": "cjs/index.js",
   "module": "esm/index.js",

diff --git a/packages/core/src/browser/addEventListener.spec.ts b/packages/core/src/browser/addEventListener.spec.ts
@@ -1,4 +1,4 @@
-import { stubZoneJs } from '../../test/stubZoneJs'
+import { stubZoneJs } from '../../test'
 import { noop } from '../tools/utils'
 
 import { addEventListener, DOM_EVENT } from './addEventListener'

diff --git a/packages/core/src/browser/fetchObservable.spec.ts b/packages/core/src/browser/fetchObservable.spec.ts
@@ -1,5 +1,5 @@
-import type { FetchStub, FetchStubManager, FetchStubPromise } from '../../test/specHelper'
-import { stubFetch } from '../../test/specHelper'
+import type { FetchStub, FetchStubManager, FetchStubPromise } from '../../test'
+import { stubFetch } from '../../test'
 import { isIE } from '../tools/browserDetection'
 import type { Subscription } from '../tools/observable'
 import type { FetchResolveContext, FetchContext } from './fetchObservable'

diff --git a/packages/core/src/browser/pageExitObservable.spec.ts b/packages/core/src/browser/pageExitObservable.spec.ts
@@ -1,4 +1,4 @@
-import { createNewEvent, restorePageVisibility, setPageVisibility } from '../../test/specHelper'
+import { createNewEvent, restorePageVisibility, setPageVisibility } from '../../test'
 import { resetExperimentalFeatures, updateExperimentalFeatures } from '../domain/configuration'
 import type { Subscription } from '../tools/observable'
 import type { PageExitEvent } from './pageExitObservable'

diff --git a/packages/core/src/browser/timer.spec.ts b/packages/core/src/browser/timer.spec.ts
@@ -1,6 +1,5 @@
-import { stubZoneJs } from '../../test/stubZoneJs'
-import type { Clock } from '../../test/specHelper'
-import { mockClock } from '../../test/specHelper'
+import { mockClock, stubZoneJs } from '../../test'
+import type { Clock } from '../../test'
 import { noop } from '../tools/utils'
 import { resetMonitor, startMonitorErrorCollection } from '../tools/monitor'
 import { setTimeout, clearTimeout, setInterval, clearInterval } from './timer'

diff --git a/packages/core/src/browser/xhrObservable.spec.ts b/packages/core/src/browser/xhrObservable.spec.ts
@@ -1,4 +1,4 @@
-import { stubXhr, withXhr } from '../../test/specHelper'
+import { withXhr, stubXhr } from '../../test'
 import { isIE } from '../tools/browserDetection'
 import type { Subscription } from '../tools/observable'
 import type { XhrCompleteContext, XhrContext } from './xhrObservable'

diff --git a/packages/core/src/domain/configuration/endpointBuilder.spec.ts b/packages/core/src/domain/configuration/endpointBuilder.spec.ts
@@ -1,4 +1,4 @@
-import type { BuildEnvWindow } from '../../../test/specHelper'
+import type { BuildEnvWindow } from '../../../test'
 import { startsWith } from '../../tools/utils'
 import type { InitConfiguration } from './configuration'
 import { createEndpointBuilder } from './endpointBuilder'

diff --git a/packages/core/src/domain/report/reportObservable.spec.ts b/packages/core/src/domain/report/reportObservable.spec.ts
@@ -1,5 +1,5 @@
+import { stubReportingObserver, stubCspEventListener } from '../../../test'
 import type { Subscription } from '../../tools/observable'
-import { stubReportingObserver, stubCspEventListener } from '../../../test/stubReportApis'
 import { initReportObservable, RawReportType } from './reportObservable'
 
 describe('report observable', () => {

diff --git a/packages/core/src/domain/session/sessionCookieStore.spec.ts b/packages/core/src/domain/session/sessionCookieStore.spec.ts
@@ -1,4 +1,4 @@
-import { stubCookie, mockClock } from '../../../test/specHelper'
+import { mockClock, stubCookie } from '../../../test'
 import { isChromium } from '../../tools/browserDetection'
 import {
   SESSION_COOKIE_NAME,

diff --git a/packages/core/src/domain/session/sessionManager.spec.ts b/packages/core/src/domain/session/sessionManager.spec.ts
@@ -1,7 +1,7 @@
+import { createNewEvent, mockClock, restorePageVisibility, setPageVisibility } from '../../../test'
+import type { Clock } from '../../../test'
 import type { CookieOptions } from '../../browser/cookie'
 import { COOKIE_ACCESS_DELAY, getCookie, setCookie } from '../../browser/cookie'
-import type { Clock } from '../../../test/specHelper'
-import { mockClock, restorePageVisibility, setPageVisibility, createNewEvent } from '../../../test/specHelper'
 import { ONE_HOUR, ONE_SECOND } from '../../tools/utils'
 import type { RelativeTime } from '../../tools/timeUtils'
 import { isIE } from '../../tools/browserDetection'

diff --git a/packages/core/src/domain/session/sessionStore.spec.ts b/packages/core/src/domain/session/sessionStore.spec.ts
@@ -1,5 +1,5 @@
-import type { Clock } from '../../../test/specHelper'
-import { mockClock } from '../../../test/specHelper'
+import type { Clock } from '../../../test'
+import { mockClock } from '../../../test'
 import type { CookieOptions } from '../../browser/cookie'
 import { getCookie, setCookie, COOKIE_ACCESS_DELAY } from '../../browser/cookie'
 import type { SessionStore } from './sessionStore'

diff --git a/packages/core/src/domain/synthetics/syntheticsWorkerValues.spec.ts b/packages/core/src/domain/synthetics/syntheticsWorkerValues.spec.ts
@@ -1,4 +1,4 @@
-import { mockSyntheticsWorkerValues, cleanupSyntheticsWorkerValues } from '../../../test/syntheticsWorkerValues'
+import { mockSyntheticsWorkerValues, cleanupSyntheticsWorkerValues } from '../../../test'
 import { getSyntheticsResultId, getSyntheticsTestId, willSyntheticsInjectRum } from './syntheticsWorkerValues'
 
 describe('syntheticsWorkerValues', () => {

diff --git a/packages/core/src/domain/tracekit/computeStackTrace.spec.ts b/packages/core/src/domain/tracekit/computeStackTrace.spec.ts
@@ -1,5 +1,5 @@
-import { isSafari } from '../../../test/specHelper'
-import * as CapturedExceptions from '../../../test/capturedExceptions'
+import * as CapturedExceptions from '../../../test'
+import { isSafari } from '../../../test'
 import { computeStackTrace } from './computeStackTrace'
 
 describe('computeStackTrace', () => {

diff --git a/packages/core/src/domain/tracekit/tracekit.spec.ts b/packages/core/src/domain/tracekit/tracekit.spec.ts
@@ -1,4 +1,4 @@
-import { disableJasmineUncaughtErrorHandler } from '../../../test/specHelper'
+import { disableJasmineUncaughtErrorHandler } from '../../../test'
 import { startUnhandledErrorCollection } from './tracekit'
 import type { UnhandledErrorCallback } from './types'
 

diff --git a/packages/core/src/tools/contextHistory.spec.ts b/packages/core/src/tools/contextHistory.spec.ts
@@ -1,5 +1,5 @@
-import type { Clock } from '../../test/specHelper'
-import { mockClock } from '../../test/specHelper'
+import type { Clock } from '../../test'
+import { mockClock } from '../../test'
 import type { Duration, RelativeTime } from './timeUtils'
 import { addDuration } from './timeUtils'
 import { ONE_MINUTE } from './utils'

diff --git a/packages/core/src/tools/createEventRateLimiter.spec.ts b/packages/core/src/tools/createEventRateLimiter.spec.ts
@@ -1,5 +1,5 @@
-import type { Clock } from '../../test/specHelper'
-import { mockClock } from '../../test/specHelper'
+import type { Clock } from '../../test'
+import { mockClock } from '../../test'
 import type { RawError } from './error'
 import type { EventRateLimiter } from './createEventRateLimiter'
 import { createEventRateLimiter } from './createEventRateLimiter'

diff --git a/packages/core/src/tools/getZoneJsOriginalValue.spec.ts b/packages/core/src/tools/getZoneJsOriginalValue.spec.ts
@@ -1,4 +1,4 @@
-import { stubZoneJs } from '../../test/stubZoneJs'
+import { stubZoneJs } from '../../test'
 
 import type { BrowserWindowWithZoneJs } from './getZoneJsOriginalValue'
 import { getZoneJsOriginalValue } from './getZoneJsOriginalValue'

diff --git a/packages/core/src/tools/instrumentMethod.spec.ts b/packages/core/src/tools/instrumentMethod.spec.ts
@@ -1,6 +1,5 @@
-import { stubZoneJs } from '../../test/stubZoneJs'
-import type { Clock } from '../../test/specHelper'
-import { mockClock } from '../../test/specHelper'
+import { mockClock, stubZoneJs } from '../../test'
+import type { Clock } from '../../test'
 import { instrumentMethod, instrumentSetter } from './instrumentMethod'
 import { noop } from './utils'
 

diff --git a/packages/core/src/tools/urlPolyfill.spec.ts b/packages/core/src/tools/urlPolyfill.spec.ts
@@ -1,4 +1,4 @@
-import { isFirefox } from '../../test/specHelper'
+import { isFirefox } from '../../test'
 import { getHash, getOrigin, getPathName, getSearch, isValidUrl, normalizeUrl } from './urlPolyfill'
 import { getLocationOrigin } from './utils'
 

diff --git a/packages/core/src/tools/utils.spec.ts b/packages/core/src/tools/utils.spec.ts
@@ -1,5 +1,5 @@
-import type { Clock } from '../../test/specHelper'
-import { mockClock } from '../../test/specHelper'
+import type { Clock } from '../../test'
+import { mockClock } from '../../test'
 import { display } from './display'
 import {
   arrayFrom,

diff --git a/packages/core/src/transport/eventBridge.spec.ts b/packages/core/src/transport/eventBridge.spec.ts
@@ -1,4 +1,4 @@
-import { deleteEventBridgeStub, initEventBridgeStub } from '../../test/specHelper'
+import { deleteEventBridgeStub, initEventBridgeStub } from '../../test'
 import { getEventBridge, canUseEventBridge } from './eventBridge'
 
 describe('canUseEventBridge', () => {

diff --git a/packages/core/src/transport/httpRequest.spec.ts b/packages/core/src/transport/httpRequest.spec.ts
@@ -1,9 +1,8 @@
-import { stubEndpointBuilder, interceptRequests } from '../../test/specHelper'
-import type { Request } from '../../test/specHelper'
+import { collectAsyncCalls, stubEndpointBuilder, interceptRequests } from '../../test'
+import type { Request } from '../../test'
 import type { EndpointBuilder } from '../domain/configuration'
 import { createEndpointBuilder } from '../domain/configuration'
 import { noop } from '../tools/utils'
-import { collectAsyncCalls } from '../../test/collectAsyncCalls'
 import { createHttpRequest, fetchKeepAliveStrategy, sendXHR } from './httpRequest'
 import type { HttpRequest } from './httpRequest'
 

diff --git a/packages/core/src/transport/sendWithRetryStrategy.spec.ts b/packages/core/src/transport/sendWithRetryStrategy.spec.ts
@@ -1,5 +1,5 @@
-import { mockClock, restoreNavigatorOnLine, setNavigatorOnLine } from '../../test/specHelper'
-import type { Clock } from '../../test/specHelper'
+import { mockClock, restoreNavigatorOnLine, setNavigatorOnLine } from '../../test'
+import type { Clock } from '../../test'
 import { ErrorSource } from '../tools/error'
 import type { RetryState } from './sendWithRetryStrategy'
 import {

diff --git a/packages/core/test/index.ts b/packages/core/test/index.ts
@@ -0,0 +1,6 @@
+export * from './capturedExceptions'
+export * from './collectAsyncCalls'
+export * from './stubReportApis'
+export * from './stubZoneJs'
+export * from './syntheticsWorkerValues'
+export * from './specHelper'
diff --git a/packages/logs/package.json b/packages/logs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-logs",
-  "version": "4.36.0",
+  "version": "4.37.0",
   "license": "Apache-2.0",
   "main": "cjs/entries/main.js",
   "module": "esm/entries/main.js",
@@ -13,10 +13,10 @@
     "replace-build-env": "node ../../scripts/build/replace-build-env.js"
   },
   "dependencies": {
-    "@datadog/browser-core": "4.36.0"
+    "@datadog/browser-core": "4.37.0"
   },
   "peerDependencies": {
-    "@datadog/browser-rum": "4.36.0"
+    "@datadog/browser-rum": "4.37.0"
   },
   "peerDependenciesMeta": {
     "@datadog/browser-rum": {

diff --git a/packages/logs/src/boot/logsPublicApi.spec.ts b/packages/logs/src/boot/logsPublicApi.spec.ts
@@ -1,7 +1,7 @@
 import type { TimeStamp } from '@datadog/browser-core'
 import { monitor, ONE_SECOND, display } from '@datadog/browser-core'
-import type { Clock } from '../../../core/test/specHelper'
-import { deleteEventBridgeStub, initEventBridgeStub, mockClock } from '../../../core/test/specHelper'
+import type { Clock } from '@datadog/browser-core/test'
+import { deleteEventBridgeStub, initEventBridgeStub, mockClock } from '@datadog/browser-core/test'
 import type { HybridInitConfiguration, LogsInitConfiguration } from '../domain/configuration'
 import type { Logger, LogsMessage } from '../domain/logger'
 import { HandlerType, StatusType } from '../domain/logger'

diff --git a/packages/logs/src/boot/startLogs.spec.ts b/packages/logs/src/boot/startLogs.spec.ts
@@ -1,15 +1,16 @@
 import { ErrorSource, display, stopSessionManager, getCookie, SESSION_COOKIE_NAME } from '@datadog/browser-core'
-import { cleanupSyntheticsWorkerValues, mockSyntheticsWorkerValues } from '../../../core/test/syntheticsWorkerValues'
+import type { Request } from '@datadog/browser-core/test'
 import {
+  interceptRequests,
+  stubEndpointBuilder,
   deleteEventBridgeStub,
   initEventBridgeStub,
-  stubEndpointBuilder,
-  interceptRequests,
-} from '../../../core/test/specHelper'
-import type { Request } from '../../../core/test/specHelper'
+  cleanupSyntheticsWorkerValues,
+  mockSyntheticsWorkerValues,
+} from '@datadog/browser-core/test'
+
 import type { LogsConfiguration } from '../domain/configuration'
 import { validateAndBuildLogsConfiguration } from '../domain/configuration'
-
 import { HandlerType, Logger, StatusType } from '../domain/logger'
 import type { startLoggerCollection } from '../domain/logsCollection/logger/loggerCollection'
 import type { LogsEvent } from '../logsEvent.types'

diff --git a/packages/logs/src/domain/assembly.spec.ts b/packages/logs/src/domain/assembly.spec.ts
@@ -1,9 +1,8 @@
 import type { Context, RelativeTime, TelemetryEvent, TimeStamp } from '@datadog/browser-core'
 import { TelemetryService, startTelemetry, ErrorSource, ONE_MINUTE, getTimeStamp, noop } from '@datadog/browser-core'
-import { cleanupSyntheticsWorkerValues, mockSyntheticsWorkerValues } from '../../../core/test/syntheticsWorkerValues'
+import type { Clock } from '@datadog/browser-core/test'
+import { mockClock, cleanupSyntheticsWorkerValues, mockSyntheticsWorkerValues } from '@datadog/browser-core/test'
 import type { LogsEvent } from '../logsEvent.types'
-import type { Clock } from '../../../core/test/specHelper'
-import { mockClock } from '../../../core/test/specHelper'
 import type { CommonContext } from '../rawLogsEvent.types'
 import { getRUMInternalContext, resetRUMInternalContext, startLogsAssembly } from './assembly'
 import { validateAndBuildLogsConfiguration } from './configuration'

diff --git a/packages/logs/src/domain/logsCollection/logger/loggerCollection.spec.ts b/packages/logs/src/domain/logsCollection/logger/loggerCollection.spec.ts
@@ -1,7 +1,7 @@
 import type { TimeStamp } from '@datadog/browser-core'
 import { ConsoleApiName, timeStampNow, display, ErrorSource } from '@datadog/browser-core'
-import type { Clock } from '@datadog/browser-core/test/specHelper'
-import { mockClock } from '@datadog/browser-core/test/specHelper'
+import type { Clock } from '@datadog/browser-core/test'
+import { mockClock } from '@datadog/browser-core/test'
 import type { CommonContext, RawLoggerLogsEvent } from '../../../rawLogsEvent.types'
 import type { RawLogsEventCollectedData } from '../../lifeCycle'
 import { LifeCycle, LifeCycleEventType } from '../../lifeCycle'

diff --git a/packages/logs/src/domain/logsCollection/networkError/networkErrorCollection.spec.ts b/packages/logs/src/domain/logsCollection/networkError/networkErrorCollection.spec.ts
@@ -1,6 +1,6 @@
 import { isIE, ErrorSource } from '@datadog/browser-core'
-import type { FetchStub, FetchStubManager } from '@datadog/browser-core/test/specHelper'
-import { SPEC_ENDPOINTS, ResponseStub, stubFetch } from '@datadog/browser-core/test/specHelper'
+import type { FetchStub, FetchStubManager } from '@datadog/browser-core/test'
+import { SPEC_ENDPOINTS, ResponseStub, stubFetch } from '@datadog/browser-core/test'
 import type { RawNetworkLogsEvent } from '../../../rawLogsEvent.types'
 import type { LogsConfiguration } from '../../configuration'
 import type { RawLogsEventCollectedData } from '../../lifeCycle'

diff --git a/packages/logs/src/domain/logsCollection/report/reportCollection.spec.ts b/packages/logs/src/domain/logsCollection/report/reportCollection.spec.ts
@@ -1,5 +1,5 @@
 import { ErrorSource, noop } from '@datadog/browser-core'
-import { stubReportingObserver } from '@datadog/browser-core/test/stubReportApis'
+import { stubReportingObserver } from '@datadog/browser-core/test'
 import type { RawReportLogsEvent } from '../../../rawLogsEvent.types'
 import { validateAndBuildLogsConfiguration } from '../../configuration'
 import type { RawLogsEventCollectedData } from '../../lifeCycle'

diff --git a/packages/logs/src/domain/logsSessionManager.spec.ts b/packages/logs/src/domain/logsSessionManager.spec.ts
@@ -7,8 +7,8 @@ import {
   stopSessionManager,
   ONE_SECOND,
 } from '@datadog/browser-core'
-import type { Clock } from '../../../core/test/specHelper'
-import { mockClock } from '../../../core/test/specHelper'
+import type { Clock } from '@datadog/browser-core/test'
+import { mockClock } from '@datadog/browser-core/test'
 
 import type { LogsConfiguration } from './configuration'
 import {

diff --git a/packages/rum-core/package.json b/packages/rum-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-rum-core",
-  "version": "4.36.0",
+  "version": "4.37.0",
   "license": "Apache-2.0",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -12,7 +12,7 @@
     "replace-build-env": "node ../../scripts/build/replace-build-env.js"
   },
   "dependencies": {
-    "@datadog/browser-core": "4.36.0"
+    "@datadog/browser-core": "4.37.0"
   },
   "devDependencies": {
     "ajv": "6.12.6"

diff --git a/packages/rum-core/src/boot/rumPublicApi.spec.ts b/packages/rum-core/src/boot/rumPublicApi.spec.ts
@@ -1,12 +1,15 @@
 import type { RelativeTime, TimeStamp, Context } from '@datadog/browser-core'
 import { ONE_SECOND, getTimeStamp, display, DefaultPrivacyLevel } from '@datadog/browser-core'
-import { cleanupSyntheticsWorkerValues, mockSyntheticsWorkerValues } from '../../../core/test/syntheticsWorkerValues'
-import { initEventBridgeStub, deleteEventBridgeStub } from '../../../core/test/specHelper'
-import type { TestSetupBuilder } from '../../test/testSetupBuilder'
-import { setup } from '../../test/testSetupBuilder'
+import {
+  initEventBridgeStub,
+  deleteEventBridgeStub,
+  cleanupSyntheticsWorkerValues,
+  mockSyntheticsWorkerValues,
+} from '@datadog/browser-core/test'
+import type { TestSetupBuilder } from '../../test'
+import { setup, noopRecorderApi } from '../../test'
 import type { HybridInitConfiguration, RumInitConfiguration } from '../domain/configuration'
 import { ActionType } from '../rawRumEvent.types'
-import { noopRecorderApi } from '../../test/noopRecorderApi'
 import type { RumPublicApi, StartRum, RecorderApi } from './rumPublicApi'
 import { makeRumPublicApi } from './rumPublicApi'
 

diff --git a/packages/rum-core/src/boot/startRum.spec.ts b/packages/rum-core/src/boot/startRum.spec.ts
@@ -10,11 +10,9 @@ import {
   relativeNow,
   isIE,
 } from '@datadog/browser-core'
-import { createNewEvent, interceptRequests } from '../../../core/test/specHelper'
-import type { RumSessionManagerMock } from '../../test/mockRumSessionManager'
-import { createRumSessionManagerMock } from '../../test/mockRumSessionManager'
-import type { TestSetupBuilder } from '../../test/testSetupBuilder'
-import { setup } from '../../test/testSetupBuilder'
+import { createNewEvent, interceptRequests } from '@datadog/browser-core/test'
+import type { RumSessionManagerMock, TestSetupBuilder } from '../../test'
+import { createRumSessionManagerMock, noopRecorderApi, setup } from '../../test'
 import type { RumPerformanceNavigationTiming, RumPerformanceEntry } from '../browser/performanceCollection'
 import type { LifeCycle } from '../domain/lifeCycle'
 import { LifeCycleEventType } from '../domain/lifeCycle'
@@ -27,7 +25,6 @@ import type { RumSessionManager } from '..'
 import type { RumConfiguration, RumInitConfiguration } from '../domain/configuration'
 import { RumEventType } from '../rawRumEvent.types'
 import { startFeatureFlagContexts } from '../domain/contexts/featureFlagContext'
-import { noopRecorderApi } from '../../test/noopRecorderApi'
 import { startRum, startRumEventCollection } from './startRum'
 
 function collectServerEvents(lifeCycle: LifeCycle) {

diff --git a/packages/rum-core/src/browser/domMutationObservable.spec.ts b/packages/rum-core/src/browser/domMutationObservable.spec.ts
@@ -1,5 +1,5 @@
 import { isIE } from '@datadog/browser-core'
-import { stubZoneJs } from '../../../core/test/stubZoneJs'
+import { stubZoneJs } from '@datadog/browser-core/test'
 import { createDOMMutationObservable, getMutationObserverConstructor } from './domMutationObservable'
 
 // The MutationObserver invokes its callback in an event loop microtask, making this asynchronous.

diff --git a/packages/rum-core/src/browser/locationChangeObservable.spec.ts b/packages/rum-core/src/browser/locationChangeObservable.spec.ts
@@ -1,5 +1,5 @@
 import type { Observable, Subscription } from '@datadog/browser-core'
-import { mockLocation } from '../../../core/test/specHelper'
+import { mockLocation } from '@datadog/browser-core/test'
 import type { LocationChange } from './locationChangeObservable'
 import { createLocationChangeObservable } from './locationChangeObservable'
 

diff --git a/packages/rum-core/src/browser/performanceCollection.spec.ts b/packages/rum-core/src/browser/performanceCollection.spec.ts
@@ -1,5 +1,5 @@
-import type { TestSetupBuilder } from '../../test/testSetupBuilder'
-import { setup } from '../../test/testSetupBuilder'
+import type { TestSetupBuilder } from '../../test'
+import { setup } from '../../test'
 import { retrieveInitialDocumentResourceTiming, startPerformanceCollection } from './performanceCollection'
 
 describe('rum initial document resource', () => {