From 65e5af04a04e4b4ddba92ca86b95c77677289f49 Mon Sep 17 00:00:00 2001
From: Aymeric Mortemousque <aymeric.mortemousque@datadoghq.com>
Date: Wed, 13 Dec 2023 11:58:14 +0100
Subject: [PATCH] Update namings

---
 packages/core/src/transport/eventBridge.ts   | 16 +++++-----------
 packages/core/test/emulate/eventBridge.ts    |  1 -
 packages/rum-core/src/boot/rumPublicApi.ts   |  2 +-
 packages/rum/src/domain/startRecordBridge.ts |  4 ++--
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/packages/core/src/transport/eventBridge.ts b/packages/core/src/transport/eventBridge.ts
index 3737de0676..793b1329ef 100644
--- a/packages/core/src/transport/eventBridge.ts
+++ b/packages/core/src/transport/eventBridge.ts
@@ -6,8 +6,7 @@ export interface BrowserWindowWithEventBridge extends Window {
 }
 
 export interface DatadogEventBridge {
-  getWebViewId?(): string
-  getParentRecordPrivacyLevel?(): string
+  getPrivacyLevel?(): string
   getAllowedWebViewHosts(): string
   send(msg: string): void
 }
@@ -20,20 +19,15 @@ export function getEventBridge<T, E>() {
   }
 
   return {
-    getWebViewId() {
-      const webviewId = eventBridgeGlobal.getWebViewId?.()
-      if (webviewId) {
-        return Number(webviewId)
-      }
-    },
-    getParentRecordPrivacyLevel() {
-      return eventBridgeGlobal.getParentRecordPrivacyLevel?.()
+    getPrivacyLevel() {
+      return eventBridgeGlobal.getPrivacyLevel?.()
     },
     getAllowedWebViewHosts() {
       return JSON.parse(eventBridgeGlobal.getAllowedWebViewHosts()) as string[]
     },
     send(eventType: T, event: E, viewId?: string) {
-      eventBridgeGlobal.send(JSON.stringify({ eventType, event, viewId }))
+      const view = viewId ? { id: viewId } : undefined
+      eventBridgeGlobal.send(JSON.stringify({ eventType, event, view }))
     },
   }
 }
diff --git a/packages/core/test/emulate/eventBridge.ts b/packages/core/test/emulate/eventBridge.ts
index 181b8dcc02..178d84cc2c 100644
--- a/packages/core/test/emulate/eventBridge.ts
+++ b/packages/core/test/emulate/eventBridge.ts
@@ -2,7 +2,6 @@ import type { BrowserWindowWithEventBridge } from '../../src/transport'
 
 export function initEventBridgeStub(allowedWebViewHosts: string[] = [window.location.hostname]) {
   const eventBridgeStub = {
-    getNestedEnvId: () => 1,
     send: (_msg: string) => undefined,
     getAllowedWebViewHosts: () => JSON.stringify(allowedWebViewHosts),
   }
diff --git a/packages/rum-core/src/boot/rumPublicApi.ts b/packages/rum-core/src/boot/rumPublicApi.ts
index 60fb71e033..386e126872 100644
--- a/packages/rum-core/src/boot/rumPublicApi.ts
+++ b/packages/rum-core/src/boot/rumPublicApi.ts
@@ -376,7 +376,7 @@ export function makeRumPublicApi(
       applicationId: '00000000-aaaa-0000-aaaa-000000000000',
       clientToken: 'empty',
       sessionSampleRate: 100,
-      defaultPrivacyLevel: getEventBridge()?.getParentRecordPrivacyLevel(),
+      defaultPrivacyLevel: getEventBridge()?.getPrivacyLevel(),
     })
   }
 }
diff --git a/packages/rum/src/domain/startRecordBridge.ts b/packages/rum/src/domain/startRecordBridge.ts
index 156fe1dd45..a6f14acb54 100644
--- a/packages/rum/src/domain/startRecordBridge.ts
+++ b/packages/rum/src/domain/startRecordBridge.ts
@@ -1,4 +1,4 @@
-import { assign, getEventBridge } from '@datadog/browser-core'
+import { getEventBridge } from '@datadog/browser-core'
 import type { ViewContexts } from '@datadog/browser-rum-core'
 import type { BrowserRecord } from '../types'
 import * as replayStats from './replayStats'
@@ -13,7 +13,7 @@ export function startRecordBridge(viewContexts: ViewContexts) {
         return
       }
       replayStats.addRecord(view.id)
-      bridge.send('record', assign(record, { nestedEnvId: bridge.getWebViewId() }), view.id)
+      bridge.send('record', record, view.id)
     },
   }
 }