Use regular rum package for salesforce

Author: BeltranBulbarellaDD

docs/ARCHITECTURE.md

@@ -11,7 +11,6 @@ graph TD
   core["@datadog/browser-core\n(shared utilities)"]
   rum-core["@datadog/browser-rum-core\n(core RUM)"]
   rum["@datadog/browser-rum\n(full RUM)"]
-  salesforce["@datadog/browser-rum-salesforce\n(Salesforce RUM)"]
   rum-slim["@datadog/browser-rum-slim\n(lightweight RUM)"]
   rum-react["@datadog/browser-rum-react\n(React integration)"]
   logs["@datadog/browser-logs"]
@@ -20,7 +19,6 @@ graph TD
   core --> rum-core
   core --> logs
   rum-core --> rum
-  rum --> salesforce
   rum-core --> rum-slim
   rum --> rum-react
 ```

eslint-local-rules/disallowSideEffects.js

@@ -28,7 +28,6 @@ const packagesRoot = path.resolve(import.meta.dirname, '..', 'packages')
 const pathsWithSideEffect = new Set([
   `${packagesRoot}/logs/src/entries/main.ts`,
   `${packagesRoot}/rum/src/entries/main.ts`,
-  `${packagesRoot}/salesforce/src/entries/main.ts`,
   `${packagesRoot}/rum-slim/src/entries/main.ts`,
 ])
 

eslint.config.mjs

@@ -433,7 +433,7 @@ export default tseslint.config(
   },
 
   {
-    files: ['packages/{rum,logs,rum-slim,salesforce}/src/entries/*.ts'],
+    files: ['packages/{rum,logs,rum-slim}/src/entries/*.ts'],
     rules: {
       'local-rules/disallow-enum-exports': 'error',
     },

packages/rum/package.json

@@ -18,6 +18,7 @@
   "scripts": {
     "build": "node ../../scripts/build/build-package.ts --modules --bundle datadog-rum.js",
     "build:bundle": "node ../../scripts/build/build-package.ts --bundle datadog-rum.js",
+    "build:salesforce": "node ../../scripts/build/build-package.ts --bundle datadog-rum-salesforce.js --entry ./src/entries/salesforce.ts",
     "prepack": "yarn build"
   },
   "dependencies": {

…boot/salesforceInitConfiguration.spec.ts …ain/salesforce/initConfiguration.spec.tspackages/salesforce/src/boot/salesforceInitConfiguration.spec.ts renamed to packages/rum/src/domain/salesforce/initConfiguration.spec.ts packages/salesforce/src/boot/salesforceInitConfiguration.spec.ts renamed to packages/rum/src/domain/salesforce/initConfiguration.spec.ts

@@ -1,30 +1,29 @@
 import type { RumInitConfiguration } from '@datadog/browser-rum-core'
-import { buildSalesforceInitConfiguration } from './salesforceInitConfiguration'
+import { buildSalesforceInitConfiguration } from './initConfiguration'
 
 describe('salesforce init configuration', () => {
-  it('forces the salesforce bundle into manual view tracking mode', () => {
+  it('forces manual view tracking', () => {
     const initConfiguration = buildSalesforceInitConfiguration({
       applicationId: 'app-id',
       clientToken: 'client-token',
       trackViewsManually: false,
-      trackResources: true,
-      trackUserInteractions: true,
-      trackLongTasks: true,
     } as RumInitConfiguration)
 
     expect(initConfiguration.trackViewsManually).toBeTrue()
-    expect(initConfiguration.trackResources).toBeFalse()
-    expect(initConfiguration.trackUserInteractions).toBeFalse()
-    expect(initConfiguration.trackLongTasks).toBeFalse()
   })
 
-  it('preserves customer configuration unrelated to the salesforce view-tracking policy', () => {
+  it('preserves customer configuration unrelated to view tracking mode', () => {
     const initConfiguration = buildSalesforceInitConfiguration({
       applicationId: 'app-id',
       clientToken: 'client-token',
       service: 'browser-sdk-sandbox',
       env: 'dev',
       site: 'datadoghq.com',
+      trackResources: false,
+      trackUserInteractions: false,
+      trackLongTasks: false,
+      sessionReplaySampleRate: 0,
+      profilingSampleRate: 0,
     } as RumInitConfiguration)
 
     expect(initConfiguration).toEqual(
@@ -34,6 +33,11 @@ describe('salesforce init configuration', () => {
         service: 'browser-sdk-sandbox',
         env: 'dev',
         site: 'datadoghq.com',
+        trackResources: false,
+        trackUserInteractions: false,
+        trackLongTasks: false,
+        sessionReplaySampleRate: 0,
+        profilingSampleRate: 0,
       })
     )
   })

packages/rum/src/domain/salesforce/initConfiguration.ts

@@ -0,0 +1,12 @@
+import type { RumInitConfiguration } from '@datadog/browser-rum-core'
+
+const SALESFORCE_INIT_DEFAULTS: Pick<RumInitConfiguration, 'trackViewsManually'> = {
+  trackViewsManually: true,
+}
+
+export function buildSalesforceInitConfiguration(initConfiguration: RumInitConfiguration): RumInitConfiguration {
+  return {
+    ...initConfiguration,
+    ...SALESFORCE_INIT_DEFAULTS,
+  }
+}

…src/domain/salesforceViewTracker.spec.ts …rc/domain/salesforce/viewTracker.spec.tspackages/salesforce/src/domain/salesforceViewTracker.spec.ts renamed to packages/rum/src/domain/salesforce/viewTracker.spec.ts packages/salesforce/src/domain/salesforceViewTracker.spec.ts renamed to packages/rum/src/domain/salesforce/viewTracker.spec.ts

@@ -1,6 +1,6 @@
 import type { Clock } from '@datadog/browser-core/test'
 import { mockClock } from '@datadog/browser-core/test'
-import { startSalesforceViewTracking } from './salesforceViewTracker'
+import { startSalesforceViewTracking } from './viewTracker'
 
 describe('salesforce view tracker', () => {
   let clock: Clock

…orce/src/domain/salesforceViewTracker.ts …rum/src/domain/salesforce/viewTracker.tspackages/salesforce/src/domain/salesforceViewTracker.ts renamed to packages/rum/src/domain/salesforce/viewTracker.ts packages/salesforce/src/domain/salesforceViewTracker.ts renamed to packages/rum/src/domain/salesforce/viewTracker.ts

@@ -1,8 +1,11 @@
 import { defineGlobal, getGlobalObject } from '@datadog/browser-core'
-import { datadogRum as baseDatadogRum } from '@datadog/browser-rum'
 import type { RumInitConfiguration, RumPublicApi } from '@datadog/browser-rum-core'
-import { buildSalesforceInitConfiguration } from '../boot/salesforceInitConfiguration'
-import { startSalesforceViewTracking } from '../domain/salesforceViewTracker'
+import { makeRumPublicApi } from '@datadog/browser-rum-core'
+import { makeProfilerApi } from '../boot/profilerApi'
+import { makeRecorderApi } from '../boot/recorderApi'
+import { createDeflateEncoder, startDeflateWorker } from '../domain/deflate'
+import { buildSalesforceInitConfiguration } from '../domain/salesforce/initConfiguration'
+import { startSalesforceViewTracking } from '../domain/salesforce/viewTracker'
 
 export type {
   User,
@@ -40,8 +43,6 @@ export type {
   PropagatorType,
   FeatureFlagsForEvents,
   MatchHeader,
-
-  // Events
   CommonProperties,
   RumEvent,
   RumActionEvent,
@@ -50,8 +51,6 @@ export type {
   RumResourceEvent,
   RumViewEvent,
   RumVitalEvent,
-
-  // Events context
   RumEventDomainContext,
   RumViewEventDomainContext,
   RumErrorEventDomainContext,
@@ -67,14 +66,17 @@ export { DEFAULT_TRACKED_RESOURCE_HEADERS } from '@datadog/browser-rum-core'
 
 const salesforceGlobal = getGlobalObject<BrowserWindow>()
 
-/**
- * The global RUM instance. Use this to call RUM methods.
- *
- * @category Main
- * @see {@link DatadogRum}
- * @see [RUM Browser Monitoring Setup](https://docs.datadoghq.com/real_user_monitoring/browser/)
- */
-export const datadogRum = createSalesforceDatadogRum(baseDatadogRum)
+const recorderApi = makeRecorderApi()
+
+const profilerApi = makeProfilerApi()
+
+export const datadogRum = createSalesforceDatadogRum(
+  makeRumPublicApi(recorderApi, profilerApi, {
+    startDeflateWorker,
+    createDeflateEncoder,
+    sdkName: 'rum',
+  })
+)
 
 interface BrowserWindow extends Window {
   DD_RUM?: RumPublicApi