From a04be9d08657ca7082634b11dc7b424256aae009 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Mon, 15 Apr 2024 15:41:56 +0200
Subject: [PATCH 01/32] Add enablePrivacyForActionName in config; implement
 action name mask accordingly

---
 packages/{rum => rum-core}/src/constants.ts   |  0
 .../action/getActionNameFromElement.spec.ts   | 86 +++++++++++++++++++
 .../domain/action/getActionNameFromElement.ts | 18 +++-
 .../domain/action/trackClickActions.spec.ts   | 49 ++++++++++-
 .../src/domain/action/trackClickActions.ts    | 34 ++++++--
 packages/rum-core/src/domain/configuration.ts |  3 +
 .../src/domain}/privacy.spec.ts               |  2 +-
 .../record => rum-core/src/domain}/privacy.ts |  4 +-
 packages/rum-core/src/index.ts                |  2 +
 .../serialization/htmlAst.specHelper.ts       |  2 +-
 .../serialization/serialization.types.ts      |  2 +-
 .../serialization/serializationUtils.spec.ts  |  2 +-
 .../serialization/serializationUtils.ts       |  6 +-
 .../serialization/serializeAttribute.spec.ts  |  2 +-
 .../serialization/serializeAttribute.ts       |  7 +-
 .../serialization/serializeAttributes.ts      |  4 +-
 .../serialization/serializeNode.spec.ts       |  2 +-
 .../record/serialization/serializeNode.ts     |  4 +-
 .../domain/record/trackers/trackInput.spec.ts |  2 +-
 .../src/domain/record/trackers/trackInput.ts  |  4 +-
 .../record/trackers/trackMediaInteraction.ts  |  3 +-
 .../record/trackers/trackMouseInteraction.ts  |  3 +-
 .../record/trackers/trackMutation.spec.ts     |  4 +-
 .../domain/record/trackers/trackMutation.ts   |  8 +-
 .../src/domain/record/trackers/trackScroll.ts |  4 +-
 .../record/trackers/trackers.specHelper.ts    |  2 +-
 packages/rum/src/entries/internal.ts          |  7 +-
 27 files changed, 219 insertions(+), 47 deletions(-)
 rename packages/{rum => rum-core}/src/constants.ts (100%)
 rename packages/{rum/src/domain/record => rum-core/src/domain}/privacy.spec.ts (99%)
 rename packages/{rum/src/domain/record => rum-core/src/domain}/privacy.ts (98%)

diff --git a/packages/rum/src/constants.ts b/packages/rum-core/src/constants.ts
similarity index 100%
rename from packages/rum/src/constants.ts
rename to packages/rum-core/src/constants.ts
diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
index 3ef7567603..a7357b3b84 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
@@ -345,4 +345,90 @@ describe('getActionNameFromElement', () => {
       ).toBe('Foo')
     })
   })
+
+  describe('with privacyEnabledForActionName', () => {
+    it('extracts attribute text when privacyEnabledActionName is false', () => {
+      expect(
+        getActionNameFromElement(
+          appendElement(`
+            <div data-dd-action-name="foo">
+              <span target>ignored</span>
+            </div>
+      `),
+          undefined,
+          false
+        )
+      ).toBe('foo')
+    })
+
+    it('extracts user defined attribute text when privacyEnabledActionName is false', () => {
+      expect(
+        getActionNameFromElement(
+          appendElement(`
+            <div data-test-id="foo">
+              <span target>ignored</span>
+            </div>
+      `),
+          'data-test-id',
+          false
+        )
+      ).toBe('foo')
+    })
+
+    it('extracts inner text when privacyEnabledActionName is false and attribute is empty', () => {
+      expect(
+        getActionNameFromElement(
+          appendElement(`
+            <div data-test-id="">
+              <span target>foo</span>
+            </div>
+      `),
+          'data-test-id',
+          false
+        )
+      ).toBe('foo')
+    })
+
+    it('returns placeholder when privacyEnabledActionName is true and attribute is empty', () => {
+      expect(
+        getActionNameFromElement(
+          appendElement(`
+            <div data-test-id="">
+              <span target>foo</span>
+            </div>
+      `),
+          'data-test-id',
+          true
+        )
+      ).toBe('Masked Element')
+    })
+
+    it('extracts default attribute text when privacyEnabledActionName is true', () => {
+      expect(
+        getActionNameFromElement(
+          appendElement(`
+            <div data-dd-action-name="foo">
+              <span target>ignored</span>
+            </div>
+      `),
+          undefined,
+          true
+        )
+      ).toBe('foo')
+    })
+
+    it('extracts user defined attribute text when privacyEnabledActionName is true', () => {
+      expect(
+        getActionNameFromElement(
+          appendElement(`
+            <div data-test-id="foo">
+              <span target>ignored</span>
+            </div>
+      `),
+          'data-test-id',
+          true
+        )
+      ).toBe('foo')
+    })
+  })
 })
diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
index 2d3f060303..6b102a4ef3 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
@@ -6,8 +6,22 @@ import { getParentElement } from '../../browser/polyfills'
  * It can also be retrieved from a user defined attribute.
  */
 export const DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE = 'data-dd-action-name'
-
-export function getActionNameFromElement(element: Element, userProgrammaticAttribute?: string): string {
+export const ACTION_NAME_PLACEHOLDER = 'Masked Element'
+export function getActionNameFromElement(
+  element: Element,
+  userProgrammaticAttribute?: string,
+  privacyEnabledForActionName?: boolean
+): string {
+  // Only get the defined action name if
+  // * privacy is enabled for action name
+  // * and privacy is enabled for the Node or globally
+  if (privacyEnabledForActionName) {
+    return (
+      getActionNameFromElementProgrammatically(element, DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE) ||
+      (userProgrammaticAttribute && getActionNameFromElementProgrammatically(element, userProgrammaticAttribute)) ||
+      ACTION_NAME_PLACEHOLDER
+    )
+  }
   // Proceed to get the action name in two steps:
   // * first, get the name programmatically, explicitly defined by the user.
   // * then, use strategies that are known to return good results. Those strategies will be used on
diff --git a/packages/rum-core/src/domain/action/trackClickActions.spec.ts b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
index ded25f2369..3ab535a9ad 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.spec.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
@@ -1,5 +1,5 @@
 import type { Context, Duration } from '@datadog/browser-core'
-import { addDuration, clocksNow, timeStampNow, relativeNow } from '@datadog/browser-core'
+import { addDuration, clocksNow, timeStampNow, relativeNow, DefaultPrivacyLevel } from '@datadog/browser-core'
 import { createNewEvent } from '@datadog/browser-core/test'
 import type { TestSetupBuilder } from '../../../test'
 import { setup, createFakeClick } from '../../../test'
@@ -232,6 +232,53 @@ describe('trackClickActions', () => {
     expect(events.length).toBe(1)
   })
 
+  fdescribe('with enablePrivacyForActionName false', () => {
+    it('extracts action name when default privacy level is mask', () => {
+      setupBuilder.withConfiguration({
+        defaultPrivacyLevel: DefaultPrivacyLevel.MASK,
+        enablePrivacyForActionName: false,
+      })
+      const { clock } = setupBuilder.build()
+      emulateClick({ activity: {} })
+      expect(findActionId()).not.toBeUndefined()
+      clock.tick(EXPIRE_DELAY)
+
+      expect(events.length).toBe(1)
+      expect(events[0].name).toBe('Click me')
+    })
+  })
+
+  fdescribe('with enablePrivacyForActionName true', () => {
+    it('get placeholder when defaultPrivacyLevel is mask without programmatically declared action name', () => {
+      setupBuilder.withConfiguration({
+        defaultPrivacyLevel: DefaultPrivacyLevel.MASK,
+        enablePrivacyForActionName: true,
+      })
+      const { clock } = setupBuilder.build()
+      emulateClick({ activity: {} })
+      expect(findActionId()).not.toBeUndefined()
+      clock.tick(EXPIRE_DELAY)
+
+      expect(events.length).toBe(1)
+      expect(events[0].name).toBe('Masked Element')
+    })
+
+    it('get placeholder when html override is hidden', () => {
+      input.setAttribute('data-dd-privacy', 'hidden')
+      setupBuilder.withConfiguration({
+        defaultPrivacyLevel: DefaultPrivacyLevel.MASK,
+        enablePrivacyForActionName: true,
+      })
+      const { clock } = setupBuilder.build()
+      emulateClick({ activity: {} })
+      expect(findActionId()).not.toBeUndefined()
+      clock.tick(EXPIRE_DELAY)
+
+      expect(events.length).toBe(1)
+      expect(events[0].name).toBe('Masked Element')
+    })
+  })
+
   describe('rage clicks', () => {
     it('considers a chain of three clicks or more as a single action with "rage" frustration type', () => {
       const { clock } = setupBuilder.build()
diff --git a/packages/rum-core/src/domain/action/trackClickActions.ts b/packages/rum-core/src/domain/action/trackClickActions.ts
index b587bae9f2..142100c916 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.ts
@@ -11,18 +11,21 @@ import {
   clocksNow,
   ONE_SECOND,
   elapsed,
+  DefaultPrivacyLevel,
 } from '@datadog/browser-core'
 import type { FrustrationType } from '../../rawRumEvent.types'
 import { ActionType } from '../../rawRumEvent.types'
+import { NodePrivacyLevel } from '../../constants'
 import type { RumConfiguration } from '../configuration'
 import type { LifeCycle } from '../lifeCycle'
 import { LifeCycleEventType } from '../lifeCycle'
 import { trackEventCounts } from '../trackEventCounts'
 import { PAGE_ACTIVITY_VALIDATION_DELAY, waitPageActivityEnd } from '../waitPageActivityEnd'
 import { getSelectorFromElement } from '../getSelectorFromElement'
+import { getNodePrivacyLevel } from '../privacy'
 import type { ClickChain } from './clickChain'
 import { createClickChain } from './clickChain'
-import { getActionNameFromElement } from './getActionNameFromElement'
+import { getActionNameFromElement, ACTION_NAME_PLACEHOLDER } from './getActionNameFromElement'
 import type { MouseEventOnElement, UserActivity } from './listenActionEvents'
 import { listenActionEvents } from './listenActionEvents'
 import { computeFrustration } from './computeFrustration'
@@ -42,6 +45,7 @@ export interface ClickAction {
     selector_with_stable_attributes?: string
     width: number
     height: number
+    masked?: boolean
   }
   position?: { x: number; y: number }
   startClocks: ClocksState
@@ -133,7 +137,7 @@ function processPointerDown(
   domMutationObservable: Observable<void>,
   pointerDownEvent: MouseEventOnElement
 ) {
-  const clickActionBase = computeClickActionBase(pointerDownEvent, configuration.actionNameAttribute)
+  const clickActionBase = computeClickActionBase(pointerDownEvent, configuration)
 
   let hadActivityOnPointerDown = false
 
@@ -209,21 +213,33 @@ function startClickAction(
 
 type ClickActionBase = Pick<ClickAction, 'type' | 'name' | 'target' | 'position'>
 
-function computeClickActionBase(event: MouseEventOnElement, actionNameAttribute?: string): ClickActionBase {
+function computeClickActionBase(event: MouseEventOnElement, configuration: RumConfiguration): ClickActionBase {
   const rect = event.target.getBoundingClientRect()
+  const privacyEnabledForActionName =
+    (getNodePrivacyLevel(event.target, configuration.defaultPrivacyLevel) === NodePrivacyLevel.HIDDEN ||
+      configuration.defaultPrivacyLevel === DefaultPrivacyLevel.MASK) &&
+    configuration.enablePrivacyForActionName
+  const actionName = getActionNameFromElement(
+    event.target,
+    configuration.actionNameAttribute,
+    privacyEnabledForActionName
+  )
+  const target = {
+    width: Math.round(rect.width),
+    height: Math.round(rect.height),
+    selector: getSelectorFromElement(event.target, configuration.actionNameAttribute),
+  }
+
   return {
     type: ActionType.CLICK,
-    target: {
-      width: Math.round(rect.width),
-      height: Math.round(rect.height),
-      selector: getSelectorFromElement(event.target, actionNameAttribute),
-    },
+    target:
+      actionName === ACTION_NAME_PLACEHOLDER && privacyEnabledForActionName ? assign({ masked: true }, target) : target,
     position: {
       // Use clientX and Y because for SVG element offsetX and Y are relatives to the <svg> element
       x: Math.round(event.clientX - rect.left),
       y: Math.round(event.clientY - rect.top),
     },
-    name: getActionNameFromElement(event.target, actionNameAttribute),
+    name: actionName,
   }
 }
 
diff --git a/packages/rum-core/src/domain/configuration.ts b/packages/rum-core/src/domain/configuration.ts
index 491ac2f77f..c8b6d29c23 100644
--- a/packages/rum-core/src/domain/configuration.ts
+++ b/packages/rum-core/src/domain/configuration.ts
@@ -39,6 +39,7 @@ export interface RumInitConfiguration extends InitConfiguration {
   startSessionReplayRecordingManually?: boolean | undefined
 
   // action options
+  enablePrivacyForActionName?: boolean | undefined
   trackUserInteractions?: boolean | undefined
   actionNameAttribute?: string | undefined
 
@@ -61,6 +62,7 @@ export interface RumConfiguration extends Configuration {
   compressIntakeRequests: boolean
   applicationId: string
   defaultPrivacyLevel: DefaultPrivacyLevel
+  enablePrivacyForActionName: boolean
   sessionReplaySampleRate: number
   startSessionReplayRecordingManually: boolean
   trackUserInteractions: boolean
@@ -129,6 +131,7 @@ export function validateAndBuildRumConfiguration(
       defaultPrivacyLevel: objectHasValue(DefaultPrivacyLevel, initConfiguration.defaultPrivacyLevel)
         ? initConfiguration.defaultPrivacyLevel
         : DefaultPrivacyLevel.MASK,
+      enablePrivacyForActionName: initConfiguration.enablePrivacyForActionName ?? false,
       customerDataTelemetrySampleRate: 1,
       traceContextInjection: objectHasValue(TraceContextInjection, initConfiguration.traceContextInjection)
         ? initConfiguration.traceContextInjection
diff --git a/packages/rum/src/domain/record/privacy.spec.ts b/packages/rum-core/src/domain/privacy.spec.ts
similarity index 99%
rename from packages/rum/src/domain/record/privacy.spec.ts
rename to packages/rum-core/src/domain/privacy.spec.ts
index 1d360deb5d..37dcbd5067 100644
--- a/packages/rum/src/domain/record/privacy.spec.ts
+++ b/packages/rum-core/src/domain/privacy.spec.ts
@@ -5,7 +5,7 @@ import {
   PRIVACY_ATTR_VALUE_HIDDEN,
   PRIVACY_ATTR_VALUE_MASK,
   PRIVACY_ATTR_VALUE_MASK_USER_INPUT,
-} from '../../constants'
+} from '../constants'
 import { getNodeSelfPrivacyLevel, reducePrivacyLevel, getNodePrivacyLevel, shouldMaskNode } from './privacy'
 
 describe('getNodePrivacyLevel', () => {
diff --git a/packages/rum/src/domain/record/privacy.ts b/packages/rum-core/src/domain/privacy.ts
similarity index 98%
rename from packages/rum/src/domain/record/privacy.ts
rename to packages/rum-core/src/domain/privacy.ts
index 28cabc2c49..c09bafe514 100644
--- a/packages/rum/src/domain/record/privacy.ts
+++ b/packages/rum-core/src/domain/privacy.ts
@@ -1,4 +1,4 @@
-import { isElementNode, getParentNode, isTextNode } from '@datadog/browser-rum-core'
+import { isElementNode, getParentNode, isTextNode } from '../browser/htmlDomUtils'
 import {
   NodePrivacyLevel,
   PRIVACY_ATTR_NAME,
@@ -12,7 +12,7 @@ import {
   PRIVACY_CLASS_HIDDEN,
   FORM_PRIVATE_TAG_NAMES,
   CENSORED_STRING_MARK,
-} from '../../constants'
+} from '../constants'
 
 const TEXT_MASKING_CHAR = 'x'
 
diff --git a/packages/rum-core/src/index.ts b/packages/rum-core/src/index.ts
index f65c4de15d..ace48acb03 100644
--- a/packages/rum-core/src/index.ts
+++ b/packages/rum-core/src/index.ts
@@ -36,3 +36,5 @@ export * from './browser/htmlDomUtils'
 export * from './browser/polyfills'
 export { getSessionReplayUrl } from './domain/getSessionReplayUrl'
 export { isLongDataUrl, sanitizeDataUrl, MAX_ATTRIBUTE_VALUE_CHAR_LENGTH } from './domain/resource/resourceUtils'
+export * from './constants'
+export { getNodePrivacyLevel, shouldMaskNode, getTextContent, NodePrivacyLevelCache } from './domain/privacy'
diff --git a/packages/rum/src/domain/record/serialization/htmlAst.specHelper.ts b/packages/rum/src/domain/record/serialization/htmlAst.specHelper.ts
index 3817d8d783..d8372ebf66 100644
--- a/packages/rum/src/domain/record/serialization/htmlAst.specHelper.ts
+++ b/packages/rum/src/domain/record/serialization/htmlAst.specHelper.ts
@@ -2,7 +2,7 @@ import type { RumConfiguration } from '@datadog/browser-rum-core'
 import { display, noop, objectValues } from '@datadog/browser-core'
 import type { SerializedNodeWithId } from '../../../types'
 import { serializeNodeWithId, SerializationContextStatus, createElementsScrollPositions } from '..'
-import { NodePrivacyLevel, PRIVACY_ATTR_NAME } from '../../../constants'
+import { NodePrivacyLevel, PRIVACY_ATTR_NAME } from '../../../../../rum-core/src/constants'
 
 export const makeHtmlDoc = (htmlContent: string, privacyTag: string) => {
   try {
diff --git a/packages/rum/src/domain/record/serialization/serialization.types.ts b/packages/rum/src/domain/record/serialization/serialization.types.ts
index bc5a35207c..e8242c2d9f 100644
--- a/packages/rum/src/domain/record/serialization/serialization.types.ts
+++ b/packages/rum/src/domain/record/serialization/serialization.types.ts
@@ -1,5 +1,5 @@
 import type { RumConfiguration } from '@datadog/browser-rum-core'
-import type { NodePrivacyLevel } from '../../../constants'
+import type { NodePrivacyLevel } from '../../../../../rum-core/src/constants'
 import type { ElementsScrollPositions } from '../elementsScrollPositions'
 import type { ShadowRootsController } from '../shadowRootsController'
 
diff --git a/packages/rum/src/domain/record/serialization/serializationUtils.spec.ts b/packages/rum/src/domain/record/serialization/serializationUtils.spec.ts
index 18cac235b4..c3b7463ae2 100644
--- a/packages/rum/src/domain/record/serialization/serializationUtils.spec.ts
+++ b/packages/rum/src/domain/record/serialization/serializationUtils.spec.ts
@@ -1,5 +1,5 @@
 import { isIE } from '@datadog/browser-core'
-import { NodePrivacyLevel } from '../../../constants'
+import { NodePrivacyLevel } from '../../../../../rum-core/src/constants'
 import {
   getSerializedNodeId,
   hasSerializedNode,
diff --git a/packages/rum/src/domain/record/serialization/serializationUtils.ts b/packages/rum/src/domain/record/serialization/serializationUtils.ts
index 218aa564b2..1cc2471129 100644
--- a/packages/rum/src/domain/record/serialization/serializationUtils.ts
+++ b/packages/rum/src/domain/record/serialization/serializationUtils.ts
@@ -1,8 +1,8 @@
 import { buildUrl } from '@datadog/browser-core'
 import { getParentNode, isNodeShadowRoot } from '@datadog/browser-rum-core'
-import type { NodePrivacyLevel } from '../../../constants'
-import { CENSORED_STRING_MARK } from '../../../constants'
-import { shouldMaskNode } from '../privacy'
+import type { NodePrivacyLevel } from '../../../../../rum-core/src/constants'
+import { CENSORED_STRING_MARK } from '../../../../../rum-core/src/constants'
+import { shouldMaskNode } from '../../../../../rum-core/src/domain/privacy'
 import type { NodeWithSerializedNode } from './serialization.types'
 
 const serializedNodeIds = new WeakMap<Node, number>()
diff --git a/packages/rum/src/domain/record/serialization/serializeAttribute.spec.ts b/packages/rum/src/domain/record/serialization/serializeAttribute.spec.ts
index 9f446afc60..342bcdb9ed 100644
--- a/packages/rum/src/domain/record/serialization/serializeAttribute.spec.ts
+++ b/packages/rum/src/domain/record/serialization/serializeAttribute.spec.ts
@@ -6,7 +6,7 @@ import {
   DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE,
   MAX_ATTRIBUTE_VALUE_CHAR_LENGTH,
 } from '@datadog/browser-rum-core'
-import { NodePrivacyLevel, PRIVACY_ATTR_NAME } from '../../../constants'
+import { NodePrivacyLevel, PRIVACY_ATTR_NAME } from '../../../../../rum-core/src/constants'
 import { serializeAttribute } from './serializeAttribute'
 
 const DEFAULT_CONFIGURATION = {} as RumConfiguration
diff --git a/packages/rum/src/domain/record/serialization/serializeAttribute.ts b/packages/rum/src/domain/record/serialization/serializeAttribute.ts
index c16a276350..ea745989f1 100644
--- a/packages/rum/src/domain/record/serialization/serializeAttribute.ts
+++ b/packages/rum/src/domain/record/serialization/serializeAttribute.ts
@@ -1,7 +1,12 @@
 import { startsWith } from '@datadog/browser-core'
 import { STABLE_ATTRIBUTES, isLongDataUrl, sanitizeDataUrl } from '@datadog/browser-rum-core'
 import type { RumConfiguration } from '@datadog/browser-rum-core'
-import { NodePrivacyLevel, PRIVACY_ATTR_NAME, CENSORED_STRING_MARK, CENSORED_IMG_MARK } from '../../../constants'
+import {
+  NodePrivacyLevel,
+  PRIVACY_ATTR_NAME,
+  CENSORED_STRING_MARK,
+  CENSORED_IMG_MARK,
+} from '../../../../../rum-core/src/constants'
 import { censoredImageForSize } from './serializationUtils'
 
 export function serializeAttribute(
diff --git a/packages/rum/src/domain/record/serialization/serializeAttributes.ts b/packages/rum/src/domain/record/serialization/serializeAttributes.ts
index 39de074d79..54f4406bfa 100644
--- a/packages/rum/src/domain/record/serialization/serializeAttributes.ts
+++ b/packages/rum/src/domain/record/serialization/serializeAttributes.ts
@@ -1,7 +1,7 @@
 import { ExperimentalFeature, isExperimentalFeatureEnabled, isSafari } from '@datadog/browser-core'
 
-import { NodePrivacyLevel } from '../../../constants'
-import { shouldMaskNode } from '../privacy'
+import { NodePrivacyLevel } from '../../../../../rum-core/src/constants'
+import { shouldMaskNode } from '../../../../../rum-core/src/domain/privacy'
 import { getElementInputValue, switchToAbsoluteUrl, getValidTagName } from './serializationUtils'
 import type { SerializeOptions } from './serialization.types'
 import { SerializationContextStatus } from './serialization.types'
diff --git a/packages/rum/src/domain/record/serialization/serializeNode.spec.ts b/packages/rum/src/domain/record/serialization/serializeNode.spec.ts
index 461b6457da..3058a40179 100644
--- a/packages/rum/src/domain/record/serialization/serializeNode.spec.ts
+++ b/packages/rum/src/domain/record/serialization/serializeNode.spec.ts
@@ -15,7 +15,7 @@ import {
   PRIVACY_ATTR_VALUE_HIDDEN,
   PRIVACY_ATTR_VALUE_MASK,
   PRIVACY_ATTR_VALUE_MASK_USER_INPUT,
-} from '../../../constants'
+} from '../../../../../rum-core/src/constants'
 import type { ElementNode, SerializedNodeWithId } from '../../../types'
 import { NodeType } from '../../../types'
 import { appendElement } from '../../../../../rum-core/test'
diff --git a/packages/rum/src/domain/record/serialization/serializeNode.ts b/packages/rum/src/domain/record/serialization/serializeNode.ts
index cfde247201..36c7344d5e 100644
--- a/packages/rum/src/domain/record/serialization/serializeNode.ts
+++ b/packages/rum/src/domain/record/serialization/serializeNode.ts
@@ -11,8 +11,8 @@ import type {
   TextNode,
 } from '../../../types'
 import { NodeType } from '../../../types'
-import { NodePrivacyLevel, PRIVACY_ATTR_NAME, PRIVACY_ATTR_VALUE_HIDDEN } from '../../../constants'
-import { reducePrivacyLevel, getNodeSelfPrivacyLevel, getTextContent } from '../privacy'
+import { NodePrivacyLevel, PRIVACY_ATTR_NAME, PRIVACY_ATTR_VALUE_HIDDEN } from '../../../../../rum-core/src/constants'
+import { reducePrivacyLevel, getNodeSelfPrivacyLevel, getTextContent } from '../../../../../rum-core/src/domain/privacy'
 import { getSerializedNodeId, getValidTagName, setSerializedNodeId } from './serializationUtils'
 import type { SerializeOptions } from './serialization.types'
 import { serializeStyleSheets } from './serializeStyleSheets'
diff --git a/packages/rum/src/domain/record/trackers/trackInput.spec.ts b/packages/rum/src/domain/record/trackers/trackInput.spec.ts
index f7986d59b6..02e7ae01c6 100644
--- a/packages/rum/src/domain/record/trackers/trackInput.spec.ts
+++ b/packages/rum/src/domain/record/trackers/trackInput.spec.ts
@@ -3,7 +3,7 @@ import type { Clock } from '@datadog/browser-core/test'
 import { createNewEvent, mockClock } from '@datadog/browser-core/test'
 import type { RumConfiguration } from '@datadog/browser-rum-core'
 import { appendElement } from '../../../../../rum-core/test'
-import { PRIVACY_ATTR_NAME, PRIVACY_ATTR_VALUE_MASK_USER_INPUT } from '../../../constants'
+import { PRIVACY_ATTR_NAME, PRIVACY_ATTR_VALUE_MASK_USER_INPUT } from '../../../../../rum-core/src/constants'
 import { serializeDocument, SerializationContextStatus } from '../serialization'
 import { createElementsScrollPositions } from '../elementsScrollPositions'
 import { IncrementalSource, RecordType } from '../../../types'
diff --git a/packages/rum/src/domain/record/trackers/trackInput.ts b/packages/rum/src/domain/record/trackers/trackInput.ts
index 2e5232eb11..c1334e069b 100644
--- a/packages/rum/src/domain/record/trackers/trackInput.ts
+++ b/packages/rum/src/domain/record/trackers/trackInput.ts
@@ -1,11 +1,9 @@
 import { instrumentSetter, assign, DOM_EVENT, addEventListeners, forEach, noop } from '@datadog/browser-core'
-import { cssEscape } from '@datadog/browser-rum-core'
+import { NodePrivacyLevel, getNodePrivacyLevel, shouldMaskNode, cssEscape } from '@datadog/browser-rum-core'
 import type { RumConfiguration } from '@datadog/browser-rum-core'
-import { NodePrivacyLevel } from '../../../constants'
 import { IncrementalSource } from '../../../types'
 import type { BrowserIncrementalSnapshotRecord, InputData, InputState } from '../../../types'
 import { getEventTarget } from '../eventsUtils'
-import { getNodePrivacyLevel, shouldMaskNode } from '../privacy'
 import { getElementInputValue, getSerializedNodeId, hasSerializedNode } from '../serialization'
 import { assembleIncrementalSnapshot } from '../assembly'
 import type { Tracker } from './types'
diff --git a/packages/rum/src/domain/record/trackers/trackMediaInteraction.ts b/packages/rum/src/domain/record/trackers/trackMediaInteraction.ts
index 899d443e81..13afc94fac 100644
--- a/packages/rum/src/domain/record/trackers/trackMediaInteraction.ts
+++ b/packages/rum/src/domain/record/trackers/trackMediaInteraction.ts
@@ -1,10 +1,9 @@
 import { DOM_EVENT, addEventListeners } from '@datadog/browser-core'
 import type { RumConfiguration } from '@datadog/browser-rum-core'
-import { NodePrivacyLevel } from '../../../constants'
+import { NodePrivacyLevel, getNodePrivacyLevel } from '@datadog/browser-rum-core'
 import type { BrowserIncrementalSnapshotRecord, MediaInteractionData } from '../../../types'
 import { IncrementalSource, MediaInteractionType } from '../../../types'
 import { getEventTarget } from '../eventsUtils'
-import { getNodePrivacyLevel } from '../privacy'
 import { getSerializedNodeId, hasSerializedNode } from '../serialization'
 import { assembleIncrementalSnapshot } from '../assembly'
 import type { Tracker } from './types'
diff --git a/packages/rum/src/domain/record/trackers/trackMouseInteraction.ts b/packages/rum/src/domain/record/trackers/trackMouseInteraction.ts
index 5cfe033b98..b5ad0895cd 100644
--- a/packages/rum/src/domain/record/trackers/trackMouseInteraction.ts
+++ b/packages/rum/src/domain/record/trackers/trackMouseInteraction.ts
@@ -1,11 +1,10 @@
 import { assign, addEventListeners, DOM_EVENT } from '@datadog/browser-core'
+import { getNodePrivacyLevel, NodePrivacyLevel } from '@datadog/browser-rum-core'
 import type { RumConfiguration } from '@datadog/browser-rum-core'
-import { NodePrivacyLevel } from '../../../constants'
 import type { MouseInteraction, MouseInteractionData, BrowserIncrementalSnapshotRecord } from '../../../types'
 import { IncrementalSource, MouseInteractionType } from '../../../types'
 import { assembleIncrementalSnapshot } from '../assembly'
 import { getEventTarget } from '../eventsUtils'
-import { getNodePrivacyLevel } from '../privacy'
 import { getSerializedNodeId, hasSerializedNode } from '../serialization'
 import type { RecordIds } from '../recordIds'
 import { tryToComputeCoordinates } from './trackMove'
diff --git a/packages/rum/src/domain/record/trackers/trackMutation.spec.ts b/packages/rum/src/domain/record/trackers/trackMutation.spec.ts
index 312cdbbcc9..bd3286556b 100644
--- a/packages/rum/src/domain/record/trackers/trackMutation.spec.ts
+++ b/packages/rum/src/domain/record/trackers/trackMutation.spec.ts
@@ -1,14 +1,14 @@
 import { DefaultPrivacyLevel, isIE } from '@datadog/browser-core'
 import type { RumConfiguration } from '@datadog/browser-rum-core'
 import { collectAsyncCalls } from '@datadog/browser-core/test'
-import { createMutationPayloadValidator } from '../../../../test'
 import {
   NodePrivacyLevel,
   PRIVACY_ATTR_NAME,
   PRIVACY_ATTR_VALUE_ALLOW,
   PRIVACY_ATTR_VALUE_MASK,
   PRIVACY_ATTR_VALUE_MASK_USER_INPUT,
-} from '../../../constants'
+} from '@datadog/browser-rum-core'
+import { createMutationPayloadValidator } from '../../../../test'
 import type { AttributeMutation, Attributes, BrowserMutationPayload } from '../../../types'
 import { NodeType } from '../../../types'
 import { serializeDocument, SerializationContextStatus } from '../serialization'
diff --git a/packages/rum/src/domain/record/trackers/trackMutation.ts b/packages/rum/src/domain/record/trackers/trackMutation.ts
index 2463478917..5b705b5836 100644
--- a/packages/rum/src/domain/record/trackers/trackMutation.ts
+++ b/packages/rum/src/domain/record/trackers/trackMutation.ts
@@ -1,12 +1,14 @@
 import { monitor, noop } from '@datadog/browser-core'
-import type { RumConfiguration } from '@datadog/browser-rum-core'
+import type { RumConfiguration, NodePrivacyLevelCache } from '@datadog/browser-rum-core'
 import {
   isNodeShadowHost,
   getMutationObserverConstructor,
   getParentNode,
   forEachChildNodes,
+  getNodePrivacyLevel,
+  getTextContent,
+  NodePrivacyLevel,
 } from '@datadog/browser-rum-core'
-import { NodePrivacyLevel } from '../../../constants'
 import { IncrementalSource } from '../../../types'
 import type {
   BrowserMutationData,
@@ -16,8 +18,6 @@ import type {
   TextMutation,
   BrowserIncrementalSnapshotRecord,
 } from '../../../types'
-import type { NodePrivacyLevelCache } from '../privacy'
-import { getNodePrivacyLevel, getTextContent } from '../privacy'
 import type { NodeWithSerializedNode } from '../serialization'
 import {
   getElementInputValue,
diff --git a/packages/rum/src/domain/record/trackers/trackScroll.ts b/packages/rum/src/domain/record/trackers/trackScroll.ts
index d06ae8c3a0..df00846722 100644
--- a/packages/rum/src/domain/record/trackers/trackScroll.ts
+++ b/packages/rum/src/domain/record/trackers/trackScroll.ts
@@ -1,13 +1,11 @@
 import { DOM_EVENT, throttle, addEventListener } from '@datadog/browser-core'
 import type { RumConfiguration } from '@datadog/browser-rum-core'
-import { getScrollX, getScrollY } from '@datadog/browser-rum-core'
+import { getScrollX, getScrollY, getNodePrivacyLevel, NodePrivacyLevel } from '@datadog/browser-rum-core'
 import type { ElementsScrollPositions } from '../elementsScrollPositions'
 import { getEventTarget } from '../eventsUtils'
-import { getNodePrivacyLevel } from '../privacy'
 import { getSerializedNodeId, hasSerializedNode } from '../serialization'
 import { IncrementalSource } from '../../../types'
 import type { BrowserIncrementalSnapshotRecord, ScrollData } from '../../../types'
-import { NodePrivacyLevel } from '../../../constants'
 import { assembleIncrementalSnapshot } from '../assembly'
 import type { Tracker } from './types'
 
diff --git a/packages/rum/src/domain/record/trackers/trackers.specHelper.ts b/packages/rum/src/domain/record/trackers/trackers.specHelper.ts
index c51f934bf7..08fd5de530 100644
--- a/packages/rum/src/domain/record/trackers/trackers.specHelper.ts
+++ b/packages/rum/src/domain/record/trackers/trackers.specHelper.ts
@@ -1,7 +1,7 @@
 import { noop } from '@datadog/browser-core'
 import type { RumConfiguration } from '@datadog/browser-rum-core'
 import type { ShadowRootsController } from '../shadowRootsController'
-import { NodePrivacyLevel } from '../../../constants'
+import { NodePrivacyLevel } from '../../../../../rum-core/src/constants'
 
 export const DEFAULT_SHADOW_ROOT_CONTROLLER: ShadowRootsController = {
   flush: noop,
diff --git a/packages/rum/src/entries/internal.ts b/packages/rum/src/entries/internal.ts
index 8b78b62997..984dc8fde6 100644
--- a/packages/rum/src/entries/internal.ts
+++ b/packages/rum/src/entries/internal.ts
@@ -6,7 +6,12 @@
  * changes.
  */
 export type { TimeStamp } from '@datadog/browser-core'
-export { PRIVACY_ATTR_NAME, PRIVACY_ATTR_VALUE_HIDDEN, PRIVACY_CLASS_HIDDEN, NodePrivacyLevel } from '../constants'
+export {
+  PRIVACY_ATTR_NAME,
+  PRIVACY_ATTR_VALUE_HIDDEN,
+  PRIVACY_CLASS_HIDDEN,
+  NodePrivacyLevel,
+} from '../../../rum-core/src/constants'
 
 export * from '../types'
 

From 4406479608975967610920d87395141c9cd1a7fb Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Mon, 15 Apr 2024 16:00:09 +0200
Subject: [PATCH 02/32] Fix import from browser-rum-core

---
 packages/rum-core/src/index.ts                     |  2 +-
 .../record/serialization/htmlAst.specHelper.ts     |  2 +-
 .../record/serialization/serialization.types.ts    |  3 +--
 .../serialization/serializationUtils.spec.ts       |  2 +-
 .../record/serialization/serializationUtils.ts     |  6 ++----
 .../serialization/serializeAttribute.spec.ts       |  3 ++-
 .../record/serialization/serializeAttribute.ts     |  8 +++++---
 .../record/serialization/serializeAttributes.ts    |  3 +--
 .../record/serialization/serializeNode.spec.ts     |  2 +-
 .../domain/record/serialization/serializeNode.ts   | 14 +++++++++++---
 .../src/domain/record/trackers/trackInput.spec.ts  |  2 +-
 .../domain/record/trackers/trackers.specHelper.ts  |  2 +-
 packages/rum/src/entries/internal.ts               |  2 +-
 13 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/packages/rum-core/src/index.ts b/packages/rum-core/src/index.ts
index ace48acb03..7345b8f41a 100644
--- a/packages/rum-core/src/index.ts
+++ b/packages/rum-core/src/index.ts
@@ -37,4 +37,4 @@ export * from './browser/polyfills'
 export { getSessionReplayUrl } from './domain/getSessionReplayUrl'
 export { isLongDataUrl, sanitizeDataUrl, MAX_ATTRIBUTE_VALUE_CHAR_LENGTH } from './domain/resource/resourceUtils'
 export * from './constants'
-export { getNodePrivacyLevel, shouldMaskNode, getTextContent, NodePrivacyLevelCache } from './domain/privacy'
+export * from './domain/privacy'
diff --git a/packages/rum/src/domain/record/serialization/htmlAst.specHelper.ts b/packages/rum/src/domain/record/serialization/htmlAst.specHelper.ts
index d8372ebf66..c50cc71ca9 100644
--- a/packages/rum/src/domain/record/serialization/htmlAst.specHelper.ts
+++ b/packages/rum/src/domain/record/serialization/htmlAst.specHelper.ts
@@ -1,8 +1,8 @@
 import type { RumConfiguration } from '@datadog/browser-rum-core'
+import { NodePrivacyLevel, PRIVACY_ATTR_NAME } from '@datadog/browser-rum-core'
 import { display, noop, objectValues } from '@datadog/browser-core'
 import type { SerializedNodeWithId } from '../../../types'
 import { serializeNodeWithId, SerializationContextStatus, createElementsScrollPositions } from '..'
-import { NodePrivacyLevel, PRIVACY_ATTR_NAME } from '../../../../../rum-core/src/constants'
 
 export const makeHtmlDoc = (htmlContent: string, privacyTag: string) => {
   try {
diff --git a/packages/rum/src/domain/record/serialization/serialization.types.ts b/packages/rum/src/domain/record/serialization/serialization.types.ts
index e8242c2d9f..452aee1a03 100644
--- a/packages/rum/src/domain/record/serialization/serialization.types.ts
+++ b/packages/rum/src/domain/record/serialization/serialization.types.ts
@@ -1,5 +1,4 @@
-import type { RumConfiguration } from '@datadog/browser-rum-core'
-import type { NodePrivacyLevel } from '../../../../../rum-core/src/constants'
+import type { RumConfiguration, NodePrivacyLevel } from '@datadog/browser-rum-core'
 import type { ElementsScrollPositions } from '../elementsScrollPositions'
 import type { ShadowRootsController } from '../shadowRootsController'
 
diff --git a/packages/rum/src/domain/record/serialization/serializationUtils.spec.ts b/packages/rum/src/domain/record/serialization/serializationUtils.spec.ts
index c3b7463ae2..6ee0f8ced8 100644
--- a/packages/rum/src/domain/record/serialization/serializationUtils.spec.ts
+++ b/packages/rum/src/domain/record/serialization/serializationUtils.spec.ts
@@ -1,5 +1,5 @@
 import { isIE } from '@datadog/browser-core'
-import { NodePrivacyLevel } from '../../../../../rum-core/src/constants'
+import { NodePrivacyLevel } from '@datadog/browser-rum-core'
 import {
   getSerializedNodeId,
   hasSerializedNode,
diff --git a/packages/rum/src/domain/record/serialization/serializationUtils.ts b/packages/rum/src/domain/record/serialization/serializationUtils.ts
index 1cc2471129..57f6ac6dba 100644
--- a/packages/rum/src/domain/record/serialization/serializationUtils.ts
+++ b/packages/rum/src/domain/record/serialization/serializationUtils.ts
@@ -1,8 +1,6 @@
 import { buildUrl } from '@datadog/browser-core'
-import { getParentNode, isNodeShadowRoot } from '@datadog/browser-rum-core'
-import type { NodePrivacyLevel } from '../../../../../rum-core/src/constants'
-import { CENSORED_STRING_MARK } from '../../../../../rum-core/src/constants'
-import { shouldMaskNode } from '../../../../../rum-core/src/domain/privacy'
+import { getParentNode, isNodeShadowRoot, CENSORED_STRING_MARK, shouldMaskNode } from '@datadog/browser-rum-core'
+import type { NodePrivacyLevel } from '@datadog/browser-rum-core'
 import type { NodeWithSerializedNode } from './serialization.types'
 
 const serializedNodeIds = new WeakMap<Node, number>()
diff --git a/packages/rum/src/domain/record/serialization/serializeAttribute.spec.ts b/packages/rum/src/domain/record/serialization/serializeAttribute.spec.ts
index 342bcdb9ed..6034ca5199 100644
--- a/packages/rum/src/domain/record/serialization/serializeAttribute.spec.ts
+++ b/packages/rum/src/domain/record/serialization/serializeAttribute.spec.ts
@@ -5,8 +5,9 @@ import {
   STABLE_ATTRIBUTES,
   DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE,
   MAX_ATTRIBUTE_VALUE_CHAR_LENGTH,
+  NodePrivacyLevel,
+  PRIVACY_ATTR_NAME,
 } from '@datadog/browser-rum-core'
-import { NodePrivacyLevel, PRIVACY_ATTR_NAME } from '../../../../../rum-core/src/constants'
 import { serializeAttribute } from './serializeAttribute'
 
 const DEFAULT_CONFIGURATION = {} as RumConfiguration
diff --git a/packages/rum/src/domain/record/serialization/serializeAttribute.ts b/packages/rum/src/domain/record/serialization/serializeAttribute.ts
index ea745989f1..4c6991c5e1 100644
--- a/packages/rum/src/domain/record/serialization/serializeAttribute.ts
+++ b/packages/rum/src/domain/record/serialization/serializeAttribute.ts
@@ -1,12 +1,14 @@
 import { startsWith } from '@datadog/browser-core'
-import { STABLE_ATTRIBUTES, isLongDataUrl, sanitizeDataUrl } from '@datadog/browser-rum-core'
-import type { RumConfiguration } from '@datadog/browser-rum-core'
 import {
   NodePrivacyLevel,
   PRIVACY_ATTR_NAME,
   CENSORED_STRING_MARK,
   CENSORED_IMG_MARK,
-} from '../../../../../rum-core/src/constants'
+  STABLE_ATTRIBUTES,
+  isLongDataUrl,
+  sanitizeDataUrl,
+} from '@datadog/browser-rum-core'
+import type { RumConfiguration } from '@datadog/browser-rum-core'
 import { censoredImageForSize } from './serializationUtils'
 
 export function serializeAttribute(
diff --git a/packages/rum/src/domain/record/serialization/serializeAttributes.ts b/packages/rum/src/domain/record/serialization/serializeAttributes.ts
index 54f4406bfa..409c3085e3 100644
--- a/packages/rum/src/domain/record/serialization/serializeAttributes.ts
+++ b/packages/rum/src/domain/record/serialization/serializeAttributes.ts
@@ -1,7 +1,6 @@
 import { ExperimentalFeature, isExperimentalFeatureEnabled, isSafari } from '@datadog/browser-core'
 
-import { NodePrivacyLevel } from '../../../../../rum-core/src/constants'
-import { shouldMaskNode } from '../../../../../rum-core/src/domain/privacy'
+import { NodePrivacyLevel, shouldMaskNode } from '@datadog/browser-rum-core'
 import { getElementInputValue, switchToAbsoluteUrl, getValidTagName } from './serializationUtils'
 import type { SerializeOptions } from './serialization.types'
 import { SerializationContextStatus } from './serialization.types'
diff --git a/packages/rum/src/domain/record/serialization/serializeNode.spec.ts b/packages/rum/src/domain/record/serialization/serializeNode.spec.ts
index 3058a40179..5077220af8 100644
--- a/packages/rum/src/domain/record/serialization/serializeNode.spec.ts
+++ b/packages/rum/src/domain/record/serialization/serializeNode.spec.ts
@@ -15,7 +15,7 @@ import {
   PRIVACY_ATTR_VALUE_HIDDEN,
   PRIVACY_ATTR_VALUE_MASK,
   PRIVACY_ATTR_VALUE_MASK_USER_INPUT,
-} from '../../../../../rum-core/src/constants'
+} from '@datadog/browser-rum-core'
 import type { ElementNode, SerializedNodeWithId } from '../../../types'
 import { NodeType } from '../../../types'
 import { appendElement } from '../../../../../rum-core/test'
diff --git a/packages/rum/src/domain/record/serialization/serializeNode.ts b/packages/rum/src/domain/record/serialization/serializeNode.ts
index 36c7344d5e..84726c55bc 100644
--- a/packages/rum/src/domain/record/serialization/serializeNode.ts
+++ b/packages/rum/src/domain/record/serialization/serializeNode.ts
@@ -1,4 +1,14 @@
-import { isNodeShadowRoot, hasChildNodes, forEachChildNodes } from '@datadog/browser-rum-core'
+import {
+  reducePrivacyLevel,
+  getNodeSelfPrivacyLevel,
+  getTextContent,
+  isNodeShadowRoot,
+  hasChildNodes,
+  forEachChildNodes,
+  NodePrivacyLevel,
+  PRIVACY_ATTR_NAME,
+  PRIVACY_ATTR_VALUE_HIDDEN,
+} from '@datadog/browser-rum-core'
 import { assign } from '@datadog/browser-core'
 import type {
   DocumentFragmentNode,
@@ -11,8 +21,6 @@ import type {
   TextNode,
 } from '../../../types'
 import { NodeType } from '../../../types'
-import { NodePrivacyLevel, PRIVACY_ATTR_NAME, PRIVACY_ATTR_VALUE_HIDDEN } from '../../../../../rum-core/src/constants'
-import { reducePrivacyLevel, getNodeSelfPrivacyLevel, getTextContent } from '../../../../../rum-core/src/domain/privacy'
 import { getSerializedNodeId, getValidTagName, setSerializedNodeId } from './serializationUtils'
 import type { SerializeOptions } from './serialization.types'
 import { serializeStyleSheets } from './serializeStyleSheets'
diff --git a/packages/rum/src/domain/record/trackers/trackInput.spec.ts b/packages/rum/src/domain/record/trackers/trackInput.spec.ts
index 02e7ae01c6..394fe11d12 100644
--- a/packages/rum/src/domain/record/trackers/trackInput.spec.ts
+++ b/packages/rum/src/domain/record/trackers/trackInput.spec.ts
@@ -2,8 +2,8 @@ import { DefaultPrivacyLevel, isIE } from '@datadog/browser-core'
 import type { Clock } from '@datadog/browser-core/test'
 import { createNewEvent, mockClock } from '@datadog/browser-core/test'
 import type { RumConfiguration } from '@datadog/browser-rum-core'
+import { PRIVACY_ATTR_NAME, PRIVACY_ATTR_VALUE_MASK_USER_INPUT } from '@datadog/browser-rum-core'
 import { appendElement } from '../../../../../rum-core/test'
-import { PRIVACY_ATTR_NAME, PRIVACY_ATTR_VALUE_MASK_USER_INPUT } from '../../../../../rum-core/src/constants'
 import { serializeDocument, SerializationContextStatus } from '../serialization'
 import { createElementsScrollPositions } from '../elementsScrollPositions'
 import { IncrementalSource, RecordType } from '../../../types'
diff --git a/packages/rum/src/domain/record/trackers/trackers.specHelper.ts b/packages/rum/src/domain/record/trackers/trackers.specHelper.ts
index 08fd5de530..3c4c188319 100644
--- a/packages/rum/src/domain/record/trackers/trackers.specHelper.ts
+++ b/packages/rum/src/domain/record/trackers/trackers.specHelper.ts
@@ -1,7 +1,7 @@
 import { noop } from '@datadog/browser-core'
+import { NodePrivacyLevel } from '@datadog/browser-rum-core'
 import type { RumConfiguration } from '@datadog/browser-rum-core'
 import type { ShadowRootsController } from '../shadowRootsController'
-import { NodePrivacyLevel } from '../../../../../rum-core/src/constants'
 
 export const DEFAULT_SHADOW_ROOT_CONTROLLER: ShadowRootsController = {
   flush: noop,
diff --git a/packages/rum/src/entries/internal.ts b/packages/rum/src/entries/internal.ts
index 984dc8fde6..b93d97641c 100644
--- a/packages/rum/src/entries/internal.ts
+++ b/packages/rum/src/entries/internal.ts
@@ -11,7 +11,7 @@ export {
   PRIVACY_ATTR_VALUE_HIDDEN,
   PRIVACY_CLASS_HIDDEN,
   NodePrivacyLevel,
-} from '../../../rum-core/src/constants'
+} from '@datadog/browser-rum-core'
 
 export * from '../types'
 

From 1357c7e8afcd6bbd31f9c989295a69b415b79f3d Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Mon, 15 Apr 2024 16:47:58 +0200
Subject: [PATCH 03/32] Add enable_privacy_for_action_name into configuration

---
 packages/rum-core/src/domain/configuration.spec.ts | 1 +
 packages/rum-core/src/domain/configuration.ts      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/rum-core/src/domain/configuration.spec.ts b/packages/rum-core/src/domain/configuration.spec.ts
index d47fd8a5be..515a093dd5 100644
--- a/packages/rum-core/src/domain/configuration.spec.ts
+++ b/packages/rum-core/src/domain/configuration.spec.ts
@@ -468,6 +468,7 @@ describe('serializeRumConfiguration', () => {
       start_session_replay_recording_manually: true,
       action_name_attribute: 'test-id',
       default_privacy_level: 'allow',
+      enable_privacy_for_action_name: false,
       track_resources: true,
       track_long_task: true,
       use_worker_url: true,
diff --git a/packages/rum-core/src/domain/configuration.ts b/packages/rum-core/src/domain/configuration.ts
index c8b6d29c23..8bae3fcfc1 100644
--- a/packages/rum-core/src/domain/configuration.ts
+++ b/packages/rum-core/src/domain/configuration.ts
@@ -209,6 +209,7 @@ export function serializeRumConfiguration(configuration: RumInitConfiguration) {
         Array.isArray(configuration.allowedTracingUrls) && configuration.allowedTracingUrls.length > 0,
       selected_tracing_propagators: getSelectedTracingPropagators(configuration),
       default_privacy_level: configuration.defaultPrivacyLevel,
+      enable_privacy_for_action_name: configuration.enablePrivacyForActionName,
       use_excluded_activity_urls:
         Array.isArray(configuration.excludedActivityUrls) && configuration.excludedActivityUrls.length > 0,
       use_worker_url: !!configuration.workerUrl,

From 42fc2595896ae778b1a4f4adf0c4ed6c4e03b705 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Wed, 17 Apr 2024 11:03:59 +0200
Subject: [PATCH 04/32] Sync types with rum-events-format

---
 .../core/src/domain/telemetry/telemetryEvent.types.ts    | 9 ++++++---
 packages/rum-core/src/domain/configuration.spec.ts       | 1 +
 packages/rum-core/src/rumEvent.types.ts                  | 4 ++++
 rum-events-format                                        | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/domain/telemetry/telemetryEvent.types.ts b/packages/core/src/domain/telemetry/telemetryEvent.types.ts
index a2b415be2c..cb0fc2e50e 100644
--- a/packages/core/src/domain/telemetry/telemetryEvent.types.ts
+++ b/packages/core/src/domain/telemetry/telemetryEvent.types.ts
@@ -193,6 +193,10 @@ export type TelemetryConfigurationEvent = CommonTelemetryProperties & {
        * Session replay default privacy level
        */
       default_privacy_level?: string
+      /**
+       * Privacy control for action name
+       */
+      enable_privacy_for_action_name?: boolean
       /**
        * Whether the request origins list to ignore when computing the page activity is used
        */
@@ -302,7 +306,7 @@ export type TelemetryConfigurationEvent = CommonTelemetryProperties & {
        */
       batch_upload_frequency?: number
       /**
-       * Maximum number of batches processed sequencially without a delay
+       * Maximum number of batches processed sequentially without a delay
        */
       batch_processing_level?: number
       /**
@@ -329,9 +333,8 @@ export type TelemetryConfigurationEvent = CommonTelemetryProperties & {
        * The threshold used for iOS App Hangs monitoring (in milliseconds)
        */
       app_hang_threshold?: number
-
       /**
-       * Either forward logs to the PCI compliant intake or not
+       * Whether logs are sent to the PCI-compliant intake
        */
       use_pci_intake?: boolean
       /**
diff --git a/packages/rum-core/src/domain/configuration.spec.ts b/packages/rum-core/src/domain/configuration.spec.ts
index 515a093dd5..00707834ba 100644
--- a/packages/rum-core/src/domain/configuration.spec.ts
+++ b/packages/rum-core/src/domain/configuration.spec.ts
@@ -429,6 +429,7 @@ describe('serializeRumConfiguration', () => {
       traceSampleRate: 50,
       traceContextInjection: TraceContextInjection.ALL,
       defaultPrivacyLevel: 'allow',
+      enablePrivacyForActionName: false,
       subdomain: 'foo',
       sessionReplaySampleRate: 60,
       startSessionReplayRecordingManually: true,
diff --git a/packages/rum-core/src/rumEvent.types.ts b/packages/rum-core/src/rumEvent.types.ts
index a6d2170d40..fb1bd2e87d 100644
--- a/packages/rum-core/src/rumEvent.types.ts
+++ b/packages/rum-core/src/rumEvent.types.ts
@@ -395,6 +395,10 @@ export type RumErrorEvent = CommonProperties &
         readonly disposition?: 'enforce' | 'report'
         [k: string]: unknown
       }
+      /**
+       * Time since application start when error happened (in milliseconds)
+       */
+      readonly time_since_app_start?: number
       [k: string]: unknown
     }
     /**
diff --git a/rum-events-format b/rum-events-format
index be033e3251..844e2f49a4 160000
--- a/rum-events-format
+++ b/rum-events-format
@@ -1 +1 @@
-Subproject commit be033e3251da4a20891a774f9843c489a693c80d
+Subproject commit 844e2f49a4aa7779245eda1bbfa537bf8c6dd399

From e6d225cae2d70ce0c20dbf03ef20fe1549957d65 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Wed, 17 Apr 2024 12:01:11 +0200
Subject: [PATCH 05/32] =?UTF-8?q?=F0=9F=90=9B=20Fix=20bugs=20found=20in=20?=
 =?UTF-8?q?comments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../action/getActionNameFromElement.spec.ts   |  6 +-
 .../domain/action/getActionNameFromElement.ts | 17 +++---
 .../domain/action/trackClickActions.spec.ts   |  4 +-
 .../src/domain/action/trackClickActions.ts    | 57 +++++++++++--------
 4 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
index a7357b3b84..5928dd74a8 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
@@ -400,7 +400,7 @@ describe('getActionNameFromElement', () => {
           'data-test-id',
           true
         )
-      ).toBe('Masked Element')
+      ).toEqual({ name: 'Masked Element', masked: true })
     })
 
     it('extracts default attribute text when privacyEnabledActionName is true', () => {
@@ -414,7 +414,7 @@ describe('getActionNameFromElement', () => {
           undefined,
           true
         )
-      ).toBe('foo')
+      ).toEqual({ name: 'foo', masked: false })
     })
 
     it('extracts user defined attribute text when privacyEnabledActionName is true', () => {
@@ -428,7 +428,7 @@ describe('getActionNameFromElement', () => {
           'data-test-id',
           true
         )
-      ).toBe('foo')
+      ).toEqual({ name: 'foo', masked: false })
     })
   })
 })
diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
index 6b102a4ef3..bfd3b6303b 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
@@ -11,16 +11,18 @@ export function getActionNameFromElement(
   element: Element,
   userProgrammaticAttribute?: string,
   privacyEnabledForActionName?: boolean
-): string {
+): { name: string; masked?: boolean } | string {
+  const definedActionNameFromElement =
+    getActionNameFromElementProgrammatically(element, DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE) ||
+    (userProgrammaticAttribute && getActionNameFromElementProgrammatically(element, userProgrammaticAttribute))
   // Only get the defined action name if
   // * privacy is enabled for action name
   // * and privacy is enabled for the Node or globally
   if (privacyEnabledForActionName) {
-    return (
-      getActionNameFromElementProgrammatically(element, DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE) ||
-      (userProgrammaticAttribute && getActionNameFromElementProgrammatically(element, userProgrammaticAttribute)) ||
-      ACTION_NAME_PLACEHOLDER
-    )
+    return {
+      name: definedActionNameFromElement || ACTION_NAME_PLACEHOLDER,
+      masked: definedActionNameFromElement ? false : true,
+    }
   }
   // Proceed to get the action name in two steps:
   // * first, get the name programmatically, explicitly defined by the user.
@@ -29,8 +31,7 @@ export function getActionNameFromElement(
   // * if no name is found this way, use strategies returning less accurate names as a fallback.
   //   Those are much likely to succeed.
   return (
-    getActionNameFromElementProgrammatically(element, DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE) ||
-    (userProgrammaticAttribute && getActionNameFromElementProgrammatically(element, userProgrammaticAttribute)) ||
+    definedActionNameFromElement ||
     getActionNameFromElementForStrategies(element, userProgrammaticAttribute, priorityStrategies) ||
     getActionNameFromElementForStrategies(element, userProgrammaticAttribute, fallbackStrategies) ||
     ''
diff --git a/packages/rum-core/src/domain/action/trackClickActions.spec.ts b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
index 3ab535a9ad..fe4bea6734 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.spec.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
@@ -232,7 +232,7 @@ describe('trackClickActions', () => {
     expect(events.length).toBe(1)
   })
 
-  fdescribe('with enablePrivacyForActionName false', () => {
+  describe('with enablePrivacyForActionName false', () => {
     it('extracts action name when default privacy level is mask', () => {
       setupBuilder.withConfiguration({
         defaultPrivacyLevel: DefaultPrivacyLevel.MASK,
@@ -248,7 +248,7 @@ describe('trackClickActions', () => {
     })
   })
 
-  fdescribe('with enablePrivacyForActionName true', () => {
+  describe('with enablePrivacyForActionName true', () => {
     it('get placeholder when defaultPrivacyLevel is mask without programmatically declared action name', () => {
       setupBuilder.withConfiguration({
         defaultPrivacyLevel: DefaultPrivacyLevel.MASK,
diff --git a/packages/rum-core/src/domain/action/trackClickActions.ts b/packages/rum-core/src/domain/action/trackClickActions.ts
index 142100c916..a2b5c22589 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.ts
@@ -25,7 +25,7 @@ import { getSelectorFromElement } from '../getSelectorFromElement'
 import { getNodePrivacyLevel } from '../privacy'
 import type { ClickChain } from './clickChain'
 import { createClickChain } from './clickChain'
-import { getActionNameFromElement, ACTION_NAME_PLACEHOLDER } from './getActionNameFromElement'
+import { getActionNameFromElement } from './getActionNameFromElement'
 import type { MouseEventOnElement, UserActivity } from './listenActionEvents'
 import { listenActionEvents } from './listenActionEvents'
 import { computeFrustration } from './computeFrustration'
@@ -82,24 +82,27 @@ export function trackClickActions(
   lifeCycle.subscribe(LifeCycleEventType.VIEW_ENDED, stopClickChain)
 
   const { stop: stopActionEventsListener } = listenActionEvents<{
-    clickActionBase: ClickActionBase
+    clickActionBase: ClickActionBase | undefined
     hadActivityOnPointerDown: () => boolean
   }>(configuration, {
     onPointerDown: (pointerDownEvent) =>
       processPointerDown(configuration, lifeCycle, domMutationObservable, pointerDownEvent),
-    onPointerUp: ({ clickActionBase, hadActivityOnPointerDown }, startEvent, getUserActivity) =>
-      startClickAction(
-        configuration,
-        lifeCycle,
-        domMutationObservable,
-        history,
-        stopObservable,
-        appendClickToClickChain,
-        clickActionBase,
-        startEvent,
-        getUserActivity,
-        hadActivityOnPointerDown
-      ),
+    onPointerUp: ({ clickActionBase, hadActivityOnPointerDown }, startEvent, getUserActivity) => {
+      if (clickActionBase) {
+        startClickAction(
+          configuration,
+          lifeCycle,
+          domMutationObservable,
+          history,
+          stopObservable,
+          appendClickToClickChain,
+          clickActionBase,
+          startEvent,
+          getUserActivity,
+          hadActivityOnPointerDown
+        )
+      }
+    },
   })
 
   const actionContexts: ActionContexts = {
@@ -213,17 +216,26 @@ function startClickAction(
 
 type ClickActionBase = Pick<ClickAction, 'type' | 'name' | 'target' | 'position'>
 
-function computeClickActionBase(event: MouseEventOnElement, configuration: RumConfiguration): ClickActionBase {
+function computeClickActionBase(
+  event: MouseEventOnElement,
+  configuration: RumConfiguration
+): ClickActionBase | undefined {
   const rect = event.target.getBoundingClientRect()
+  const privacyLevel = getNodePrivacyLevel(event.target, configuration.defaultPrivacyLevel)
+
+  // When the node is set to hidden, we do not track click action
+  if (privacyLevel === NodePrivacyLevel.HIDDEN && configuration.enablePrivacyForActionName) {
+    return
+  }
+
   const privacyEnabledForActionName =
-    (getNodePrivacyLevel(event.target, configuration.defaultPrivacyLevel) === NodePrivacyLevel.HIDDEN ||
-      configuration.defaultPrivacyLevel === DefaultPrivacyLevel.MASK) &&
-    configuration.enablePrivacyForActionName
-  const actionName = getActionNameFromElement(
+    privacyLevel === DefaultPrivacyLevel.MASK && configuration.enablePrivacyForActionName
+  const actionNameResult = getActionNameFromElement(
     event.target,
     configuration.actionNameAttribute,
     privacyEnabledForActionName
   )
+
   const target = {
     width: Math.round(rect.width),
     height: Math.round(rect.height),
@@ -232,14 +244,13 @@ function computeClickActionBase(event: MouseEventOnElement, configuration: RumCo
 
   return {
     type: ActionType.CLICK,
-    target:
-      actionName === ACTION_NAME_PLACEHOLDER && privacyEnabledForActionName ? assign({ masked: true }, target) : target,
+    target: typeof actionNameResult === 'string' ? target : assign({ masked: actionNameResult.masked }, target),
     position: {
       // Use clientX and Y because for SVG element offsetX and Y are relatives to the <svg> element
       x: Math.round(event.clientX - rect.left),
       y: Math.round(event.clientY - rect.top),
     },
-    name: actionName,
+    name: typeof actionNameResult === 'string' ? actionNameResult : actionNameResult.name,
   }
 }
 

From 78a5adf0b56d272457ee03fe6be0c3aba2efe372 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Wed, 17 Apr 2024 19:17:56 +0200
Subject: [PATCH 06/32] Fix hidden unit test

---
 .../src/domain/action/trackClickActions.spec.ts     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/rum-core/src/domain/action/trackClickActions.spec.ts b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
index fe4bea6734..97c0cc532e 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.spec.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
@@ -249,22 +249,19 @@ describe('trackClickActions', () => {
   })
 
   describe('with enablePrivacyForActionName true', () => {
-    it('get placeholder when defaultPrivacyLevel is mask without programmatically declared action name', () => {
+    it('does not track click actions when html override set hidden', () => {
       setupBuilder.withConfiguration({
-        defaultPrivacyLevel: DefaultPrivacyLevel.MASK,
         enablePrivacyForActionName: true,
       })
+      button.setAttribute('data-dd-privacy', 'hidden')
+
       const { clock } = setupBuilder.build()
       emulateClick({ activity: {} })
-      expect(findActionId()).not.toBeUndefined()
       clock.tick(EXPIRE_DELAY)
 
-      expect(events.length).toBe(1)
-      expect(events[0].name).toBe('Masked Element')
+      expect(events.length).toBe(0)
     })
-
-    it('get placeholder when html override is hidden', () => {
-      input.setAttribute('data-dd-privacy', 'hidden')
+    it('get placeholder when defaultPrivacyLevel is mask without programmatically declared action name', () => {
       setupBuilder.withConfiguration({
         defaultPrivacyLevel: DefaultPrivacyLevel.MASK,
         enablePrivacyForActionName: true,

From f4e1a286384ee98324192fce29c11a1a0c90e248 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Mon, 22 Apr 2024 14:00:57 +0200
Subject: [PATCH 07/32] Fix getActionName return type

---
 .../action/getActionNameFromElement.spec.ts   | 516 +++++++++---------
 .../domain/action/getActionNameFromElement.ts |  15 +-
 .../src/domain/action/trackClickActions.ts    |   7 +-
 3 files changed, 266 insertions(+), 272 deletions(-)

diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
index 5928dd74a8..cf73a24e3f 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
@@ -3,390 +3,382 @@ import { getActionNameFromElement } from './getActionNameFromElement'
 
 describe('getActionNameFromElement', () => {
   it('extracts the textual content of an element', () => {
-    expect(getActionNameFromElement(appendElement('<div>Foo <div>bar</div></div>'))).toBe('Foo bar')
+    const { name } = getActionNameFromElement(appendElement('<div>Foo <div>bar</div></div>'))
+    expect(name).toBe('Foo bar')
   })
 
   it('extracts the text of an input button', () => {
-    expect(getActionNameFromElement(appendElement('<input type="button" value="Click" />'))).toBe('Click')
+    const { name } = getActionNameFromElement(appendElement('<input type="button" value="Click" />'))
+    expect(name).toBe('Click')
   })
 
   it('extracts the alt text of an image', () => {
-    expect(getActionNameFromElement(appendElement('<img title="foo" alt="bar" />'))).toBe('bar')
+    const { name } = getActionNameFromElement(appendElement('<img title="foo" alt="bar" />'))
+    expect(name).toBe('bar')
   })
 
   it('extracts the title text of an image', () => {
-    expect(getActionNameFromElement(appendElement('<img title="foo" />'))).toBe('foo')
+    const { name } = getActionNameFromElement(appendElement('<img title="foo" />'))
+    expect(name).toBe('foo')
   })
 
   it('extracts the text of an aria-label attribute', () => {
-    expect(getActionNameFromElement(appendElement('<span aria-label="Foo" />'))).toBe('Foo')
+    const { name } = getActionNameFromElement(appendElement('<span aria-label="Foo" />'))
+    expect(name).toBe('Foo')
   })
 
   it('gets the parent element textual content if everything else fails', () => {
-    expect(getActionNameFromElement(appendElement('<div>Foo <img target /></div>'))).toBe('Foo')
+    const { name } = getActionNameFromElement(appendElement('<div>Foo <img target /></div>'))
+    expect(name).toBe('Foo')
   })
 
   it("doesn't get the value of a text input", () => {
-    expect(getActionNameFromElement(appendElement('<input type="text" value="foo" />'))).toBe('')
+    const { name } = getActionNameFromElement(appendElement('<input type="text" value="foo" />'))
+    expect(name).toBe('')
   })
 
   it("doesn't get the value of a password input", () => {
-    expect(getActionNameFromElement(appendElement('<input type="password" value="foo" />'))).toBe('')
+    const { name } = getActionNameFromElement(appendElement('<input type="password" value="foo" />'))
+    expect(name).toBe('')
   })
 
   it('limits the name length to a reasonable size', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(
-          '<div>Foooooooooooooooooo baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz</div>'
-        )
+    const { name } = getActionNameFromElement(
+      appendElement(
+        '<div>Foooooooooooooooooo baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz</div>'
       )
-    ).toBe('Foooooooooooooooooo baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa [...]')
+    )
+    expect(name).toBe(
+      'Foooooooooooooooooo baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa [...]'
+    )
   })
 
   it('normalize white spaces', () => {
-    expect(getActionNameFromElement(appendElement('<div>foo\tbar\n\n  baz</div>'))).toBe('foo bar baz')
+    const { name } = getActionNameFromElement(appendElement('<div>foo\tbar\n\n  baz</div>'))
+    expect(name).toBe('foo bar baz')
   })
 
   it('ignores the inline script textual content', () => {
-    expect(getActionNameFromElement(appendElement("<div><script>console.log('toto')</script>b</div>"))).toBe('b')
+    const { name } = getActionNameFromElement(appendElement("<div><script>console.log('toto')</script>b</div>"))
+    expect(name).toBe('b')
   })
 
   it('extracts text from SVG elements', () => {
-    expect(getActionNameFromElement(appendElement('<svg><text>foo  bar</text></svg>'))).toBe('foo bar')
+    const { name } = getActionNameFromElement(appendElement('<svg><text>foo  bar</text></svg>'))
+    expect(name).toBe('foo bar')
   })
 
   it('extracts text from an associated label', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <div>
-          <label for="toto">label text</label>
-          <div>ignored</div>
-          <input id="toto" target />
-        </div>
-      `)
-      )
-    ).toBe('label text')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <div>
+        <label for="toto">label text</label>
+        <div>ignored</div>
+        <input id="toto" target />
+      </div>
+    `)
+    )
+    expect(name).toBe('label text')
   })
 
   it('extracts text from a parent label', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <label>
-          foo
-          <div>
-            bar
-            <input target />
-          </div>
-        </label>
-      `)
-      )
-    ).toBe('foo bar')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <label>
+        foo
+        <div>
+          bar
+          <input target />
+        </div>
+      </label>
+    `)
+    )
+    expect(name).toBe('foo bar')
   })
 
   it('extracts text from the first OPTION element when clicking on a SELECT', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <select>
-          <option>foo</option>
-          <option>bar</option>
-        </select>
-      `)
-      )
-    ).toBe('foo')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <select>
+        <option>foo</option>
+        <option>bar</option>
+      </select>
+    `)
+    )
+    expect(name).toBe('foo')
   })
 
   it('extracts text from a aria-labelledby associated element', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <div>
-          <label id="toto">label text</label>
-          <div>ignored</div>
-          <input aria-labelledby="toto" target />
-        </div>
-      `)
-      )
-    ).toBe('label text')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <div>
+        <label id="toto">label text</label>
+        <div>ignored</div>
+        <input aria-labelledby="toto" target />
+      </div>
+    `)
+    )
+    expect(name).toBe('label text')
   })
 
   it('extracts text from multiple aria-labelledby associated elements', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <div>
-          <label id="toto1">label</label>
-          <div>ignored</div>
-          <input aria-labelledby="toto1 toto2" target />
-          <div>ignored</div>
-          <label id="toto2">text</label>
-        </div>
-      `)
-      )
-    ).toBe('label text')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <div>
+        <label id="toto1">label</label>
+        <div>ignored</div>
+        <input aria-labelledby="toto1 toto2" target />
+        <div>ignored</div>
+        <label id="toto2">text</label>
+      </div>
+    `)
+    )
+    expect(name).toBe('label text')
   })
 
   it('extracts text from a BUTTON element', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <div>
-          <div>ignored</div>
-          <button target>foo</button>
-        </div>
-      `)
-      )
-    ).toBe('foo')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <div>
+        <div>ignored</div>
+        <button target>foo</button>
+      </div>
+    `)
+    )
+    expect(name).toBe('foo')
   })
 
   it('extracts text from a role=button element', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <div>
-          <div>ignored</div>
-          <div role="button" target>foo</div>
-        </div>
-      `)
-      )
-    ).toBe('foo')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <div>
+        <div>ignored</div>
+        <div role="button" target>foo</div>
+      </div>
+    `)
+    )
+    expect(name).toBe('foo')
   })
 
   it('limits the recursion to the 10th parent', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <div>
-          <div>ignored</div>
-          <i><i><i><i><i><i><i><i><i><i>
-            <i target></i>
-          </i></i></i></i></i></i></i></i></i></i>
-        </div>
-      `)
-      )
-    ).toBe('')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <div>
+        <div>ignored</div>
+        <i><i><i><i><i><i><i><i><i><i>
+          <i target></i>
+        </i></i></i></i></i></i></i></i></i></i>
+      </div>
+    `)
+    )
+    expect(name).toBe('')
   })
 
   it('limits the recursion to the BODY element', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <div>ignored</div>
-        <i target></i>
-      `)
-      )
-    ).toBe('')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <div>ignored</div>
+      <i target></i>
+    `)
+    )
+    expect(name).toBe('')
   })
 
   it('limits the recursion to a FORM element', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <div>
-          <div>ignored</div>
-          <form>
-            <i target></i>
-          </form>
-        </div>
-      `)
-      )
-    ).toBe('')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <div>
+        <div>ignored</div>
+        <form>
+          <i target></i>
+        </form>
+      </div>
+    `)
+    )
+    expect(name).toBe('')
   })
 
   it('extracts the name from a parent FORM element', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <div>
-          <div>ignored</div>
-          <form title="foo">
-            <i target></i>
-          </form>
-        </div>
-      `)
-      )
-    ).toBe('foo')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <div>
+        <div>ignored</div>
+        <form title="foo">
+          <i target></i>
+        </form>
+      </div>
+    `)
+    )
+    expect(name).toBe('foo')
   })
 
   it('extracts the whole textual content of a button', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <button>
-          foo
-          <i target>bar</i>
-        </button>
-      `)
-      )
-    ).toBe('foo bar')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <button>
+        foo
+        <i target>bar</i>
+      </button>
+    `)
+    )
+    expect(name).toBe('foo bar')
   })
 
   it('ignores the textual content of contenteditable elements', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <div contenteditable>
-          <i target>ignored</i>
-          ignored
-        </div>
-      `)
-      )
-    ).toBe('')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <div contenteditable>
+        <i target>ignored</i>
+        ignored
+      </div>
+    `)
+    )
+    expect(name).toBe('')
   })
 
   it('extracts the name from attributes of contenteditable elements', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-        <div contenteditable>
-          <i aria-label="foo" target>ignored</i>
-          ignored
-        </div>
-      `)
-      )
-    ).toBe('foo')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+      <div contenteditable>
+        <i aria-label="foo" target>ignored</i>
+        ignored
+      </div>
+    `)
+    )
+    expect(name).toBe('foo')
   })
 
   it('computes an action name on SVG elements (IE does not support parentElement property on them)', () => {
-    expect(
-      getActionNameFromElement(
-        appendElement(`
-         <button>
-          foo <svg target></svg>
-         <button>
-      `)
-      )
-    ).toBe('foo')
+    const { name } = getActionNameFromElement(
+      appendElement(`
+       <button>
+        foo <svg target></svg>
+       <button>
+    `)
+    )
+    expect(name).toBe('foo')
   })
 
   describe('programmatically declared action name', () => {
     it('extracts the name from the data-dd-action-name attribute', () => {
-      expect(
-        getActionNameFromElement(
-          appendElement(`
-          <div data-dd-action-name="foo">ignored</div>
-        `)
-        )
-      ).toBe('foo')
+      const { name } = getActionNameFromElement(
+        appendElement(`
+        <div data-dd-action-name="foo">ignored</div>
+      `)
+      )
+      expect(name).toBe('foo')
     })
 
     it('considers any parent', () => {
-      const target = appendElement(`
+      const { name } = getActionNameFromElement(
+        appendElement(`
         <form data-dd-action-name="foo">
           <i><i><i><i><i><i><i><i><i><i><i><i>
             <span target>ignored</span>
           </i></i></i></i></i></i></i></i></i></i></i></i>
         </form>
       `)
-      expect(getActionNameFromElement(target)).toBe('foo')
+      )
+      expect(name).toBe('foo')
     })
 
     it('normalizes the value', () => {
-      expect(
-        getActionNameFromElement(
-          appendElement(`
-          <div data-dd-action-name="   foo  \t bar  ">ignored</div>
-        `)
-        )
-      ).toBe('foo bar')
+      const { name } = getActionNameFromElement(
+        appendElement(`
+        <div data-dd-action-name="   foo  \t bar  ">ignored</div>
+      `)
+      )
+      expect(name).toBe('foo bar')
     })
 
     it('fallback on an automatic strategy if the attribute is empty', () => {
-      expect(
-        getActionNameFromElement(
-          appendElement(`
-          <div data-dd-action-name="ignored">
-            <div data-dd-action-name="">
-              <span target>foo</span>
-            </div>
+      const { name } = getActionNameFromElement(
+        appendElement(`
+        <div data-dd-action-name="ignored">
+          <div data-dd-action-name="">
+            <span target>foo</span>
           </div>
-      `)
-        )
-      ).toBe('foo')
+        </div>
+    `)
+      )
+      expect(name).toBe('foo')
     })
 
     it('extracts the name from a user-configured attribute', () => {
-      expect(
-        getActionNameFromElement(
-          appendElement(`
-          <div data-test-id="foo">ignored</div>
-        `),
-          'data-test-id'
-        )
-      ).toBe('foo')
+      const { name } = getActionNameFromElement(
+        appendElement(`
+        <div data-test-id="foo">ignored</div>
+      `),
+        'data-test-id'
+      )
+      expect(name).toBe('foo')
     })
 
     it('favors data-dd-action-name over user-configured attribute', () => {
-      expect(
-        getActionNameFromElement(
-          appendElement(`
-          <div data-test-id="foo" data-dd-action-name="bar">ignored</div>
-        `),
-          'data-test-id'
-        )
-      ).toBe('bar')
+      const { name } = getActionNameFromElement(
+        appendElement(`
+        <div data-test-id="foo" data-dd-action-name="bar">ignored</div>
+      `),
+        'data-test-id'
+      )
+      expect(name).toBe('bar')
     })
 
     it('remove children with programmatic action name in textual content', () => {
-      expect(
-        getActionNameFromElement(appendElement('<div>Foo <div data-dd-action-name="custom action">bar<div></div>'))
-      ).toBe('Foo')
+      const { name } = getActionNameFromElement(
+        appendElement('<div>Foo <div data-dd-action-name="custom action">bar<div></div>')
+      )
+
+      expect(name).toBe('Foo')
     })
 
     it('remove children with programmatic action name in textual content based on the user-configured attribute', () => {
-      expect(
-        getActionNameFromElement(
-          appendElement('<div>Foo <div data-test-id="custom action">bar<div></div>'),
-          'data-test-id'
-        )
-      ).toBe('Foo')
+      const { name } = getActionNameFromElement(
+        appendElement('<div>Foo <div data-test-id="custom action">bar<div></div>'),
+        'data-test-id'
+      )
+      expect(name).toBe('Foo')
     })
   })
 
   describe('with privacyEnabledForActionName', () => {
+    const { name } = getActionNameFromElement(
+      appendElement(`
+        <div data-dd-action-name="foo">
+          <span target>ignored</span>
+        </div>
+  `),
+      undefined,
+      false
+    )
     it('extracts attribute text when privacyEnabledActionName is false', () => {
-      expect(
-        getActionNameFromElement(
-          appendElement(`
-            <div data-dd-action-name="foo">
-              <span target>ignored</span>
-            </div>
-      `),
-          undefined,
-          false
-        )
-      ).toBe('foo')
+      expect(name).toBe('foo')
     })
 
     it('extracts user defined attribute text when privacyEnabledActionName is false', () => {
-      expect(
-        getActionNameFromElement(
-          appendElement(`
-            <div data-test-id="foo">
-              <span target>ignored</span>
-            </div>
-      `),
-          'data-test-id',
-          false
-        )
-      ).toBe('foo')
+      const { name } = getActionNameFromElement(
+        appendElement(`
+          <div data-test-id="foo">
+            <span target>ignored</span>
+          </div>
+    `),
+        'data-test-id',
+        false
+      )
+      expect(name).toBe('foo')
     })
 
     it('extracts inner text when privacyEnabledActionName is false and attribute is empty', () => {
-      expect(
-        getActionNameFromElement(
-          appendElement(`
-            <div data-test-id="">
-              <span target>foo</span>
-            </div>
-      `),
-          'data-test-id',
-          false
-        )
-      ).toBe('foo')
+      const { name } = getActionNameFromElement(
+        appendElement(`
+          <div data-test-id="">
+            <span target>foo</span>
+          </div>
+    `),
+        'data-test-id',
+        false
+      )
+      expect(name).toBe('foo')
     })
 
     it('returns placeholder when privacyEnabledActionName is true and attribute is empty', () => {
diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
index bfd3b6303b..a1cc4f0e52 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
@@ -11,7 +11,7 @@ export function getActionNameFromElement(
   element: Element,
   userProgrammaticAttribute?: string,
   privacyEnabledForActionName?: boolean
-): { name: string; masked?: boolean } | string {
+): { name: string; masked?: boolean } {
   const definedActionNameFromElement =
     getActionNameFromElementProgrammatically(element, DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE) ||
     (userProgrammaticAttribute && getActionNameFromElementProgrammatically(element, userProgrammaticAttribute))
@@ -30,12 +30,13 @@ export function getActionNameFromElement(
   //   the element and a few parents, but it's likely that they won't succeed at all.
   // * if no name is found this way, use strategies returning less accurate names as a fallback.
   //   Those are much likely to succeed.
-  return (
-    definedActionNameFromElement ||
-    getActionNameFromElementForStrategies(element, userProgrammaticAttribute, priorityStrategies) ||
-    getActionNameFromElementForStrategies(element, userProgrammaticAttribute, fallbackStrategies) ||
-    ''
-  )
+  return {
+    name:
+      definedActionNameFromElement ||
+      getActionNameFromElementForStrategies(element, userProgrammaticAttribute, priorityStrategies) ||
+      getActionNameFromElementForStrategies(element, userProgrammaticAttribute, fallbackStrategies) ||
+      '',
+  }
 }
 
 function getActionNameFromElementProgrammatically(targetElement: Element, programmaticAttribute: string) {
diff --git a/packages/rum-core/src/domain/action/trackClickActions.ts b/packages/rum-core/src/domain/action/trackClickActions.ts
index a2b5c22589..eae3419bb0 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.ts
@@ -224,13 +224,14 @@ function computeClickActionBase(
   const privacyLevel = getNodePrivacyLevel(event.target, configuration.defaultPrivacyLevel)
 
   // When the node is set to hidden, we do not track click action
+  // Make sure everything has been done before return
   if (privacyLevel === NodePrivacyLevel.HIDDEN && configuration.enablePrivacyForActionName) {
     return
   }
 
   const privacyEnabledForActionName =
     privacyLevel === DefaultPrivacyLevel.MASK && configuration.enablePrivacyForActionName
-  const actionNameResult = getActionNameFromElement(
+  const { name: actionName, masked } = getActionNameFromElement(
     event.target,
     configuration.actionNameAttribute,
     privacyEnabledForActionName
@@ -244,13 +245,13 @@ function computeClickActionBase(
 
   return {
     type: ActionType.CLICK,
-    target: typeof actionNameResult === 'string' ? target : assign({ masked: actionNameResult.masked }, target),
+    target: masked ? assign({ masked }, target) : target,
     position: {
       // Use clientX and Y because for SVG element offsetX and Y are relatives to the <svg> element
       x: Math.round(event.clientX - rect.left),
       y: Math.round(event.clientY - rect.top),
     },
-    name: typeof actionNameResult === 'string' ? actionNameResult : actionNameResult.name,
+    name: actionName,
   }
 }
 

From be8341e45e3832402ba6194eb7d96ed06c5bb828 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Fri, 26 Apr 2024 10:27:24 +0200
Subject: [PATCH 08/32] Move privacy check earlier

---
 .../src/domain/action/trackClickActions.ts    | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/packages/rum-core/src/domain/action/trackClickActions.ts b/packages/rum-core/src/domain/action/trackClickActions.ts
index eae3419bb0..578be12701 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.ts
@@ -140,7 +140,21 @@ function processPointerDown(
   domMutationObservable: Observable<void>,
   pointerDownEvent: MouseEventOnElement
 ) {
-  const clickActionBase = computeClickActionBase(pointerDownEvent, configuration)
+  const privacyLevel = getNodePrivacyLevel(pointerDownEvent.target, configuration.defaultPrivacyLevel)
+
+  // When the node is set to hidden, we do not track click action
+  // Make sure everything has been done before return
+  if (privacyLevel === NodePrivacyLevel.HIDDEN && configuration.enablePrivacyForActionName) {
+    return { clickActionBase: undefined, hadActivityOnPointerDown: () => false }
+  }
+  const privacyEnabledForActionName =
+    privacyLevel === DefaultPrivacyLevel.MASK && configuration.enablePrivacyForActionName
+
+  const clickActionBase = computeClickActionBase(
+    pointerDownEvent,
+    privacyEnabledForActionName,
+    configuration.actionNameAttribute
+  )
 
   let hadActivityOnPointerDown = false
 
@@ -218,29 +232,21 @@ type ClickActionBase = Pick<ClickAction, 'type' | 'name' | 'target' | 'position'
 
 function computeClickActionBase(
   event: MouseEventOnElement,
-  configuration: RumConfiguration
+  privacyEnabledForActionName: boolean,
+  actionNameAttribute?: string
 ): ClickActionBase | undefined {
   const rect = event.target.getBoundingClientRect()
-  const privacyLevel = getNodePrivacyLevel(event.target, configuration.defaultPrivacyLevel)
-
-  // When the node is set to hidden, we do not track click action
-  // Make sure everything has been done before return
-  if (privacyLevel === NodePrivacyLevel.HIDDEN && configuration.enablePrivacyForActionName) {
-    return
-  }
 
-  const privacyEnabledForActionName =
-    privacyLevel === DefaultPrivacyLevel.MASK && configuration.enablePrivacyForActionName
   const { name: actionName, masked } = getActionNameFromElement(
     event.target,
-    configuration.actionNameAttribute,
+    actionNameAttribute,
     privacyEnabledForActionName
   )
 
   const target = {
     width: Math.round(rect.width),
     height: Math.round(rect.height),
-    selector: getSelectorFromElement(event.target, configuration.actionNameAttribute),
+    selector: getSelectorFromElement(event.target, actionNameAttribute),
   }
 
   return {

From 6d79c86208aad9ec29cf6cd4bb417ef29a0502c4 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Fri, 26 Apr 2024 11:46:54 +0200
Subject: [PATCH 09/32] Remove unnecessary check for clickActionBase

---
 .../src/domain/action/trackClickActions.ts    | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/packages/rum-core/src/domain/action/trackClickActions.ts b/packages/rum-core/src/domain/action/trackClickActions.ts
index 578be12701..850134d8fe 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.ts
@@ -82,26 +82,24 @@ export function trackClickActions(
   lifeCycle.subscribe(LifeCycleEventType.VIEW_ENDED, stopClickChain)
 
   const { stop: stopActionEventsListener } = listenActionEvents<{
-    clickActionBase: ClickActionBase | undefined
+    clickActionBase: ClickActionBase
     hadActivityOnPointerDown: () => boolean
   }>(configuration, {
     onPointerDown: (pointerDownEvent) =>
       processPointerDown(configuration, lifeCycle, domMutationObservable, pointerDownEvent),
     onPointerUp: ({ clickActionBase, hadActivityOnPointerDown }, startEvent, getUserActivity) => {
-      if (clickActionBase) {
-        startClickAction(
-          configuration,
-          lifeCycle,
-          domMutationObservable,
-          history,
-          stopObservable,
-          appendClickToClickChain,
-          clickActionBase,
-          startEvent,
-          getUserActivity,
-          hadActivityOnPointerDown
-        )
-      }
+      startClickAction(
+        configuration,
+        lifeCycle,
+        domMutationObservable,
+        history,
+        stopObservable,
+        appendClickToClickChain,
+        clickActionBase,
+        startEvent,
+        getUserActivity,
+        hadActivityOnPointerDown
+      )
     },
   })
 
@@ -145,7 +143,7 @@ function processPointerDown(
   // When the node is set to hidden, we do not track click action
   // Make sure everything has been done before return
   if (privacyLevel === NodePrivacyLevel.HIDDEN && configuration.enablePrivacyForActionName) {
-    return { clickActionBase: undefined, hadActivityOnPointerDown: () => false }
+    return undefined
   }
   const privacyEnabledForActionName =
     privacyLevel === DefaultPrivacyLevel.MASK && configuration.enablePrivacyForActionName
@@ -234,7 +232,7 @@ function computeClickActionBase(
   event: MouseEventOnElement,
   privacyEnabledForActionName: boolean,
   actionNameAttribute?: string
-): ClickActionBase | undefined {
+): ClickActionBase {
   const rect = event.target.getBoundingClientRect()
 
   const { name: actionName, masked } = getActionNameFromElement(

From e2d2c24c636d5afe9b9cb41921f175f5a4ccc838 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Mon, 29 Apr 2024 15:39:09 +0200
Subject: [PATCH 10/32] Add html attribute overide in fallback strategies

---
 .../action/getActionNameFromElement.spec.ts   | 90 ++++++++++++++++---
 .../domain/action/getActionNameFromElement.ts | 88 ++++++++++++------
 .../domain/action/trackClickActions.spec.ts   |  3 +-
 .../src/domain/action/trackClickActions.ts    | 23 +++--
 4 files changed, 152 insertions(+), 52 deletions(-)

diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
index cf73a24e3f..93ec0f24d5 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
@@ -309,6 +309,7 @@ describe('getActionNameFromElement', () => {
         appendElement(`
         <div data-test-id="foo">ignored</div>
       `),
+        undefined,
         'data-test-id'
       )
       expect(name).toBe('foo')
@@ -319,6 +320,7 @@ describe('getActionNameFromElement', () => {
         appendElement(`
         <div data-test-id="foo" data-dd-action-name="bar">ignored</div>
       `),
+        undefined,
         'data-test-id'
       )
       expect(name).toBe('bar')
@@ -335,6 +337,7 @@ describe('getActionNameFromElement', () => {
     it('remove children with programmatic action name in textual content based on the user-configured attribute', () => {
       const { name } = getActionNameFromElement(
         appendElement('<div>Foo <div data-test-id="custom action">bar<div></div>'),
+        undefined,
         'data-test-id'
       )
       expect(name).toBe('Foo')
@@ -348,7 +351,6 @@ describe('getActionNameFromElement', () => {
           <span target>ignored</span>
         </div>
   `),
-      undefined,
       false
     )
     it('extracts attribute text when privacyEnabledActionName is false', () => {
@@ -362,26 +364,26 @@ describe('getActionNameFromElement', () => {
             <span target>ignored</span>
           </div>
     `),
-        'data-test-id',
-        false
+        false,
+        'data-test-id'
       )
       expect(name).toBe('foo')
     })
 
-    it('extracts inner text when privacyEnabledActionName is false and attribute is empty', () => {
+    it('extracts inner text when privacyEnabledActionName is false and custom action name set to empty', () => {
       const { name } = getActionNameFromElement(
         appendElement(`
           <div data-test-id="">
             <span target>foo</span>
           </div>
     `),
-        'data-test-id',
-        false
+        false,
+        'data-test-id'
       )
       expect(name).toBe('foo')
     })
 
-    it('returns placeholder when privacyEnabledActionName is true and attribute is empty', () => {
+    it('returns placeholder when privacyEnabledActionName is true and custom action name set to empty', () => {
       expect(
         getActionNameFromElement(
           appendElement(`
@@ -389,8 +391,8 @@ describe('getActionNameFromElement', () => {
               <span target>foo</span>
             </div>
       `),
-          'data-test-id',
-          true
+          true,
+          'data-test-id'
         )
       ).toEqual({ name: 'Masked Element', masked: true })
     })
@@ -403,7 +405,6 @@ describe('getActionNameFromElement', () => {
               <span target>ignored</span>
             </div>
       `),
-          undefined,
           true
         )
       ).toEqual({ name: 'foo', masked: false })
@@ -417,10 +418,75 @@ describe('getActionNameFromElement', () => {
               <span target>ignored</span>
             </div>
       `),
-          'data-test-id',
-          true
+          true,
+          'data-test-id'
         )
       ).toEqual({ name: 'foo', masked: false })
     })
+
+    describe('with html tag privacy override', () => {
+      it('extracts inner text when privacyEnabledActionName is true and privacy level is allow', () => {
+        expect(
+          getActionNameFromElement(
+            appendElement(`
+              <div data-dd-privacy="allow">
+                <span target>foo</span>
+              </div>
+        `),
+            true
+          )
+        ).toEqual({ name: 'foo', masked: false })
+      })
+
+      it('returns placeholder when privacyEnabledActionName is true and privacy level is mask', () => {
+        expect(
+          getActionNameFromElement(
+            appendElement(`
+              <div data-dd-privacy="mask">
+                <span target>foo</span>
+              </div>
+        `),
+            true
+          )
+        ).toEqual({ name: 'Masked Element', masked: true })
+      })
+
+      it('inherent privacy level and does not fallback to masked child text when privacyEnabledActionName is true', () => {
+        expect(
+          getActionNameFromElement(
+            appendElement(`
+              <div data-dd-privacy="allow">
+                bar
+                <div target>
+                  foo
+                  <div data-dd-privacy="mask">
+                    <span>secret</span>
+                  </div>
+                </div>
+              </div>
+        `),
+            true
+          )
+        ).toEqual({ name: 'foo', masked: false })
+      })
+    })
+    it('fallback to children but not the masked one when privacyEnabledActionName is true', () => {
+      expect(
+        getActionNameFromElement(
+          appendElement(`
+            <div data-dd-privacy="allow" target>
+              bar
+              <div>
+                foo
+                <div data-dd-privacy="mask">
+                  <span>secret</span>
+                </div>
+              </div>
+            </div>
+      `),
+          true
+        )
+      ).toEqual({ name: 'bar foo', masked: false })
+    })
   })
 })
diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
index a1cc4f0e52..5aca98dc8e 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
@@ -1,5 +1,7 @@
 import { safeTruncate, isIE, find } from '@datadog/browser-core'
 import { getParentElement } from '../../browser/polyfills'
+import { NodePrivacyLevel, PRIVACY_ATTR_NAME } from '../../constants'
+import { getNodePrivacyLevel } from '../privacy'
 
 /**
  * Get the action name from the attribute 'data-dd-action-name' on the element or any of its parent.
@@ -9,33 +11,53 @@ export const DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE = 'data-dd-action-name'
 export const ACTION_NAME_PLACEHOLDER = 'Masked Element'
 export function getActionNameFromElement(
   element: Element,
-  userProgrammaticAttribute?: string,
-  privacyEnabledForActionName?: boolean
+  privacyEnabledForActionName?: boolean,
+  userProgrammaticAttribute?: string
 ): { name: string; masked?: boolean } {
-  const definedActionNameFromElement =
-    getActionNameFromElementProgrammatically(element, DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE) ||
-    (userProgrammaticAttribute && getActionNameFromElementProgrammatically(element, userProgrammaticAttribute))
-  // Only get the defined action name if
-  // * privacy is enabled for action name
-  // * and privacy is enabled for the Node or globally
-  if (privacyEnabledForActionName) {
-    return {
-      name: definedActionNameFromElement || ACTION_NAME_PLACEHOLDER,
-      masked: definedActionNameFromElement ? false : true,
-    }
-  }
+  // to determine if we should add placeholder
+
+  // console.log(element, privacyEnabledForActionName, getNodeSelfPrivacyLevel(element))
+  const executeStrategies = (): string | undefined =>
+    getActionNameFromElementForStrategies(
+      element,
+      userProgrammaticAttribute,
+      priorityStrategies,
+      privacyEnabledForActionName
+    ) ||
+    getActionNameFromElementForStrategies(
+      element,
+      userProgrammaticAttribute,
+      fallbackStrategies,
+      privacyEnabledForActionName
+    )
+
+  // get the privacy level from current or parent html attribute override
+  // If privacy is not enabled for action name, we assume the default is allowed
+  // to be consistent with current behaviors.
+  const selfPrivacyLevel = getNodePrivacyLevel(
+    element,
+    privacyEnabledForActionName ? NodePrivacyLevel.MASK : NodePrivacyLevel.ALLOW
+  )
+
   // Proceed to get the action name in two steps:
   // * first, get the name programmatically, explicitly defined by the user.
   // * then, use strategies that are known to return good results. Those strategies will be used on
   //   the element and a few parents, but it's likely that they won't succeed at all.
   // * if no name is found this way, use strategies returning less accurate names as a fallback.
   //   Those are much likely to succeed.
+  const definedActionNameFromElement =
+    getActionNameFromElementProgrammatically(element, DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE) ||
+    (userProgrammaticAttribute && getActionNameFromElementProgrammatically(element, userProgrammaticAttribute)) ||
+    // if the current node has privacy level mask, we don't execute fallback strategies
+    (selfPrivacyLevel && selfPrivacyLevel !== NodePrivacyLevel.MASK ? executeStrategies() : '')
+
+  // console.log(definedActionNameFromElement)
   return {
     name:
       definedActionNameFromElement ||
-      getActionNameFromElementForStrategies(element, userProgrammaticAttribute, priorityStrategies) ||
-      getActionNameFromElementForStrategies(element, userProgrammaticAttribute, fallbackStrategies) ||
+      (privacyEnabledForActionName ? ACTION_NAME_PLACEHOLDER : executeStrategies()) ||
       '',
+    masked: privacyEnabledForActionName && !definedActionNameFromElement,
   }
 }
 
@@ -67,12 +89,13 @@ function getActionNameFromElementProgrammatically(targetElement: Element, progra
 
 type NameStrategy = (
   element: Element | HTMLElement | HTMLInputElement | HTMLSelectElement,
-  userProgrammaticAttribute: string | undefined
+  userProgrammaticAttribute: string | undefined,
+  privacyEnabledActionName?: boolean
 ) => string | undefined | null
 
 const priorityStrategies: NameStrategy[] = [
   // associated LABEL text
-  (element, userProgrammaticAttribute) => {
+  (element, userProgrammaticAttribute, privacy) => {
     // IE does not support element.labels, so we fallback to a CSS selector based on the element id
     // instead
     if (supportsLabelProperty()) {
@@ -83,7 +106,7 @@ const priorityStrategies: NameStrategy[] = [
       const label =
         element.ownerDocument &&
         find(element.ownerDocument.querySelectorAll('label'), (label) => label.htmlFor === element.id)
-      return label && getTextualContent(label, userProgrammaticAttribute)
+      return label && getTextualContent(label, userProgrammaticAttribute, privacy)
     }
   },
   // INPUT button (and associated) value
@@ -97,21 +120,21 @@ const priorityStrategies: NameStrategy[] = [
     }
   },
   // BUTTON, LABEL or button-like element text
-  (element, userProgrammaticAttribute) => {
+  (element, userProgrammaticAttribute, privacyEnabledActionName) => {
     if (element.nodeName === 'BUTTON' || element.nodeName === 'LABEL' || element.getAttribute('role') === 'button') {
-      return getTextualContent(element, userProgrammaticAttribute)
+      return getTextualContent(element, userProgrammaticAttribute, privacyEnabledActionName)
     }
   },
   (element) => element.getAttribute('aria-label'),
   // associated element text designated by the aria-labelledby attribute
-  (element, userProgrammaticAttribute) => {
+  (element, userProgrammaticAttribute, privacyEnabledActionName) => {
     const labelledByAttribute = element.getAttribute('aria-labelledby')
     if (labelledByAttribute) {
       return labelledByAttribute
         .split(/\s+/)
         .map((id) => getElementById(element, id))
         .filter((label): label is HTMLElement => Boolean(label))
-        .map((element) => getTextualContent(element, userProgrammaticAttribute))
+        .map((element) => getTextualContent(element, userProgrammaticAttribute, privacyEnabledActionName))
         .join(' ')
     }
   },
@@ -128,7 +151,8 @@ const priorityStrategies: NameStrategy[] = [
 ]
 
 const fallbackStrategies: NameStrategy[] = [
-  (element, userProgrammaticAttribute) => getTextualContent(element, userProgrammaticAttribute),
+  (element, userProgrammaticAttribute, privacyEnabledActionName) =>
+    getTextualContent(element, userProgrammaticAttribute, privacyEnabledActionName),
 ]
 
 /**
@@ -139,7 +163,8 @@ const MAX_PARENTS_TO_CONSIDER = 10
 function getActionNameFromElementForStrategies(
   targetElement: Element,
   userProgrammaticAttribute: string | undefined,
-  strategies: NameStrategy[]
+  strategies: NameStrategy[],
+  privacyEnabledActionName?: boolean
 ) {
   let element: Element | null = targetElement
   let recursionCounter = 0
@@ -151,7 +176,7 @@ function getActionNameFromElementForStrategies(
     element.nodeName !== 'HEAD'
   ) {
     for (const strategy of strategies) {
-      const name = strategy(element, userProgrammaticAttribute)
+      const name = strategy(element, userProgrammaticAttribute, privacyEnabledActionName)
       if (typeof name === 'string') {
         const trimmedName = name.trim()
         if (trimmedName) {
@@ -183,7 +208,11 @@ function getElementById(refElement: Element, id: string) {
   return refElement.ownerDocument ? refElement.ownerDocument.getElementById(id) : null
 }
 
-function getTextualContent(element: Element | HTMLElement, userProgrammaticAttribute: string | undefined) {
+function getTextualContent(
+  element: Element | HTMLElement,
+  userProgrammaticAttribute: string | undefined,
+  privacyEnabledActionName?: boolean
+) {
   if ((element as HTMLElement).isContentEditable) {
     return
   }
@@ -217,6 +246,11 @@ function getTextualContent(element: Element | HTMLElement, userProgrammaticAttri
       removeTextFromElements(`[${userProgrammaticAttribute}]`)
     }
 
+    if (privacyEnabledActionName) {
+      // remove the text of elements with privacy override
+      removeTextFromElements(`[${PRIVACY_ATTR_NAME}=${NodePrivacyLevel.MASK}]`)
+    }
+
     return text
   }
 
diff --git a/packages/rum-core/src/domain/action/trackClickActions.spec.ts b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
index 97c0cc532e..892e90182d 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.spec.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
@@ -100,6 +100,7 @@ describe('trackClickActions', () => {
           selector: '#button',
           width: 100,
           height: 100,
+          masked: false,
         },
         position: { x: 50, y: 50 },
         events: [domEvent],
@@ -307,7 +308,7 @@ describe('trackClickActions', () => {
       expect(events[0].events?.length).toBe(3)
     })
 
-    it('aggregates frustrationTypes from all clicks', () => {
+    it('aggregates frustration Types from all clicks', () => {
       const { lifeCycle, clock } = setupBuilder.build()
 
       // Dead
diff --git a/packages/rum-core/src/domain/action/trackClickActions.ts b/packages/rum-core/src/domain/action/trackClickActions.ts
index 850134d8fe..ebc9369e00 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.ts
@@ -138,15 +138,15 @@ function processPointerDown(
   domMutationObservable: Observable<void>,
   pointerDownEvent: MouseEventOnElement
 ) {
-  const privacyLevel = getNodePrivacyLevel(pointerDownEvent.target, configuration.defaultPrivacyLevel)
+  const nodePrivacyLevel = getNodePrivacyLevel(pointerDownEvent.target, configuration.defaultPrivacyLevel)
 
   // When the node is set to hidden, we do not track click action
   // Make sure everything has been done before return
-  if (privacyLevel === NodePrivacyLevel.HIDDEN && configuration.enablePrivacyForActionName) {
+  if (nodePrivacyLevel === NodePrivacyLevel.HIDDEN && configuration.enablePrivacyForActionName) {
     return undefined
   }
   const privacyEnabledForActionName =
-    privacyLevel === DefaultPrivacyLevel.MASK && configuration.enablePrivacyForActionName
+    nodePrivacyLevel === NodePrivacyLevel.MASK && configuration.enablePrivacyForActionName
 
   const clickActionBase = computeClickActionBase(
     pointerDownEvent,
@@ -237,19 +237,18 @@ function computeClickActionBase(
 
   const { name: actionName, masked } = getActionNameFromElement(
     event.target,
-    actionNameAttribute,
-    privacyEnabledForActionName
+    privacyEnabledForActionName,
+    actionNameAttribute
   )
 
-  const target = {
-    width: Math.round(rect.width),
-    height: Math.round(rect.height),
-    selector: getSelectorFromElement(event.target, actionNameAttribute),
-  }
-
   return {
     type: ActionType.CLICK,
-    target: masked ? assign({ masked }, target) : target,
+    target: {
+      width: Math.round(rect.width),
+      height: Math.round(rect.height),
+      selector: getSelectorFromElement(event.target, actionNameAttribute),
+      masked,
+    },
     position: {
       // Use clientX and Y because for SVG element offsetX and Y are relatives to the <svg> element
       x: Math.round(event.clientX - rect.left),

From 31ee24b86373b48b740be8a16da3014dbeb3f3c4 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Mon, 29 Apr 2024 15:43:00 +0200
Subject: [PATCH 11/32] Make lint happy

---
 packages/rum-core/src/domain/action/trackClickActions.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/rum-core/src/domain/action/trackClickActions.ts b/packages/rum-core/src/domain/action/trackClickActions.ts
index ebc9369e00..7a90c81bb2 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.ts
@@ -11,7 +11,6 @@ import {
   clocksNow,
   ONE_SECOND,
   elapsed,
-  DefaultPrivacyLevel,
 } from '@datadog/browser-core'
 import type { FrustrationType } from '../../rawRumEvent.types'
 import { ActionType } from '../../rawRumEvent.types'

From 55a47670ee1ac7871f81af52495d75f6318333b7 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Tue, 30 Apr 2024 13:58:13 +0200
Subject: [PATCH 12/32] Handle IE non polyfilled svg element classlist

---
 packages/rum-core/src/domain/privacy.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/rum-core/src/domain/privacy.ts b/packages/rum-core/src/domain/privacy.ts
index c09bafe514..83e7a1f894 100644
--- a/packages/rum-core/src/domain/privacy.ts
+++ b/packages/rum-core/src/domain/privacy.ts
@@ -101,6 +101,12 @@ export function getNodeSelfPrivacyLevel(node: Node): NodePrivacyLevel | undefine
     }
   }
 
+  if (!node.classList) {
+    // SVGElement doesn't have classList in IE11
+    // We assume that SVGElement should be treated as ALLOW
+    return NodePrivacyLevel.ALLOW
+  }
+
   // Check HTML privacy attributes and classes
   if (privAttr === PRIVACY_ATTR_VALUE_HIDDEN || node.classList.contains(PRIVACY_CLASS_HIDDEN)) {
     return NodePrivacyLevel.HIDDEN

From c7de5b256597b6d6124d31563d107c3edb9aaa67 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Tue, 30 Apr 2024 17:10:40 +0200
Subject: [PATCH 13/32] Use polyfills for handling classlist contains

---
 packages/rum-core/src/browser/polyfills.ts |  8 ++++++++
 packages/rum-core/src/domain/privacy.ts    | 18 ++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/packages/rum-core/src/browser/polyfills.ts b/packages/rum-core/src/browser/polyfills.ts
index 6b9a7f79ee..b3fc39ef67 100644
--- a/packages/rum-core/src/browser/polyfills.ts
+++ b/packages/rum-core/src/browser/polyfills.ts
@@ -76,3 +76,11 @@ export function getClassList(element: Element): DOMTokenList | string[] {
   const classes = element.getAttribute('class')?.trim()
   return classes ? classes.split(/\s+/) : []
 }
+
+export function elementClasslistContains(element: Element, className: string): boolean {
+  const classList = getClassList(element)
+  if (classList instanceof DOMTokenList) {
+    return element.classList.contains(className)
+  }
+  return classList.includes(className)
+}
diff --git a/packages/rum-core/src/domain/privacy.ts b/packages/rum-core/src/domain/privacy.ts
index 83e7a1f894..138ecbf9a5 100644
--- a/packages/rum-core/src/domain/privacy.ts
+++ b/packages/rum-core/src/domain/privacy.ts
@@ -1,4 +1,5 @@
 import { isElementNode, getParentNode, isTextNode } from '../browser/htmlDomUtils'
+import { elementClasslistContains } from '../browser/polyfills'
 import {
   NodePrivacyLevel,
   PRIVACY_ATTR_NAME,
@@ -101,26 +102,23 @@ export function getNodeSelfPrivacyLevel(node: Node): NodePrivacyLevel | undefine
     }
   }
 
-  if (!node.classList) {
-    // SVGElement doesn't have classList in IE11
-    // We assume that SVGElement should be treated as ALLOW
-    return NodePrivacyLevel.ALLOW
-  }
-
   // Check HTML privacy attributes and classes
-  if (privAttr === PRIVACY_ATTR_VALUE_HIDDEN || node.classList.contains(PRIVACY_CLASS_HIDDEN)) {
+  if (privAttr === PRIVACY_ATTR_VALUE_HIDDEN || elementClasslistContains(node, PRIVACY_CLASS_HIDDEN)) {
     return NodePrivacyLevel.HIDDEN
   }
 
-  if (privAttr === PRIVACY_ATTR_VALUE_MASK || node.classList.contains(PRIVACY_CLASS_MASK)) {
+  if (privAttr === PRIVACY_ATTR_VALUE_MASK || elementClasslistContains(node, PRIVACY_CLASS_MASK)) {
     return NodePrivacyLevel.MASK
   }
 
-  if (privAttr === PRIVACY_ATTR_VALUE_MASK_USER_INPUT || node.classList.contains(PRIVACY_CLASS_MASK_USER_INPUT)) {
+  if (
+    privAttr === PRIVACY_ATTR_VALUE_MASK_USER_INPUT ||
+    elementClasslistContains(node, PRIVACY_CLASS_MASK_USER_INPUT)
+  ) {
     return NodePrivacyLevel.MASK_USER_INPUT
   }
 
-  if (privAttr === PRIVACY_ATTR_VALUE_ALLOW || node.classList.contains(PRIVACY_CLASS_ALLOW)) {
+  if (privAttr === PRIVACY_ATTR_VALUE_ALLOW || elementClasslistContains(node, PRIVACY_CLASS_ALLOW)) {
     return NodePrivacyLevel.ALLOW
   }
 

From 1114a4427c00ef6d409b3e7ab9e1a137e07fa029 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Tue, 30 Apr 2024 17:59:23 +0200
Subject: [PATCH 14/32] Fix polyfill

---
 packages/rum-core/src/browser/polyfills.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/rum-core/src/browser/polyfills.ts b/packages/rum-core/src/browser/polyfills.ts
index b3fc39ef67..6e391fd7dc 100644
--- a/packages/rum-core/src/browser/polyfills.ts
+++ b/packages/rum-core/src/browser/polyfills.ts
@@ -82,5 +82,9 @@ export function elementClasslistContains(element: Element, className: string): b
   if (classList instanceof DOMTokenList) {
     return element.classList.contains(className)
   }
-  return classList.includes(className)
+  for (let i = 0; i < classList.length; i += 1) {
+    if (classList[i] === className) {
+      return true
+    }
+  }
 }

From 520e573fa91b0cef28902dd643c85a61341c191f Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Tue, 30 Apr 2024 18:44:10 +0200
Subject: [PATCH 15/32] Fix bug

---
 packages/rum-core/src/browser/polyfills.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/rum-core/src/browser/polyfills.ts b/packages/rum-core/src/browser/polyfills.ts
index 6e391fd7dc..3983b582b9 100644
--- a/packages/rum-core/src/browser/polyfills.ts
+++ b/packages/rum-core/src/browser/polyfills.ts
@@ -87,4 +87,5 @@ export function elementClasslistContains(element: Element, className: string): b
       return true
     }
   }
+  return false
 }

From 6f9289511b2ad1d41cfdf2679d94556de32c9985 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Tue, 7 May 2024 13:51:11 +0200
Subject: [PATCH 16/32] Simplify logic and fix for comments

---
 packages/rum-core/src/browser/polyfills.ts    |  20 +--
 .../action/getActionNameFromElement.spec.ts   | 169 +++++++++++++-----
 .../domain/action/getActionNameFromElement.ts |  73 ++++----
 .../src/domain/action/trackClickActions.ts    |  36 ++--
 4 files changed, 180 insertions(+), 118 deletions(-)

diff --git a/packages/rum-core/src/browser/polyfills.ts b/packages/rum-core/src/browser/polyfills.ts
index 3983b582b9..54e81c83d7 100644
--- a/packages/rum-core/src/browser/polyfills.ts
+++ b/packages/rum-core/src/browser/polyfills.ts
@@ -1,3 +1,5 @@
+import { includes } from '@datadog/browser-core'
+
 // https://github.com/jquery/jquery/blob/a684e6ba836f7c553968d7d026ed7941e1a612d8/src/selector/escapeSelector.js
 export function cssEscape(str: string) {
   if (window.CSS && window.CSS.escape) {
@@ -50,17 +52,6 @@ export function getParentElement(node: Node): HTMLElement | null {
   return null
 }
 
-// let parentNode = node.parentNode
-// while (parentNode !== null && parentNode.nodeType !== Node.ELEMENT_NODE) {
-//   parentNode = node.parentNode
-// }
-
-// let parentNode = document.querySelector('span').parentNode
-// while (parentNode !== null && parentNode.nodeType !== Node.ELEMENT_NODE) {
-//   parentNode = node.parentNode
-// }
-// console.log(parentNode)
-
 /**
  * Return the classList of an element or an array of classes if classList is not supported
  *
@@ -82,10 +73,5 @@ export function elementClasslistContains(element: Element, className: string): b
   if (classList instanceof DOMTokenList) {
     return element.classList.contains(className)
   }
-  for (let i = 0; i < classList.length; i += 1) {
-    if (classList[i] === className) {
-      return true
-    }
-  }
-  return false
+  return includes(classList, className)
 }
diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
index 93ec0f24d5..822335b4a0 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
@@ -1,6 +1,10 @@
 import { appendElement } from '../../../test'
+import { NodePrivacyLevel } from '../../constants'
+import type { RumConfiguration } from '../configuration'
 import { getActionNameFromElement } from './getActionNameFromElement'
 
+const defaultConfiguration = {} as RumConfiguration
+
 describe('getActionNameFromElement', () => {
   it('extracts the textual content of an element', () => {
     const { name } = getActionNameFromElement(appendElement('<div>Foo <div>bar</div></div>'))
@@ -310,7 +314,10 @@ describe('getActionNameFromElement', () => {
         <div data-test-id="foo">ignored</div>
       `),
         undefined,
-        'data-test-id'
+        {
+          ...defaultConfiguration,
+          actionNameAttribute: 'data-test-id',
+        }
       )
       expect(name).toBe('foo')
     })
@@ -321,7 +328,10 @@ describe('getActionNameFromElement', () => {
         <div data-test-id="foo" data-dd-action-name="bar">ignored</div>
       `),
         undefined,
-        'data-test-id'
+        {
+          ...defaultConfiguration,
+          actionNameAttribute: 'data-test-id',
+        }
       )
       expect(name).toBe('bar')
     })
@@ -338,22 +348,25 @@ describe('getActionNameFromElement', () => {
       const { name } = getActionNameFromElement(
         appendElement('<div>Foo <div data-test-id="custom action">bar<div></div>'),
         undefined,
-        'data-test-id'
+        {
+          ...defaultConfiguration,
+          actionNameAttribute: 'data-test-id',
+        }
       )
       expect(name).toBe('Foo')
     })
   })
 
   describe('with privacyEnabledForActionName', () => {
-    const { name } = getActionNameFromElement(
-      appendElement(`
-        <div data-dd-action-name="foo">
-          <span target>ignored</span>
-        </div>
-  `),
-      false
-    )
     it('extracts attribute text when privacyEnabledActionName is false', () => {
+      const { name } = getActionNameFromElement(
+        appendElement(`
+          <div data-dd-action-name="foo">
+            <span target>ignored</span>
+          </div>
+    `),
+        NodePrivacyLevel.MASK
+      )
       expect(name).toBe('foo')
     })
 
@@ -364,8 +377,11 @@ describe('getActionNameFromElement', () => {
             <span target>ignored</span>
           </div>
     `),
-        false,
-        'data-test-id'
+        NodePrivacyLevel.MASK,
+        {
+          ...defaultConfiguration,
+          actionNameAttribute: 'data-test-id',
+        }
       )
       expect(name).toBe('foo')
     })
@@ -377,8 +393,11 @@ describe('getActionNameFromElement', () => {
             <span target>foo</span>
           </div>
     `),
-        false,
-        'data-test-id'
+        NodePrivacyLevel.ALLOW,
+        {
+          ...defaultConfiguration,
+          actionNameAttribute: 'data-test-id',
+        }
       )
       expect(name).toBe('foo')
     })
@@ -391,8 +410,12 @@ describe('getActionNameFromElement', () => {
               <span target>foo</span>
             </div>
       `),
-          true,
-          'data-test-id'
+          NodePrivacyLevel.MASK,
+          {
+            ...defaultConfiguration,
+            actionNameAttribute: 'data-test-id',
+            enablePrivacyForActionName: true,
+          }
         )
       ).toEqual({ name: 'Masked Element', masked: true })
     })
@@ -405,7 +428,7 @@ describe('getActionNameFromElement', () => {
               <span target>ignored</span>
             </div>
       `),
-          true
+          NodePrivacyLevel.ALLOW
         )
       ).toEqual({ name: 'foo', masked: false })
     })
@@ -418,14 +441,17 @@ describe('getActionNameFromElement', () => {
               <span target>ignored</span>
             </div>
       `),
-          true,
-          'data-test-id'
+          NodePrivacyLevel.ALLOW,
+          {
+            ...defaultConfiguration,
+            actionNameAttribute: 'data-test-id',
+          }
         )
       ).toEqual({ name: 'foo', masked: false })
     })
 
-    describe('with html tag privacy override', () => {
-      it('extracts inner text when privacyEnabledActionName is true and privacy level is allow', () => {
+    describe('with html tag privacy override when privacyEnabledActionName is true', () => {
+      it('extracts inner text when privacy level is allow', () => {
         expect(
           getActionNameFromElement(
             appendElement(`
@@ -433,12 +459,12 @@ describe('getActionNameFromElement', () => {
                 <span target>foo</span>
               </div>
         `),
-            true
+            NodePrivacyLevel.ALLOW
           )
         ).toEqual({ name: 'foo', masked: false })
       })
 
-      it('returns placeholder when privacyEnabledActionName is true and privacy level is mask', () => {
+      it('returns placeholder when privacy level is mask', () => {
         expect(
           getActionNameFromElement(
             appendElement(`
@@ -446,12 +472,16 @@ describe('getActionNameFromElement', () => {
                 <span target>foo</span>
               </div>
         `),
-            true
+            NodePrivacyLevel.MASK,
+            {
+              ...defaultConfiguration,
+              enablePrivacyForActionName: true,
+            }
           )
         ).toEqual({ name: 'Masked Element', masked: true })
       })
 
-      it('inherent privacy level and does not fallback to masked child text when privacyEnabledActionName is true', () => {
+      it('inherent privacy level and does not fallback to masked child text', () => {
         expect(
           getActionNameFromElement(
             appendElement(`
@@ -465,28 +495,81 @@ describe('getActionNameFromElement', () => {
                 </div>
               </div>
         `),
-            true
+            NodePrivacyLevel.ALLOW,
+            {
+              ...defaultConfiguration,
+              enablePrivacyForActionName: true,
+            }
           )
         ).toEqual({ name: 'foo', masked: false })
       })
-    })
-    it('fallback to children but not the masked one when privacyEnabledActionName is true', () => {
-      expect(
-        getActionNameFromElement(
-          appendElement(`
-            <div data-dd-privacy="allow" target>
-              bar
-              <div>
-                foo
-                <div data-dd-privacy="mask">
-                  <span>secret</span>
+      it('fallback to children but not the masked one with mixed class name and attribute', () => {
+        expect(
+          getActionNameFromElement(
+            appendElement(`
+              <div data-dd-privacy="allow" target>
+                bar
+                <div>
+                  foo
+                  <div data-dd-privacy="hidden">
+                    <span>secret</span>
+                  </div>
                 </div>
               </div>
-            </div>
-      `),
-          true
-        )
-      ).toEqual({ name: 'bar foo', masked: false })
+        `),
+            NodePrivacyLevel.ALLOW,
+            {
+              ...defaultConfiguration,
+              enablePrivacyForActionName: true,
+            }
+          )
+        ).toEqual({ name: 'bar foo', masked: false })
+      })
+
+      it('inherent privacy level and does not fallback to masked child text with mixed classname and attribute', () => {
+        expect(
+          getActionNameFromElement(
+            appendElement(`
+              <div class="dd-privacy-allow">
+                bar
+                <div target>
+                  foo
+                  <div data-dd-privacy="hidden">
+                    <span>secret</span>
+                  </div>
+                </div>
+              </div>
+        `),
+            NodePrivacyLevel.ALLOW,
+            {
+              ...defaultConfiguration,
+              enablePrivacyForActionName: true,
+            }
+          )
+        ).toEqual({ name: 'foo', masked: false })
+      })
+      it('fallback to children but not the masked one with class names', () => {
+        expect(
+          getActionNameFromElement(
+            appendElement(`
+              <div class="dd-privacy-allow" target>
+                bar
+                <div>
+                  foo
+                  <div class="dd-privacy-mask">
+                    <span>secret</span>
+                  </div>
+                </div>
+              </div>
+        `),
+            NodePrivacyLevel.ALLOW,
+            {
+              ...defaultConfiguration,
+              enablePrivacyForActionName: true,
+            }
+          )
+        ).toEqual({ name: 'bar foo', masked: false })
+      })
     })
   })
 })
diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
index 5aca98dc8e..50a0d116af 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
@@ -1,7 +1,7 @@
 import { safeTruncate, isIE, find } from '@datadog/browser-core'
 import { getParentElement } from '../../browser/polyfills'
-import { NodePrivacyLevel, PRIVACY_ATTR_NAME } from '../../constants'
-import { getNodePrivacyLevel } from '../privacy'
+import { NodePrivacyLevel, PRIVACY_ATTR_NAME, PRIVACY_CLASS_HIDDEN, PRIVACY_CLASS_MASK } from '../../constants'
+import type { RumConfiguration } from '../configuration'
 
 /**
  * Get the action name from the attribute 'data-dd-action-name' on the element or any of its parent.
@@ -11,53 +11,45 @@ export const DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE = 'data-dd-action-name'
 export const ACTION_NAME_PLACEHOLDER = 'Masked Element'
 export function getActionNameFromElement(
   element: Element,
-  privacyEnabledForActionName?: boolean,
-  userProgrammaticAttribute?: string
+  nodePrivacyLevel?: NodePrivacyLevel,
+  configuration?: RumConfiguration
 ): { name: string; masked?: boolean } {
-  // to determine if we should add placeholder
-
-  // console.log(element, privacyEnabledForActionName, getNodeSelfPrivacyLevel(element))
-  const executeStrategies = (): string | undefined =>
-    getActionNameFromElementForStrategies(
-      element,
-      userProgrammaticAttribute,
-      priorityStrategies,
-      privacyEnabledForActionName
-    ) ||
-    getActionNameFromElementForStrategies(
-      element,
-      userProgrammaticAttribute,
-      fallbackStrategies,
-      privacyEnabledForActionName
-    )
-
-  // get the privacy level from current or parent html attribute override
-  // If privacy is not enabled for action name, we assume the default is allowed
-  // to be consistent with current behaviors.
-  const selfPrivacyLevel = getNodePrivacyLevel(
-    element,
-    privacyEnabledForActionName ? NodePrivacyLevel.MASK : NodePrivacyLevel.ALLOW
-  )
-
+  const { enablePrivacyForActionName = undefined, actionNameAttribute: userProgrammaticAttribute = undefined } =
+    configuration || {}
   // Proceed to get the action name in two steps:
   // * first, get the name programmatically, explicitly defined by the user.
   // * then, use strategies that are known to return good results. Those strategies will be used on
   //   the element and a few parents, but it's likely that they won't succeed at all.
   // * if no name is found this way, use strategies returning less accurate names as a fallback.
   //   Those are much likely to succeed.
-  const definedActionNameFromElement =
+  const defaultActionName =
     getActionNameFromElementProgrammatically(element, DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE) ||
-    (userProgrammaticAttribute && getActionNameFromElementProgrammatically(element, userProgrammaticAttribute)) ||
-    // if the current node has privacy level mask, we don't execute fallback strategies
-    (selfPrivacyLevel && selfPrivacyLevel !== NodePrivacyLevel.MASK ? executeStrategies() : '')
+    (userProgrammaticAttribute && getActionNameFromElementProgrammatically(element, userProgrammaticAttribute))
+
+  if (nodePrivacyLevel === NodePrivacyLevel.MASK) {
+    return {
+      name: defaultActionName || ACTION_NAME_PLACEHOLDER,
+      masked: true,
+    }
+  }
 
-  // console.log(definedActionNameFromElement)
   return {
     name:
-      definedActionNameFromElement ||
-      (privacyEnabledForActionName ? ACTION_NAME_PLACEHOLDER : executeStrategies()) ||
+      defaultActionName ||
+      getActionNameFromElementForStrategies(
+        element,
+        userProgrammaticAttribute,
+        priorityStrategies,
+        enablePrivacyForActionName
+      ) ||
+      getActionNameFromElementForStrategies(
+        element,
+        userProgrammaticAttribute,
+        fallbackStrategies,
+        enablePrivacyForActionName
+      ) ||
       '',
-    masked: privacyEnabledForActionName && !definedActionNameFromElement,
+    masked: false,
   }
 }
 
@@ -248,7 +240,12 @@ function getTextualContent(
 
     if (privacyEnabledActionName) {
       // remove the text of elements with privacy override
-      removeTextFromElements(`[${PRIVACY_ATTR_NAME}=${NodePrivacyLevel.MASK}]`)
+      removeTextFromElements(
+        `[${PRIVACY_ATTR_NAME}=${NodePrivacyLevel.MASK}],
+        [${PRIVACY_ATTR_NAME}=${NodePrivacyLevel.HIDDEN}],
+        [class=${PRIVACY_CLASS_MASK}],
+        [class=${PRIVACY_CLASS_HIDDEN}]`
+      )
     }
 
     return text
diff --git a/packages/rum-core/src/domain/action/trackClickActions.ts b/packages/rum-core/src/domain/action/trackClickActions.ts
index 7a90c81bb2..cfce0bffaa 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.ts
@@ -137,21 +137,21 @@ function processPointerDown(
   domMutationObservable: Observable<void>,
   pointerDownEvent: MouseEventOnElement
 ) {
-  const nodePrivacyLevel = getNodePrivacyLevel(pointerDownEvent.target, configuration.defaultPrivacyLevel)
+  let nodePrivacyLevel: NodePrivacyLevel
 
-  // When the node is set to hidden, we do not track click action
-  // Make sure everything has been done before return
-  if (nodePrivacyLevel === NodePrivacyLevel.HIDDEN && configuration.enablePrivacyForActionName) {
-    return undefined
+  if (configuration.enablePrivacyForActionName) {
+    nodePrivacyLevel = getNodePrivacyLevel(pointerDownEvent.target, configuration.defaultPrivacyLevel)
+
+    // When the node is set to hidden, we do not track click action
+    // Make sure everything has been done before return
+    if (nodePrivacyLevel === NodePrivacyLevel.HIDDEN) {
+      return undefined
+    }
+  } else {
+    nodePrivacyLevel = NodePrivacyLevel.ALLOW
   }
-  const privacyEnabledForActionName =
-    nodePrivacyLevel === NodePrivacyLevel.MASK && configuration.enablePrivacyForActionName
 
-  const clickActionBase = computeClickActionBase(
-    pointerDownEvent,
-    privacyEnabledForActionName,
-    configuration.actionNameAttribute
-  )
+  const clickActionBase = computeClickActionBase(pointerDownEvent, nodePrivacyLevel, configuration)
 
   let hadActivityOnPointerDown = false
 
@@ -229,23 +229,19 @@ type ClickActionBase = Pick<ClickAction, 'type' | 'name' | 'target' | 'position'
 
 function computeClickActionBase(
   event: MouseEventOnElement,
-  privacyEnabledForActionName: boolean,
-  actionNameAttribute?: string
+  nodePrivacyLevel: NodePrivacyLevel,
+  configuration: RumConfiguration
 ): ClickActionBase {
   const rect = event.target.getBoundingClientRect()
 
-  const { name: actionName, masked } = getActionNameFromElement(
-    event.target,
-    privacyEnabledForActionName,
-    actionNameAttribute
-  )
+  const { name: actionName, masked } = getActionNameFromElement(event.target, nodePrivacyLevel, configuration)
 
   return {
     type: ActionType.CLICK,
     target: {
       width: Math.round(rect.width),
       height: Math.round(rect.height),
-      selector: getSelectorFromElement(event.target, actionNameAttribute),
+      selector: getSelectorFromElement(event.target, configuration.actionNameAttribute),
       masked,
     },
     position: {

From 577380919e774e3fd8bfd4c3984106e5f9c3a578 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Tue, 7 May 2024 18:12:32 +0200
Subject: [PATCH 17/32] Make config param requried for getActionName

---
 .../action/getActionNameFromElement.spec.ts   | 145 +++++++++++-------
 .../domain/action/getActionNameFromElement.ts |   6 +-
 .../src/domain/action/trackClickActions.ts    |   2 +-
 3 files changed, 92 insertions(+), 61 deletions(-)

diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
index 822335b4a0..c3edbd52eb 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
@@ -7,42 +7,48 @@ const defaultConfiguration = {} as RumConfiguration
 
 describe('getActionNameFromElement', () => {
   it('extracts the textual content of an element', () => {
-    const { name } = getActionNameFromElement(appendElement('<div>Foo <div>bar</div></div>'))
+    const { name } = getActionNameFromElement(appendElement('<div>Foo <div>bar</div></div>'), defaultConfiguration)
     expect(name).toBe('Foo bar')
   })
 
   it('extracts the text of an input button', () => {
-    const { name } = getActionNameFromElement(appendElement('<input type="button" value="Click" />'))
+    const { name } = getActionNameFromElement(
+      appendElement('<input type="button" value="Click" />'),
+      defaultConfiguration
+    )
     expect(name).toBe('Click')
   })
 
   it('extracts the alt text of an image', () => {
-    const { name } = getActionNameFromElement(appendElement('<img title="foo" alt="bar" />'))
+    const { name } = getActionNameFromElement(appendElement('<img title="foo" alt="bar" />'), defaultConfiguration)
     expect(name).toBe('bar')
   })
 
   it('extracts the title text of an image', () => {
-    const { name } = getActionNameFromElement(appendElement('<img title="foo" />'))
+    const { name } = getActionNameFromElement(appendElement('<img title="foo" />'), defaultConfiguration)
     expect(name).toBe('foo')
   })
 
   it('extracts the text of an aria-label attribute', () => {
-    const { name } = getActionNameFromElement(appendElement('<span aria-label="Foo" />'))
+    const { name } = getActionNameFromElement(appendElement('<span aria-label="Foo" />'), defaultConfiguration)
     expect(name).toBe('Foo')
   })
 
   it('gets the parent element textual content if everything else fails', () => {
-    const { name } = getActionNameFromElement(appendElement('<div>Foo <img target /></div>'))
+    const { name } = getActionNameFromElement(appendElement('<div>Foo <img target /></div>'), defaultConfiguration)
     expect(name).toBe('Foo')
   })
 
   it("doesn't get the value of a text input", () => {
-    const { name } = getActionNameFromElement(appendElement('<input type="text" value="foo" />'))
+    const { name } = getActionNameFromElement(appendElement('<input type="text" value="foo" />'), defaultConfiguration)
     expect(name).toBe('')
   })
 
   it("doesn't get the value of a password input", () => {
-    const { name } = getActionNameFromElement(appendElement('<input type="password" value="foo" />'))
+    const { name } = getActionNameFromElement(
+      appendElement('<input type="password" value="foo" />'),
+      defaultConfiguration
+    )
     expect(name).toBe('')
   })
 
@@ -50,7 +56,8 @@ describe('getActionNameFromElement', () => {
     const { name } = getActionNameFromElement(
       appendElement(
         '<div>Foooooooooooooooooo baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz</div>'
-      )
+      ),
+      defaultConfiguration
     )
     expect(name).toBe(
       'Foooooooooooooooooo baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa [...]'
@@ -58,17 +65,20 @@ describe('getActionNameFromElement', () => {
   })
 
   it('normalize white spaces', () => {
-    const { name } = getActionNameFromElement(appendElement('<div>foo\tbar\n\n  baz</div>'))
+    const { name } = getActionNameFromElement(appendElement('<div>foo\tbar\n\n  baz</div>'), defaultConfiguration)
     expect(name).toBe('foo bar baz')
   })
 
   it('ignores the inline script textual content', () => {
-    const { name } = getActionNameFromElement(appendElement("<div><script>console.log('toto')</script>b</div>"))
+    const { name } = getActionNameFromElement(
+      appendElement("<div><script>console.log('toto')</script>b</div>"),
+      defaultConfiguration
+    )
     expect(name).toBe('b')
   })
 
   it('extracts text from SVG elements', () => {
-    const { name } = getActionNameFromElement(appendElement('<svg><text>foo  bar</text></svg>'))
+    const { name } = getActionNameFromElement(appendElement('<svg><text>foo  bar</text></svg>'), defaultConfiguration)
     expect(name).toBe('foo bar')
   })
 
@@ -80,7 +90,8 @@ describe('getActionNameFromElement', () => {
         <div>ignored</div>
         <input id="toto" target />
       </div>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('label text')
   })
@@ -95,7 +106,8 @@ describe('getActionNameFromElement', () => {
           <input target />
         </div>
       </label>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('foo bar')
   })
@@ -107,7 +119,8 @@ describe('getActionNameFromElement', () => {
         <option>foo</option>
         <option>bar</option>
       </select>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('foo')
   })
@@ -120,7 +133,8 @@ describe('getActionNameFromElement', () => {
         <div>ignored</div>
         <input aria-labelledby="toto" target />
       </div>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('label text')
   })
@@ -135,7 +149,8 @@ describe('getActionNameFromElement', () => {
         <div>ignored</div>
         <label id="toto2">text</label>
       </div>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('label text')
   })
@@ -147,7 +162,8 @@ describe('getActionNameFromElement', () => {
         <div>ignored</div>
         <button target>foo</button>
       </div>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('foo')
   })
@@ -159,7 +175,8 @@ describe('getActionNameFromElement', () => {
         <div>ignored</div>
         <div role="button" target>foo</div>
       </div>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('foo')
   })
@@ -173,7 +190,8 @@ describe('getActionNameFromElement', () => {
           <i target></i>
         </i></i></i></i></i></i></i></i></i></i>
       </div>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('')
   })
@@ -183,7 +201,8 @@ describe('getActionNameFromElement', () => {
       appendElement(`
       <div>ignored</div>
       <i target></i>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('')
   })
@@ -197,7 +216,8 @@ describe('getActionNameFromElement', () => {
           <i target></i>
         </form>
       </div>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('')
   })
@@ -211,7 +231,8 @@ describe('getActionNameFromElement', () => {
           <i target></i>
         </form>
       </div>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('foo')
   })
@@ -223,7 +244,8 @@ describe('getActionNameFromElement', () => {
         foo
         <i target>bar</i>
       </button>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('foo bar')
   })
@@ -235,7 +257,8 @@ describe('getActionNameFromElement', () => {
         <i target>ignored</i>
         ignored
       </div>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('')
   })
@@ -247,7 +270,8 @@ describe('getActionNameFromElement', () => {
         <i aria-label="foo" target>ignored</i>
         ignored
       </div>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('foo')
   })
@@ -258,7 +282,8 @@ describe('getActionNameFromElement', () => {
        <button>
         foo <svg target></svg>
        <button>
-    `)
+    `),
+      defaultConfiguration
     )
     expect(name).toBe('foo')
   })
@@ -268,7 +293,8 @@ describe('getActionNameFromElement', () => {
       const { name } = getActionNameFromElement(
         appendElement(`
         <div data-dd-action-name="foo">ignored</div>
-      `)
+      `),
+        defaultConfiguration
       )
       expect(name).toBe('foo')
     })
@@ -281,7 +307,8 @@ describe('getActionNameFromElement', () => {
             <span target>ignored</span>
           </i></i></i></i></i></i></i></i></i></i></i></i>
         </form>
-      `)
+      `),
+        defaultConfiguration
       )
       expect(name).toBe('foo')
     })
@@ -290,7 +317,8 @@ describe('getActionNameFromElement', () => {
       const { name } = getActionNameFromElement(
         appendElement(`
         <div data-dd-action-name="   foo  \t bar  ">ignored</div>
-      `)
+      `),
+        defaultConfiguration
       )
       expect(name).toBe('foo bar')
     })
@@ -303,7 +331,8 @@ describe('getActionNameFromElement', () => {
             <span target>foo</span>
           </div>
         </div>
-    `)
+    `),
+        defaultConfiguration
       )
       expect(name).toBe('foo')
     })
@@ -313,11 +342,11 @@ describe('getActionNameFromElement', () => {
         appendElement(`
         <div data-test-id="foo">ignored</div>
       `),
-        undefined,
         {
           ...defaultConfiguration,
           actionNameAttribute: 'data-test-id',
-        }
+        },
+        undefined
       )
       expect(name).toBe('foo')
     })
@@ -327,18 +356,19 @@ describe('getActionNameFromElement', () => {
         appendElement(`
         <div data-test-id="foo" data-dd-action-name="bar">ignored</div>
       `),
-        undefined,
         {
           ...defaultConfiguration,
           actionNameAttribute: 'data-test-id',
-        }
+        },
+        undefined
       )
       expect(name).toBe('bar')
     })
 
     it('remove children with programmatic action name in textual content', () => {
       const { name } = getActionNameFromElement(
-        appendElement('<div>Foo <div data-dd-action-name="custom action">bar<div></div>')
+        appendElement('<div>Foo <div data-dd-action-name="custom action">bar<div></div>'),
+        defaultConfiguration
       )
 
       expect(name).toBe('Foo')
@@ -347,11 +377,11 @@ describe('getActionNameFromElement', () => {
     it('remove children with programmatic action name in textual content based on the user-configured attribute', () => {
       const { name } = getActionNameFromElement(
         appendElement('<div>Foo <div data-test-id="custom action">bar<div></div>'),
-        undefined,
         {
           ...defaultConfiguration,
           actionNameAttribute: 'data-test-id',
-        }
+        },
+        undefined
       )
       expect(name).toBe('Foo')
     })
@@ -365,6 +395,7 @@ describe('getActionNameFromElement', () => {
             <span target>ignored</span>
           </div>
     `),
+        defaultConfiguration,
         NodePrivacyLevel.MASK
       )
       expect(name).toBe('foo')
@@ -377,11 +408,11 @@ describe('getActionNameFromElement', () => {
             <span target>ignored</span>
           </div>
     `),
-        NodePrivacyLevel.MASK,
         {
           ...defaultConfiguration,
           actionNameAttribute: 'data-test-id',
-        }
+        },
+        NodePrivacyLevel.MASK
       )
       expect(name).toBe('foo')
     })
@@ -393,11 +424,11 @@ describe('getActionNameFromElement', () => {
             <span target>foo</span>
           </div>
     `),
-        NodePrivacyLevel.ALLOW,
         {
           ...defaultConfiguration,
           actionNameAttribute: 'data-test-id',
-        }
+        },
+        NodePrivacyLevel.ALLOW
       )
       expect(name).toBe('foo')
     })
@@ -410,12 +441,12 @@ describe('getActionNameFromElement', () => {
               <span target>foo</span>
             </div>
       `),
-          NodePrivacyLevel.MASK,
           {
             ...defaultConfiguration,
             actionNameAttribute: 'data-test-id',
             enablePrivacyForActionName: true,
-          }
+          },
+          NodePrivacyLevel.MASK
         )
       ).toEqual({ name: 'Masked Element', masked: true })
     })
@@ -428,6 +459,7 @@ describe('getActionNameFromElement', () => {
               <span target>ignored</span>
             </div>
       `),
+          defaultConfiguration,
           NodePrivacyLevel.ALLOW
         )
       ).toEqual({ name: 'foo', masked: false })
@@ -441,11 +473,11 @@ describe('getActionNameFromElement', () => {
               <span target>ignored</span>
             </div>
       `),
-          NodePrivacyLevel.ALLOW,
           {
             ...defaultConfiguration,
             actionNameAttribute: 'data-test-id',
-          }
+          },
+          NodePrivacyLevel.ALLOW
         )
       ).toEqual({ name: 'foo', masked: false })
     })
@@ -459,6 +491,7 @@ describe('getActionNameFromElement', () => {
                 <span target>foo</span>
               </div>
         `),
+            defaultConfiguration,
             NodePrivacyLevel.ALLOW
           )
         ).toEqual({ name: 'foo', masked: false })
@@ -472,11 +505,11 @@ describe('getActionNameFromElement', () => {
                 <span target>foo</span>
               </div>
         `),
-            NodePrivacyLevel.MASK,
             {
               ...defaultConfiguration,
               enablePrivacyForActionName: true,
-            }
+            },
+            NodePrivacyLevel.MASK
           )
         ).toEqual({ name: 'Masked Element', masked: true })
       })
@@ -495,11 +528,11 @@ describe('getActionNameFromElement', () => {
                 </div>
               </div>
         `),
-            NodePrivacyLevel.ALLOW,
             {
               ...defaultConfiguration,
               enablePrivacyForActionName: true,
-            }
+            },
+            NodePrivacyLevel.ALLOW
           )
         ).toEqual({ name: 'foo', masked: false })
       })
@@ -517,11 +550,11 @@ describe('getActionNameFromElement', () => {
                 </div>
               </div>
         `),
-            NodePrivacyLevel.ALLOW,
             {
               ...defaultConfiguration,
               enablePrivacyForActionName: true,
-            }
+            },
+            NodePrivacyLevel.ALLOW
           )
         ).toEqual({ name: 'bar foo', masked: false })
       })
@@ -540,11 +573,11 @@ describe('getActionNameFromElement', () => {
                 </div>
               </div>
         `),
-            NodePrivacyLevel.ALLOW,
             {
               ...defaultConfiguration,
               enablePrivacyForActionName: true,
-            }
+            },
+            NodePrivacyLevel.ALLOW
           )
         ).toEqual({ name: 'foo', masked: false })
       })
@@ -562,11 +595,11 @@ describe('getActionNameFromElement', () => {
                 </div>
               </div>
         `),
-            NodePrivacyLevel.ALLOW,
             {
               ...defaultConfiguration,
               enablePrivacyForActionName: true,
-            }
+            },
+            NodePrivacyLevel.ALLOW
           )
         ).toEqual({ name: 'bar foo', masked: false })
       })
diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
index 50a0d116af..bd91d32460 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
@@ -11,11 +11,9 @@ export const DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE = 'data-dd-action-name'
 export const ACTION_NAME_PLACEHOLDER = 'Masked Element'
 export function getActionNameFromElement(
   element: Element,
-  nodePrivacyLevel?: NodePrivacyLevel,
-  configuration?: RumConfiguration
+  { enablePrivacyForActionName, actionNameAttribute: userProgrammaticAttribute }: RumConfiguration,
+  nodePrivacyLevel?: NodePrivacyLevel
 ): { name: string; masked?: boolean } {
-  const { enablePrivacyForActionName = undefined, actionNameAttribute: userProgrammaticAttribute = undefined } =
-    configuration || {}
   // Proceed to get the action name in two steps:
   // * first, get the name programmatically, explicitly defined by the user.
   // * then, use strategies that are known to return good results. Those strategies will be used on
diff --git a/packages/rum-core/src/domain/action/trackClickActions.ts b/packages/rum-core/src/domain/action/trackClickActions.ts
index cfce0bffaa..2924d8a6dd 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.ts
@@ -234,7 +234,7 @@ function computeClickActionBase(
 ): ClickActionBase {
   const rect = event.target.getBoundingClientRect()
 
-  const { name: actionName, masked } = getActionNameFromElement(event.target, nodePrivacyLevel, configuration)
+  const { name: actionName, masked } = getActionNameFromElement(event.target, configuration, nodePrivacyLevel)
 
   return {
     type: ActionType.CLICK,

From 62e821f361c60463d48a2ac3b0fb9a5f6e0dc12f Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Wed, 15 May 2024 16:53:05 +0200
Subject: [PATCH 18/32] Simplify click base privacy logic

---
 .../src/domain/action/trackClickActions.ts       | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/rum-core/src/domain/action/trackClickActions.ts b/packages/rum-core/src/domain/action/trackClickActions.ts
index 2924d8a6dd..d2af73588e 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.ts
@@ -137,18 +137,12 @@ function processPointerDown(
   domMutationObservable: Observable<void>,
   pointerDownEvent: MouseEventOnElement
 ) {
-  let nodePrivacyLevel: NodePrivacyLevel
+  const nodePrivacyLevel = configuration.enablePrivacyForActionName
+    ? getNodePrivacyLevel(pointerDownEvent.target, configuration.defaultPrivacyLevel)
+    : NodePrivacyLevel.ALLOW
 
-  if (configuration.enablePrivacyForActionName) {
-    nodePrivacyLevel = getNodePrivacyLevel(pointerDownEvent.target, configuration.defaultPrivacyLevel)
-
-    // When the node is set to hidden, we do not track click action
-    // Make sure everything has been done before return
-    if (nodePrivacyLevel === NodePrivacyLevel.HIDDEN) {
-      return undefined
-    }
-  } else {
-    nodePrivacyLevel = NodePrivacyLevel.ALLOW
+  if (nodePrivacyLevel === NodePrivacyLevel.HIDDEN) {
+    return undefined
   }
 
   const clickActionBase = computeClickActionBase(pointerDownEvent, nodePrivacyLevel, configuration)

From 9a054d1b9653c7686582c029c127bf5924e7d14f Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Fri, 17 May 2024 10:38:39 +0200
Subject: [PATCH 19/32] Add Todo comment; Merge constants into privacy

---
 packages/rum-core/src/constants.ts            | 38 --------------
 .../action/getActionNameFromElement.spec.ts   |  2 +-
 .../domain/action/getActionNameFromElement.ts |  2 +-
 .../src/domain/action/trackClickActions.ts    |  5 +-
 packages/rum-core/src/domain/configuration.ts |  2 +-
 packages/rum-core/src/domain/privacy.spec.ts  |  7 ++-
 packages/rum-core/src/domain/privacy.ts       | 52 ++++++++++++++-----
 packages/rum-core/src/index.ts                |  1 -
 8 files changed, 48 insertions(+), 61 deletions(-)
 delete mode 100644 packages/rum-core/src/constants.ts

diff --git a/packages/rum-core/src/constants.ts b/packages/rum-core/src/constants.ts
deleted file mode 100644
index 41006097b9..0000000000
--- a/packages/rum-core/src/constants.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { DefaultPrivacyLevel } from '@datadog/browser-core'
-
-export const NodePrivacyLevel = {
-  IGNORE: 'ignore',
-  HIDDEN: 'hidden',
-  ALLOW: DefaultPrivacyLevel.ALLOW,
-  MASK: DefaultPrivacyLevel.MASK,
-  MASK_USER_INPUT: DefaultPrivacyLevel.MASK_USER_INPUT,
-} as const
-export type NodePrivacyLevel = (typeof NodePrivacyLevel)[keyof typeof NodePrivacyLevel]
-
-export const PRIVACY_ATTR_NAME = 'data-dd-privacy'
-
-// Privacy Attrs
-export const PRIVACY_ATTR_VALUE_ALLOW = 'allow'
-export const PRIVACY_ATTR_VALUE_MASK = 'mask'
-export const PRIVACY_ATTR_VALUE_MASK_USER_INPUT = 'mask-user-input'
-export const PRIVACY_ATTR_VALUE_HIDDEN = 'hidden'
-
-// Privacy Classes - not all customers can set plain HTML attributes, so support classes too
-export const PRIVACY_CLASS_ALLOW = 'dd-privacy-allow'
-export const PRIVACY_CLASS_MASK = 'dd-privacy-mask'
-export const PRIVACY_CLASS_MASK_USER_INPUT = 'dd-privacy-mask-user-input'
-export const PRIVACY_CLASS_HIDDEN = 'dd-privacy-hidden'
-
-// Private Replacement Templates
-export const CENSORED_STRING_MARK = '***'
-export const CENSORED_IMG_MARK = 'data:image/gif;base64,R0lGODlhAQABAIAAAMLCwgAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw=='
-
-export const FORM_PRIVATE_TAG_NAMES: { [tagName: string]: true } = {
-  INPUT: true,
-  OUTPUT: true,
-  TEXTAREA: true,
-  SELECT: true,
-  OPTION: true,
-  DATALIST: true,
-  OPTGROUP: true,
-}
diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
index c3edbd52eb..fad0cffaf8 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
@@ -1,5 +1,5 @@
 import { appendElement } from '../../../test'
-import { NodePrivacyLevel } from '../../constants'
+import { NodePrivacyLevel } from '../privacy'
 import type { RumConfiguration } from '../configuration'
 import { getActionNameFromElement } from './getActionNameFromElement'
 
diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
index bd91d32460..a79e39362f 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
@@ -1,6 +1,6 @@
 import { safeTruncate, isIE, find } from '@datadog/browser-core'
 import { getParentElement } from '../../browser/polyfills'
-import { NodePrivacyLevel, PRIVACY_ATTR_NAME, PRIVACY_CLASS_HIDDEN, PRIVACY_CLASS_MASK } from '../../constants'
+import { NodePrivacyLevel, PRIVACY_ATTR_NAME, PRIVACY_CLASS_HIDDEN, PRIVACY_CLASS_MASK } from '../privacy'
 import type { RumConfiguration } from '../configuration'
 
 /**
diff --git a/packages/rum-core/src/domain/action/trackClickActions.ts b/packages/rum-core/src/domain/action/trackClickActions.ts
index d2af73588e..b2a136efe2 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.ts
@@ -14,14 +14,13 @@ import {
 } from '@datadog/browser-core'
 import type { FrustrationType } from '../../rawRumEvent.types'
 import { ActionType } from '../../rawRumEvent.types'
-import { NodePrivacyLevel } from '../../constants'
-import type { RumConfiguration } from '../configuration'
 import type { LifeCycle } from '../lifeCycle'
 import { LifeCycleEventType } from '../lifeCycle'
 import { trackEventCounts } from '../trackEventCounts'
 import { PAGE_ACTIVITY_VALIDATION_DELAY, waitPageActivityEnd } from '../waitPageActivityEnd'
 import { getSelectorFromElement } from '../getSelectorFromElement'
-import { getNodePrivacyLevel } from '../privacy'
+import { getNodePrivacyLevel, NodePrivacyLevel } from '../privacy'
+import type { RumConfiguration } from '../configuration'
 import type { ClickChain } from './clickChain'
 import { createClickChain } from './clickChain'
 import { getActionNameFromElement } from './getActionNameFromElement'
diff --git a/packages/rum-core/src/domain/configuration.ts b/packages/rum-core/src/domain/configuration.ts
index 8bae3fcfc1..aa505f9fee 100644
--- a/packages/rum-core/src/domain/configuration.ts
+++ b/packages/rum-core/src/domain/configuration.ts
@@ -39,7 +39,7 @@ export interface RumInitConfiguration extends InitConfiguration {
   startSessionReplayRecordingManually?: boolean | undefined
 
   // action options
-  enablePrivacyForActionName?: boolean | undefined
+  enablePrivacyForActionName?: boolean | undefined // TODO next major: remove this option and make privacy for action name the default behavior
   trackUserInteractions?: boolean | undefined
   actionNameAttribute?: string | undefined
 
diff --git a/packages/rum-core/src/domain/privacy.spec.ts b/packages/rum-core/src/domain/privacy.spec.ts
index 37dcbd5067..2155388cf5 100644
--- a/packages/rum-core/src/domain/privacy.spec.ts
+++ b/packages/rum-core/src/domain/privacy.spec.ts
@@ -5,8 +5,11 @@ import {
   PRIVACY_ATTR_VALUE_HIDDEN,
   PRIVACY_ATTR_VALUE_MASK,
   PRIVACY_ATTR_VALUE_MASK_USER_INPUT,
-} from '../constants'
-import { getNodeSelfPrivacyLevel, reducePrivacyLevel, getNodePrivacyLevel, shouldMaskNode } from './privacy'
+  getNodeSelfPrivacyLevel,
+  reducePrivacyLevel,
+  getNodePrivacyLevel,
+  shouldMaskNode,
+} from './privacy'
 
 describe('getNodePrivacyLevel', () => {
   beforeEach(() => {
diff --git a/packages/rum-core/src/domain/privacy.ts b/packages/rum-core/src/domain/privacy.ts
index 138ecbf9a5..609c943f87 100644
--- a/packages/rum-core/src/domain/privacy.ts
+++ b/packages/rum-core/src/domain/privacy.ts
@@ -1,19 +1,43 @@
+import { DefaultPrivacyLevel } from '@datadog/browser-core'
 import { isElementNode, getParentNode, isTextNode } from '../browser/htmlDomUtils'
 import { elementClasslistContains } from '../browser/polyfills'
-import {
-  NodePrivacyLevel,
-  PRIVACY_ATTR_NAME,
-  PRIVACY_ATTR_VALUE_ALLOW,
-  PRIVACY_ATTR_VALUE_MASK,
-  PRIVACY_ATTR_VALUE_MASK_USER_INPUT,
-  PRIVACY_ATTR_VALUE_HIDDEN,
-  PRIVACY_CLASS_ALLOW,
-  PRIVACY_CLASS_MASK,
-  PRIVACY_CLASS_MASK_USER_INPUT,
-  PRIVACY_CLASS_HIDDEN,
-  FORM_PRIVATE_TAG_NAMES,
-  CENSORED_STRING_MARK,
-} from '../constants'
+
+export const NodePrivacyLevel = {
+  IGNORE: 'ignore',
+  HIDDEN: 'hidden',
+  ALLOW: DefaultPrivacyLevel.ALLOW,
+  MASK: DefaultPrivacyLevel.MASK,
+  MASK_USER_INPUT: DefaultPrivacyLevel.MASK_USER_INPUT,
+} as const
+export type NodePrivacyLevel = (typeof NodePrivacyLevel)[keyof typeof NodePrivacyLevel]
+
+export const PRIVACY_ATTR_NAME = 'data-dd-privacy'
+
+// Privacy Attrs
+export const PRIVACY_ATTR_VALUE_ALLOW = 'allow'
+export const PRIVACY_ATTR_VALUE_MASK = 'mask'
+export const PRIVACY_ATTR_VALUE_MASK_USER_INPUT = 'mask-user-input'
+export const PRIVACY_ATTR_VALUE_HIDDEN = 'hidden'
+
+// Privacy Classes - not all customers can set plain HTML attributes, so support classes too
+export const PRIVACY_CLASS_ALLOW = 'dd-privacy-allow'
+export const PRIVACY_CLASS_MASK = 'dd-privacy-mask'
+export const PRIVACY_CLASS_MASK_USER_INPUT = 'dd-privacy-mask-user-input'
+export const PRIVACY_CLASS_HIDDEN = 'dd-privacy-hidden'
+
+// Private Replacement Templates
+export const CENSORED_STRING_MARK = '***'
+export const CENSORED_IMG_MARK = 'data:image/gif;base64,R0lGODlhAQABAIAAAMLCwgAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw=='
+
+export const FORM_PRIVATE_TAG_NAMES: { [tagName: string]: true } = {
+  INPUT: true,
+  OUTPUT: true,
+  TEXTAREA: true,
+  SELECT: true,
+  OPTION: true,
+  DATALIST: true,
+  OPTGROUP: true,
+}
 
 const TEXT_MASKING_CHAR = 'x'
 
diff --git a/packages/rum-core/src/index.ts b/packages/rum-core/src/index.ts
index 7345b8f41a..62b1900ab6 100644
--- a/packages/rum-core/src/index.ts
+++ b/packages/rum-core/src/index.ts
@@ -36,5 +36,4 @@ export * from './browser/htmlDomUtils'
 export * from './browser/polyfills'
 export { getSessionReplayUrl } from './domain/getSessionReplayUrl'
 export { isLongDataUrl, sanitizeDataUrl, MAX_ATTRIBUTE_VALUE_CHAR_LENGTH } from './domain/resource/resourceUtils'
-export * from './constants'
 export * from './domain/privacy'

From 82036b1ee43eff8de7e0105701369aca4c0744dd Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Tue, 21 May 2024 15:11:04 +0200
Subject: [PATCH 20/32] Add check experimental feature flag in configuration

---
 packages/core/src/tools/experimentalFeatures.ts | 1 +
 packages/rum-core/src/domain/configuration.ts   | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/tools/experimentalFeatures.ts b/packages/core/src/tools/experimentalFeatures.ts
index b887a63dab..7d51100ad7 100644
--- a/packages/core/src/tools/experimentalFeatures.ts
+++ b/packages/core/src/tools/experimentalFeatures.ts
@@ -19,6 +19,7 @@ export enum ExperimentalFeature {
   DISABLE_REPLAY_INLINE_CSS = 'disable_replay_inline_css',
   WRITABLE_RESOURCE_GRAPHQL = 'writable_resource_graphql',
   TOLERANT_RESOURCE_TIMINGS = 'tolerant_resource_timings',
+  ENABLE_PRIVACY_FOR_ACTION_NAME = 'enable_privacy_for_action_name',
 }
 
 const enabledExperimentalFeatures: Set<ExperimentalFeature> = new Set()
diff --git a/packages/rum-core/src/domain/configuration.ts b/packages/rum-core/src/domain/configuration.ts
index aa505f9fee..618afb4f84 100644
--- a/packages/rum-core/src/domain/configuration.ts
+++ b/packages/rum-core/src/domain/configuration.ts
@@ -11,6 +11,8 @@ import {
   isPercentage,
   objectHasValue,
   validateAndBuildConfiguration,
+  isExperimentalFeatureEnabled,
+  ExperimentalFeature,
 } from '@datadog/browser-core'
 import type { RumEventDomainContext } from '../domainContext.types'
 import type { RumEvent } from '../rumEvent.types'
@@ -131,7 +133,10 @@ export function validateAndBuildRumConfiguration(
       defaultPrivacyLevel: objectHasValue(DefaultPrivacyLevel, initConfiguration.defaultPrivacyLevel)
         ? initConfiguration.defaultPrivacyLevel
         : DefaultPrivacyLevel.MASK,
-      enablePrivacyForActionName: initConfiguration.enablePrivacyForActionName ?? false,
+      enablePrivacyForActionName:
+        (isExperimentalFeatureEnabled(ExperimentalFeature.ENABLE_PRIVACY_FOR_ACTION_NAME) &&
+          initConfiguration.enablePrivacyForActionName) ??
+        false,
       customerDataTelemetrySampleRate: 1,
       traceContextInjection: objectHasValue(TraceContextInjection, initConfiguration.traceContextInjection)
         ? initConfiguration.traceContextInjection

From 4c2b100b2bf21dd2a4362e90692d2f3116d627db Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Thu, 30 May 2024 11:11:57 +0200
Subject: [PATCH 21/32] Masked should be false when there is custom name

---
 .../src/domain/action/getActionNameFromElement.ts      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
index a79e39362f..2f0489f73c 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
@@ -24,10 +24,18 @@ export function getActionNameFromElement(
     getActionNameFromElementProgrammatically(element, DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE) ||
     (userProgrammaticAttribute && getActionNameFromElementProgrammatically(element, userProgrammaticAttribute))
 
+  console.log(
+    'defaultActionName',
+    defaultActionName,
+    'userProgrammaticAttribute',
+    userProgrammaticAttribute,
+    'nodePrivacyLevel',
+    nodePrivacyLevel
+  )
   if (nodePrivacyLevel === NodePrivacyLevel.MASK) {
     return {
       name: defaultActionName || ACTION_NAME_PLACEHOLDER,
-      masked: true,
+      masked: defaultActionName ? false : true,
     }
   }
 

From 0453e4f2369c2210c5e60799b201f8195d535296 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Thu, 30 May 2024 17:13:30 +0200
Subject: [PATCH 22/32] Remove log

---
 .../src/domain/action/getActionNameFromElement.ts         | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
index 2f0489f73c..4589505dcc 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
@@ -24,14 +24,6 @@ export function getActionNameFromElement(
     getActionNameFromElementProgrammatically(element, DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE) ||
     (userProgrammaticAttribute && getActionNameFromElementProgrammatically(element, userProgrammaticAttribute))
 
-  console.log(
-    'defaultActionName',
-    defaultActionName,
-    'userProgrammaticAttribute',
-    userProgrammaticAttribute,
-    'nodePrivacyLevel',
-    nodePrivacyLevel
-  )
   if (nodePrivacyLevel === NodePrivacyLevel.MASK) {
     return {
       name: defaultActionName || ACTION_NAME_PLACEHOLDER,

From 24f18ac1d93dc0c988c0ce9999adf14e3c4a365c Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Mon, 3 Jun 2024 15:08:27 +0200
Subject: [PATCH 23/32] Remove additional field according to new updates

---
 .../action/getActionNameFromElement.spec.ts   | 100 ++++++++----------
 .../domain/action/getActionNameFromElement.ts |  41 ++++---
 .../domain/action/trackClickActions.spec.ts   |   1 -
 .../src/domain/action/trackClickActions.ts    |   5 +-
 4 files changed, 66 insertions(+), 81 deletions(-)

diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
index fad0cffaf8..53cdf4e750 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
@@ -7,53 +7,47 @@ const defaultConfiguration = {} as RumConfiguration
 
 describe('getActionNameFromElement', () => {
   it('extracts the textual content of an element', () => {
-    const { name } = getActionNameFromElement(appendElement('<div>Foo <div>bar</div></div>'), defaultConfiguration)
+    const name = getActionNameFromElement(appendElement('<div>Foo <div>bar</div></div>'), defaultConfiguration)
     expect(name).toBe('Foo bar')
   })
 
   it('extracts the text of an input button', () => {
-    const { name } = getActionNameFromElement(
-      appendElement('<input type="button" value="Click" />'),
-      defaultConfiguration
-    )
+    const name = getActionNameFromElement(appendElement('<input type="button" value="Click" />'), defaultConfiguration)
     expect(name).toBe('Click')
   })
 
   it('extracts the alt text of an image', () => {
-    const { name } = getActionNameFromElement(appendElement('<img title="foo" alt="bar" />'), defaultConfiguration)
+    const name = getActionNameFromElement(appendElement('<img title="foo" alt="bar" />'), defaultConfiguration)
     expect(name).toBe('bar')
   })
 
   it('extracts the title text of an image', () => {
-    const { name } = getActionNameFromElement(appendElement('<img title="foo" />'), defaultConfiguration)
+    const name = getActionNameFromElement(appendElement('<img title="foo" />'), defaultConfiguration)
     expect(name).toBe('foo')
   })
 
   it('extracts the text of an aria-label attribute', () => {
-    const { name } = getActionNameFromElement(appendElement('<span aria-label="Foo" />'), defaultConfiguration)
+    const name = getActionNameFromElement(appendElement('<span aria-label="Foo" />'), defaultConfiguration)
     expect(name).toBe('Foo')
   })
 
   it('gets the parent element textual content if everything else fails', () => {
-    const { name } = getActionNameFromElement(appendElement('<div>Foo <img target /></div>'), defaultConfiguration)
+    const name = getActionNameFromElement(appendElement('<div>Foo <img target /></div>'), defaultConfiguration)
     expect(name).toBe('Foo')
   })
 
   it("doesn't get the value of a text input", () => {
-    const { name } = getActionNameFromElement(appendElement('<input type="text" value="foo" />'), defaultConfiguration)
+    const name = getActionNameFromElement(appendElement('<input type="text" value="foo" />'), defaultConfiguration)
     expect(name).toBe('')
   })
 
   it("doesn't get the value of a password input", () => {
-    const { name } = getActionNameFromElement(
-      appendElement('<input type="password" value="foo" />'),
-      defaultConfiguration
-    )
+    const name = getActionNameFromElement(appendElement('<input type="password" value="foo" />'), defaultConfiguration)
     expect(name).toBe('')
   })
 
   it('limits the name length to a reasonable size', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(
         '<div>Foooooooooooooooooo baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaz</div>'
       ),
@@ -65,12 +59,12 @@ describe('getActionNameFromElement', () => {
   })
 
   it('normalize white spaces', () => {
-    const { name } = getActionNameFromElement(appendElement('<div>foo\tbar\n\n  baz</div>'), defaultConfiguration)
+    const name = getActionNameFromElement(appendElement('<div>foo\tbar\n\n  baz</div>'), defaultConfiguration)
     expect(name).toBe('foo bar baz')
   })
 
   it('ignores the inline script textual content', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement("<div><script>console.log('toto')</script>b</div>"),
       defaultConfiguration
     )
@@ -78,12 +72,12 @@ describe('getActionNameFromElement', () => {
   })
 
   it('extracts text from SVG elements', () => {
-    const { name } = getActionNameFromElement(appendElement('<svg><text>foo  bar</text></svg>'), defaultConfiguration)
+    const name = getActionNameFromElement(appendElement('<svg><text>foo  bar</text></svg>'), defaultConfiguration)
     expect(name).toBe('foo bar')
   })
 
   it('extracts text from an associated label', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <div>
         <label for="toto">label text</label>
@@ -97,7 +91,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('extracts text from a parent label', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <label>
         foo
@@ -113,7 +107,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('extracts text from the first OPTION element when clicking on a SELECT', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <select>
         <option>foo</option>
@@ -126,7 +120,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('extracts text from a aria-labelledby associated element', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <div>
         <label id="toto">label text</label>
@@ -140,7 +134,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('extracts text from multiple aria-labelledby associated elements', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <div>
         <label id="toto1">label</label>
@@ -156,7 +150,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('extracts text from a BUTTON element', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <div>
         <div>ignored</div>
@@ -169,7 +163,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('extracts text from a role=button element', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <div>
         <div>ignored</div>
@@ -182,7 +176,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('limits the recursion to the 10th parent', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <div>
         <div>ignored</div>
@@ -197,7 +191,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('limits the recursion to the BODY element', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <div>ignored</div>
       <i target></i>
@@ -208,7 +202,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('limits the recursion to a FORM element', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <div>
         <div>ignored</div>
@@ -223,7 +217,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('extracts the name from a parent FORM element', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <div>
         <div>ignored</div>
@@ -238,7 +232,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('extracts the whole textual content of a button', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <button>
         foo
@@ -251,7 +245,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('ignores the textual content of contenteditable elements', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <div contenteditable>
         <i target>ignored</i>
@@ -264,7 +258,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('extracts the name from attributes of contenteditable elements', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
       <div contenteditable>
         <i aria-label="foo" target>ignored</i>
@@ -277,7 +271,7 @@ describe('getActionNameFromElement', () => {
   })
 
   it('computes an action name on SVG elements (IE does not support parentElement property on them)', () => {
-    const { name } = getActionNameFromElement(
+    const name = getActionNameFromElement(
       appendElement(`
        <button>
         foo <svg target></svg>
@@ -290,7 +284,7 @@ describe('getActionNameFromElement', () => {
 
   describe('programmatically declared action name', () => {
     it('extracts the name from the data-dd-action-name attribute', () => {
-      const { name } = getActionNameFromElement(
+      const name = getActionNameFromElement(
         appendElement(`
         <div data-dd-action-name="foo">ignored</div>
       `),
@@ -300,7 +294,7 @@ describe('getActionNameFromElement', () => {
     })
 
     it('considers any parent', () => {
-      const { name } = getActionNameFromElement(
+      const name = getActionNameFromElement(
         appendElement(`
         <form data-dd-action-name="foo">
           <i><i><i><i><i><i><i><i><i><i><i><i>
@@ -314,7 +308,7 @@ describe('getActionNameFromElement', () => {
     })
 
     it('normalizes the value', () => {
-      const { name } = getActionNameFromElement(
+      const name = getActionNameFromElement(
         appendElement(`
         <div data-dd-action-name="   foo  \t bar  ">ignored</div>
       `),
@@ -324,7 +318,7 @@ describe('getActionNameFromElement', () => {
     })
 
     it('fallback on an automatic strategy if the attribute is empty', () => {
-      const { name } = getActionNameFromElement(
+      const name = getActionNameFromElement(
         appendElement(`
         <div data-dd-action-name="ignored">
           <div data-dd-action-name="">
@@ -338,7 +332,7 @@ describe('getActionNameFromElement', () => {
     })
 
     it('extracts the name from a user-configured attribute', () => {
-      const { name } = getActionNameFromElement(
+      const name = getActionNameFromElement(
         appendElement(`
         <div data-test-id="foo">ignored</div>
       `),
@@ -352,7 +346,7 @@ describe('getActionNameFromElement', () => {
     })
 
     it('favors data-dd-action-name over user-configured attribute', () => {
-      const { name } = getActionNameFromElement(
+      const name = getActionNameFromElement(
         appendElement(`
         <div data-test-id="foo" data-dd-action-name="bar">ignored</div>
       `),
@@ -366,7 +360,7 @@ describe('getActionNameFromElement', () => {
     })
 
     it('remove children with programmatic action name in textual content', () => {
-      const { name } = getActionNameFromElement(
+      const name = getActionNameFromElement(
         appendElement('<div>Foo <div data-dd-action-name="custom action">bar<div></div>'),
         defaultConfiguration
       )
@@ -375,7 +369,7 @@ describe('getActionNameFromElement', () => {
     })
 
     it('remove children with programmatic action name in textual content based on the user-configured attribute', () => {
-      const { name } = getActionNameFromElement(
+      const name = getActionNameFromElement(
         appendElement('<div>Foo <div data-test-id="custom action">bar<div></div>'),
         {
           ...defaultConfiguration,
@@ -389,7 +383,7 @@ describe('getActionNameFromElement', () => {
 
   describe('with privacyEnabledForActionName', () => {
     it('extracts attribute text when privacyEnabledActionName is false', () => {
-      const { name } = getActionNameFromElement(
+      const name = getActionNameFromElement(
         appendElement(`
           <div data-dd-action-name="foo">
             <span target>ignored</span>
@@ -402,7 +396,7 @@ describe('getActionNameFromElement', () => {
     })
 
     it('extracts user defined attribute text when privacyEnabledActionName is false', () => {
-      const { name } = getActionNameFromElement(
+      const name = getActionNameFromElement(
         appendElement(`
           <div data-test-id="foo">
             <span target>ignored</span>
@@ -418,7 +412,7 @@ describe('getActionNameFromElement', () => {
     })
 
     it('extracts inner text when privacyEnabledActionName is false and custom action name set to empty', () => {
-      const { name } = getActionNameFromElement(
+      const name = getActionNameFromElement(
         appendElement(`
           <div data-test-id="">
             <span target>foo</span>
@@ -448,7 +442,7 @@ describe('getActionNameFromElement', () => {
           },
           NodePrivacyLevel.MASK
         )
-      ).toEqual({ name: 'Masked Element', masked: true })
+      ).toEqual('Masked Element')
     })
 
     it('extracts default attribute text when privacyEnabledActionName is true', () => {
@@ -462,7 +456,7 @@ describe('getActionNameFromElement', () => {
           defaultConfiguration,
           NodePrivacyLevel.ALLOW
         )
-      ).toEqual({ name: 'foo', masked: false })
+      ).toEqual('foo')
     })
 
     it('extracts user defined attribute text when privacyEnabledActionName is true', () => {
@@ -479,7 +473,7 @@ describe('getActionNameFromElement', () => {
           },
           NodePrivacyLevel.ALLOW
         )
-      ).toEqual({ name: 'foo', masked: false })
+      ).toEqual('foo')
     })
 
     describe('with html tag privacy override when privacyEnabledActionName is true', () => {
@@ -494,7 +488,7 @@ describe('getActionNameFromElement', () => {
             defaultConfiguration,
             NodePrivacyLevel.ALLOW
           )
-        ).toEqual({ name: 'foo', masked: false })
+        ).toEqual('foo')
       })
 
       it('returns placeholder when privacy level is mask', () => {
@@ -511,7 +505,7 @@ describe('getActionNameFromElement', () => {
             },
             NodePrivacyLevel.MASK
           )
-        ).toEqual({ name: 'Masked Element', masked: true })
+        ).toEqual('Masked Element')
       })
 
       it('inherent privacy level and does not fallback to masked child text', () => {
@@ -534,7 +528,7 @@ describe('getActionNameFromElement', () => {
             },
             NodePrivacyLevel.ALLOW
           )
-        ).toEqual({ name: 'foo', masked: false })
+        ).toEqual('foo')
       })
       it('fallback to children but not the masked one with mixed class name and attribute', () => {
         expect(
@@ -556,7 +550,7 @@ describe('getActionNameFromElement', () => {
             },
             NodePrivacyLevel.ALLOW
           )
-        ).toEqual({ name: 'bar foo', masked: false })
+        ).toEqual('bar foo')
       })
 
       it('inherent privacy level and does not fallback to masked child text with mixed classname and attribute', () => {
@@ -579,7 +573,7 @@ describe('getActionNameFromElement', () => {
             },
             NodePrivacyLevel.ALLOW
           )
-        ).toEqual({ name: 'foo', masked: false })
+        ).toEqual('foo')
       })
       it('fallback to children but not the masked one with class names', () => {
         expect(
@@ -601,7 +595,7 @@ describe('getActionNameFromElement', () => {
             },
             NodePrivacyLevel.ALLOW
           )
-        ).toEqual({ name: 'bar foo', masked: false })
+        ).toEqual('bar foo')
       })
     })
   })
diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
index 4589505dcc..e87d00f185 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
@@ -13,7 +13,7 @@ export function getActionNameFromElement(
   element: Element,
   { enablePrivacyForActionName, actionNameAttribute: userProgrammaticAttribute }: RumConfiguration,
   nodePrivacyLevel?: NodePrivacyLevel
-): { name: string; masked?: boolean } {
+): string {
   // Proceed to get the action name in two steps:
   // * first, get the name programmatically, explicitly defined by the user.
   // * then, use strategies that are known to return good results. Those strategies will be used on
@@ -25,30 +25,25 @@ export function getActionNameFromElement(
     (userProgrammaticAttribute && getActionNameFromElementProgrammatically(element, userProgrammaticAttribute))
 
   if (nodePrivacyLevel === NodePrivacyLevel.MASK) {
-    return {
-      name: defaultActionName || ACTION_NAME_PLACEHOLDER,
-      masked: defaultActionName ? false : true,
-    }
+    return defaultActionName || ACTION_NAME_PLACEHOLDER
   }
 
-  return {
-    name:
-      defaultActionName ||
-      getActionNameFromElementForStrategies(
-        element,
-        userProgrammaticAttribute,
-        priorityStrategies,
-        enablePrivacyForActionName
-      ) ||
-      getActionNameFromElementForStrategies(
-        element,
-        userProgrammaticAttribute,
-        fallbackStrategies,
-        enablePrivacyForActionName
-      ) ||
-      '',
-    masked: false,
-  }
+  return (
+    defaultActionName ||
+    getActionNameFromElementForStrategies(
+      element,
+      userProgrammaticAttribute,
+      priorityStrategies,
+      enablePrivacyForActionName
+    ) ||
+    getActionNameFromElementForStrategies(
+      element,
+      userProgrammaticAttribute,
+      fallbackStrategies,
+      enablePrivacyForActionName
+    ) ||
+    ''
+  )
 }
 
 function getActionNameFromElementProgrammatically(targetElement: Element, programmaticAttribute: string) {
diff --git a/packages/rum-core/src/domain/action/trackClickActions.spec.ts b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
index 892e90182d..308a11afeb 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.spec.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
@@ -100,7 +100,6 @@ describe('trackClickActions', () => {
           selector: '#button',
           width: 100,
           height: 100,
-          masked: false,
         },
         position: { x: 50, y: 50 },
         events: [domEvent],
diff --git a/packages/rum-core/src/domain/action/trackClickActions.ts b/packages/rum-core/src/domain/action/trackClickActions.ts
index 34b23aed5c..7a9a2423c6 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.ts
@@ -226,22 +226,19 @@ function computeClickActionBase(
 ): ClickActionBase {
   const rect = event.target.getBoundingClientRect()
 
-  const { name: actionName, masked } = getActionNameFromElement(event.target, configuration, nodePrivacyLevel)
-
   return {
     type: ActionType.CLICK,
     target: {
       width: Math.round(rect.width),
       height: Math.round(rect.height),
       selector: getSelectorFromElement(event.target, configuration.actionNameAttribute),
-      masked,
     },
     position: {
       // Use clientX and Y because for SVG element offsetX and Y are relatives to the <svg> element
       x: Math.round(event.clientX - rect.left),
       y: Math.round(event.clientY - rect.top),
     },
-    name: actionName,
+    name: getActionNameFromElement(event.target, configuration, nodePrivacyLevel),
   }
 }
 

From 699d199e79048814ef9a0178416a914e07a16910 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Tue, 4 Jun 2024 11:46:48 +0200
Subject: [PATCH 24/32] Add function getPrivacySelector and replace polyfills

---
 packages/rum-core/src/browser/polyfills.ts    |  8 -------
 .../domain/action/getActionNameFromElement.ts |  7 ++----
 packages/rum-core/src/domain/privacy.ts       | 23 ++++++++-----------
 packages/rum/src/entries/internal.ts          |  2 +-
 4 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/packages/rum-core/src/browser/polyfills.ts b/packages/rum-core/src/browser/polyfills.ts
index 0f266b19dc..5618b416be 100644
--- a/packages/rum-core/src/browser/polyfills.ts
+++ b/packages/rum-core/src/browser/polyfills.ts
@@ -68,14 +68,6 @@ export function getClassList(element: Element): DOMTokenList | string[] {
   return classes ? classes.split(/\s+/) : []
 }
 
-export function elementClasslistContains(element: Element, className: string): boolean {
-  const classList = getClassList(element)
-  if (classList instanceof DOMTokenList) {
-    return element.classList.contains(className)
-  }
-  return includes(classList, className)
-}
-
 // ie11 supports WeakMap but not WeakSet
 const PLACEHOLDER = 1
 export class WeakSet<T extends object> {
diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
index e87d00f185..e3e9b5ed7d 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.ts
@@ -1,6 +1,6 @@
 import { safeTruncate, isIE, find } from '@datadog/browser-core'
 import { getParentElement } from '../../browser/polyfills'
-import { NodePrivacyLevel, PRIVACY_ATTR_NAME, PRIVACY_CLASS_HIDDEN, PRIVACY_CLASS_MASK } from '../privacy'
+import { NodePrivacyLevel, getPrivacySelector } from '../privacy'
 import type { RumConfiguration } from '../configuration'
 
 /**
@@ -234,10 +234,7 @@ function getTextualContent(
     if (privacyEnabledActionName) {
       // remove the text of elements with privacy override
       removeTextFromElements(
-        `[${PRIVACY_ATTR_NAME}=${NodePrivacyLevel.MASK}],
-        [${PRIVACY_ATTR_NAME}=${NodePrivacyLevel.HIDDEN}],
-        [class=${PRIVACY_CLASS_MASK}],
-        [class=${PRIVACY_CLASS_HIDDEN}]`
+        `${getPrivacySelector(NodePrivacyLevel.HIDDEN)}, ${getPrivacySelector(NodePrivacyLevel.MASK)}`
       )
     }
 
diff --git a/packages/rum-core/src/domain/privacy.ts b/packages/rum-core/src/domain/privacy.ts
index 609c943f87..2cbac65fd3 100644
--- a/packages/rum-core/src/domain/privacy.ts
+++ b/packages/rum-core/src/domain/privacy.ts
@@ -1,6 +1,5 @@
 import { DefaultPrivacyLevel } from '@datadog/browser-core'
 import { isElementNode, getParentNode, isTextNode } from '../browser/htmlDomUtils'
-import { elementClasslistContains } from '../browser/polyfills'
 
 export const NodePrivacyLevel = {
   IGNORE: 'ignore',
@@ -20,10 +19,7 @@ export const PRIVACY_ATTR_VALUE_MASK_USER_INPUT = 'mask-user-input'
 export const PRIVACY_ATTR_VALUE_HIDDEN = 'hidden'
 
 // Privacy Classes - not all customers can set plain HTML attributes, so support classes too
-export const PRIVACY_CLASS_ALLOW = 'dd-privacy-allow'
-export const PRIVACY_CLASS_MASK = 'dd-privacy-mask'
-export const PRIVACY_CLASS_MASK_USER_INPUT = 'dd-privacy-mask-user-input'
-export const PRIVACY_CLASS_HIDDEN = 'dd-privacy-hidden'
+export const PRIVACY_CLASS_PREFIX = 'dd-privacy-'
 
 // Private Replacement Templates
 export const CENSORED_STRING_MARK = '***'
@@ -103,8 +99,6 @@ export function getNodeSelfPrivacyLevel(node: Node): NodePrivacyLevel | undefine
     return
   }
 
-  const privAttr = node.getAttribute(PRIVACY_ATTR_NAME)
-
   // Overrules for replay purpose
   if (node.tagName === 'BASE') {
     return NodePrivacyLevel.ALLOW
@@ -127,22 +121,19 @@ export function getNodeSelfPrivacyLevel(node: Node): NodePrivacyLevel | undefine
   }
 
   // Check HTML privacy attributes and classes
-  if (privAttr === PRIVACY_ATTR_VALUE_HIDDEN || elementClasslistContains(node, PRIVACY_CLASS_HIDDEN)) {
+  if (node.matches(getPrivacySelector(NodePrivacyLevel.HIDDEN))) {
     return NodePrivacyLevel.HIDDEN
   }
 
-  if (privAttr === PRIVACY_ATTR_VALUE_MASK || elementClasslistContains(node, PRIVACY_CLASS_MASK)) {
+  if (node.matches(getPrivacySelector(NodePrivacyLevel.MASK))) {
     return NodePrivacyLevel.MASK
   }
 
-  if (
-    privAttr === PRIVACY_ATTR_VALUE_MASK_USER_INPUT ||
-    elementClasslistContains(node, PRIVACY_CLASS_MASK_USER_INPUT)
-  ) {
+  if (node.matches(getPrivacySelector(NodePrivacyLevel.MASK_USER_INPUT))) {
     return NodePrivacyLevel.MASK_USER_INPUT
   }
 
-  if (privAttr === PRIVACY_ATTR_VALUE_ALLOW || elementClasslistContains(node, PRIVACY_CLASS_ALLOW)) {
+  if (node.matches(getPrivacySelector(NodePrivacyLevel.ALLOW))) {
     return NodePrivacyLevel.ALLOW
   }
 
@@ -314,3 +305,7 @@ export function shouldIgnoreElement(element: Element): boolean {
 
   return false
 }
+
+export function getPrivacySelector(privacyLevel: string) {
+  return `[${PRIVACY_ATTR_NAME}="${privacyLevel}"], .${PRIVACY_CLASS_PREFIX}${privacyLevel}`
+}
diff --git a/packages/rum/src/entries/internal.ts b/packages/rum/src/entries/internal.ts
index b93d97641c..93eb81d565 100644
--- a/packages/rum/src/entries/internal.ts
+++ b/packages/rum/src/entries/internal.ts
@@ -9,7 +9,7 @@ export type { TimeStamp } from '@datadog/browser-core'
 export {
   PRIVACY_ATTR_NAME,
   PRIVACY_ATTR_VALUE_HIDDEN,
-  PRIVACY_CLASS_HIDDEN,
+  PRIVACY_CLASS_PREFIX,
   NodePrivacyLevel,
 } from '@datadog/browser-rum-core'
 

From 897ab13a5eef591c2a4265a77812c189732573e8 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Tue, 4 Jun 2024 11:52:54 +0200
Subject: [PATCH 25/32] Remove unused import

---
 packages/rum-core/src/browser/polyfills.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/rum-core/src/browser/polyfills.ts b/packages/rum-core/src/browser/polyfills.ts
index 5618b416be..31f32ee803 100644
--- a/packages/rum-core/src/browser/polyfills.ts
+++ b/packages/rum-core/src/browser/polyfills.ts
@@ -1,5 +1,3 @@
-import { includes } from '@datadog/browser-core'
-
 // https://github.com/jquery/jquery/blob/a684e6ba836f7c553968d7d026ed7941e1a612d8/src/selector/escapeSelector.js
 export function cssEscape(str: string) {
   if (window.CSS && window.CSS.escape) {

From 00e8f0996f15af3c2ed1c9032d4fe49d9007f81d Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Tue, 4 Jun 2024 17:58:29 +0200
Subject: [PATCH 26/32] Explicit pointerdown when emulate click

---
 .../rum-core/src/domain/action/trackClickActions.spec.ts    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/rum-core/src/domain/action/trackClickActions.spec.ts b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
index 308a11afeb..ef1649db73 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.spec.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
@@ -239,7 +239,7 @@ describe('trackClickActions', () => {
         enablePrivacyForActionName: false,
       })
       const { clock } = setupBuilder.build()
-      emulateClick({ activity: {} })
+      emulateClick({ activity: { on: 'pointerdown' } })
       expect(findActionId()).not.toBeUndefined()
       clock.tick(EXPIRE_DELAY)
 
@@ -256,7 +256,7 @@ describe('trackClickActions', () => {
       button.setAttribute('data-dd-privacy', 'hidden')
 
       const { clock } = setupBuilder.build()
-      emulateClick({ activity: {} })
+      emulateClick({ activity: { on: 'pointerdown' } })
       clock.tick(EXPIRE_DELAY)
 
       expect(events.length).toBe(0)
@@ -267,7 +267,7 @@ describe('trackClickActions', () => {
         enablePrivacyForActionName: true,
       })
       const { clock } = setupBuilder.build()
-      emulateClick({ activity: {} })
+      emulateClick({ activity: { on: 'pointerdown' } })
       expect(findActionId()).not.toBeUndefined()
       clock.tick(EXPIRE_DELAY)
 

From b6b1df046a44952e189aaec2e98e99e5c43a9fbc Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Wed, 5 Jun 2024 14:03:45 +0200
Subject: [PATCH 27/32] Fix unit test for IE

---
 .../domain/action/trackClickActions.spec.ts   |  7 ++---
 .../rum-core/src/domain/configuration.spec.ts | 27 +++++++++++++++++--
 packages/rum-core/src/domain/privacy.ts       |  9 ++++---
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/packages/rum-core/src/domain/action/trackClickActions.spec.ts b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
index ef1649db73..b62e5ef519 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.spec.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.spec.ts
@@ -239,7 +239,7 @@ describe('trackClickActions', () => {
         enablePrivacyForActionName: false,
       })
       const { clock } = setupBuilder.build()
-      emulateClick({ activity: { on: 'pointerdown' } })
+      emulateClick({ activity: {} })
       expect(findActionId()).not.toBeUndefined()
       clock.tick(EXPIRE_DELAY)
 
@@ -256,7 +256,7 @@ describe('trackClickActions', () => {
       button.setAttribute('data-dd-privacy', 'hidden')
 
       const { clock } = setupBuilder.build()
-      emulateClick({ activity: { on: 'pointerdown' } })
+      emulateClick({ activity: {} })
       clock.tick(EXPIRE_DELAY)
 
       expect(events.length).toBe(0)
@@ -267,7 +267,8 @@ describe('trackClickActions', () => {
         enablePrivacyForActionName: true,
       })
       const { clock } = setupBuilder.build()
-      emulateClick({ activity: { on: 'pointerdown' } })
+
+      emulateClick({ activity: {} })
       expect(findActionId()).not.toBeUndefined()
       clock.tick(EXPIRE_DELAY)
 
diff --git a/packages/rum-core/src/domain/configuration.spec.ts b/packages/rum-core/src/domain/configuration.spec.ts
index 8c6d520bc6..d22e6250a4 100644
--- a/packages/rum-core/src/domain/configuration.spec.ts
+++ b/packages/rum-core/src/domain/configuration.spec.ts
@@ -1,6 +1,10 @@
 import type { InitConfiguration } from '@datadog/browser-core'
-import { DefaultPrivacyLevel, display, TraceContextInjection } from '@datadog/browser-core'
-import { EXHAUSTIVE_INIT_CONFIGURATION, SERIALIZED_EXHAUSTIVE_INIT_CONFIGURATION } from '../../../core/test'
+import { DefaultPrivacyLevel, display, ExperimentalFeature, TraceContextInjection } from '@datadog/browser-core'
+import {
+  EXHAUSTIVE_INIT_CONFIGURATION,
+  mockExperimentalFeatures,
+  SERIALIZED_EXHAUSTIVE_INIT_CONFIGURATION,
+} from '../../../core/test'
 import type { ExtractTelemetryConfiguration, CamelToSnakeCase, MapInitConfigurationKey } from '../../../core/test'
 import type { RumInitConfiguration } from './configuration'
 import { DEFAULT_PROPAGATOR_TYPES, serializeRumConfiguration, validateAndBuildRumConfiguration } from './configuration'
@@ -326,6 +330,25 @@ describe('validateAndBuildRumConfiguration', () => {
     })
   })
 
+  describe('enablePrivacyForActionName', () => {
+    it('defaults to false', () => {
+      expect(validateAndBuildRumConfiguration(DEFAULT_INIT_CONFIGURATION)!.enablePrivacyForActionName).toBeFalse()
+    })
+    it('is false when the feature is not enabled and the option is true', () => {
+      expect(
+        validateAndBuildRumConfiguration({ ...DEFAULT_INIT_CONFIGURATION, enablePrivacyForActionName: true })!
+          .enablePrivacyForActionName
+      ).toBeFalse()
+    })
+    it('is only true when the feature is enabled and the option is true', () => {
+      mockExperimentalFeatures([ExperimentalFeature.ENABLE_PRIVACY_FOR_ACTION_NAME])
+      expect(
+        validateAndBuildRumConfiguration({ ...DEFAULT_INIT_CONFIGURATION, enablePrivacyForActionName: true })!
+          .enablePrivacyForActionName
+      ).toBeTrue()
+    })
+  })
+
   describe('trackResources', () => {
     it('defaults to false', () => {
       expect(validateAndBuildRumConfiguration(DEFAULT_INIT_CONFIGURATION)!.trackResources).toBeFalse()
diff --git a/packages/rum-core/src/domain/privacy.ts b/packages/rum-core/src/domain/privacy.ts
index 2cbac65fd3..512b65cb0b 100644
--- a/packages/rum-core/src/domain/privacy.ts
+++ b/packages/rum-core/src/domain/privacy.ts
@@ -1,5 +1,6 @@
 import { DefaultPrivacyLevel } from '@datadog/browser-core'
 import { isElementNode, getParentNode, isTextNode } from '../browser/htmlDomUtils'
+import { elementMatches } from '../browser/polyfills'
 
 export const NodePrivacyLevel = {
   IGNORE: 'ignore',
@@ -121,19 +122,19 @@ export function getNodeSelfPrivacyLevel(node: Node): NodePrivacyLevel | undefine
   }
 
   // Check HTML privacy attributes and classes
-  if (node.matches(getPrivacySelector(NodePrivacyLevel.HIDDEN))) {
+  if (elementMatches(node, getPrivacySelector(NodePrivacyLevel.HIDDEN))) {
     return NodePrivacyLevel.HIDDEN
   }
 
-  if (node.matches(getPrivacySelector(NodePrivacyLevel.MASK))) {
+  if (elementMatches(node, getPrivacySelector(NodePrivacyLevel.MASK))) {
     return NodePrivacyLevel.MASK
   }
 
-  if (node.matches(getPrivacySelector(NodePrivacyLevel.MASK_USER_INPUT))) {
+  if (elementMatches(node, getPrivacySelector(NodePrivacyLevel.MASK_USER_INPUT))) {
     return NodePrivacyLevel.MASK_USER_INPUT
   }
 
-  if (node.matches(getPrivacySelector(NodePrivacyLevel.ALLOW))) {
+  if (elementMatches(node, getPrivacySelector(NodePrivacyLevel.ALLOW))) {
     return NodePrivacyLevel.ALLOW
   }
 

From b1fda2840dddf01d8396b48c66d5f9d1ff24cff5 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Wed, 5 Jun 2024 15:06:19 +0200
Subject: [PATCH 28/32] Add test coverage for configuration

---
 packages/rum-core/src/domain/configuration.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/rum-core/src/domain/configuration.spec.ts b/packages/rum-core/src/domain/configuration.spec.ts
index d22e6250a4..7b75c1ea97 100644
--- a/packages/rum-core/src/domain/configuration.spec.ts
+++ b/packages/rum-core/src/domain/configuration.spec.ts
@@ -340,8 +340,10 @@ describe('validateAndBuildRumConfiguration', () => {
           .enablePrivacyForActionName
       ).toBeFalse()
     })
+
     it('is only true when the feature is enabled and the option is true', () => {
       mockExperimentalFeatures([ExperimentalFeature.ENABLE_PRIVACY_FOR_ACTION_NAME])
+      expect(validateAndBuildRumConfiguration(DEFAULT_INIT_CONFIGURATION)!.enablePrivacyForActionName).toBeFalse()
       expect(
         validateAndBuildRumConfiguration({ ...DEFAULT_INIT_CONFIGURATION, enablePrivacyForActionName: true })!
           .enablePrivacyForActionName

From c3458bcfcf7e457ddad7c5826e45ca72cc2a25a8 Mon Sep 17 00:00:00 2001
From: Cy Zheng <congyao119@gmail.com>
Date: Mon, 10 Jun 2024 10:17:32 +0200
Subject: [PATCH 29/32] Update packages/rum-core/src/domain/configuration.ts

Co-authored-by: Aymeric <aymeric.mortemousque@datadoghq.com>
---
 packages/rum-core/src/domain/configuration.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/rum-core/src/domain/configuration.ts b/packages/rum-core/src/domain/configuration.ts
index 52e87ba993..e882f3b013 100644
--- a/packages/rum-core/src/domain/configuration.ts
+++ b/packages/rum-core/src/domain/configuration.ts
@@ -134,9 +134,8 @@ export function validateAndBuildRumConfiguration(
         ? initConfiguration.defaultPrivacyLevel
         : DefaultPrivacyLevel.MASK,
       enablePrivacyForActionName:
-        (isExperimentalFeatureEnabled(ExperimentalFeature.ENABLE_PRIVACY_FOR_ACTION_NAME) &&
-          initConfiguration.enablePrivacyForActionName) ??
-        false,
+        isExperimentalFeatureEnabled(ExperimentalFeature.ENABLE_PRIVACY_FOR_ACTION_NAME) &&
+          !!initConfiguration.enablePrivacyForActionName
       customerDataTelemetrySampleRate: 1,
       traceContextInjection: objectHasValue(TraceContextInjection, initConfiguration.traceContextInjection)
         ? initConfiguration.traceContextInjection

From 8c66817f829474ea99f977d87b45d0eab9055e24 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Mon, 10 Jun 2024 10:29:09 +0200
Subject: [PATCH 30/32] Remove masked param from interface

---
 packages/rum-core/src/domain/action/trackClickActions.ts | 1 -
 rum-events-format                                        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/rum-core/src/domain/action/trackClickActions.ts b/packages/rum-core/src/domain/action/trackClickActions.ts
index 7a9a2423c6..5f47ba98e0 100644
--- a/packages/rum-core/src/domain/action/trackClickActions.ts
+++ b/packages/rum-core/src/domain/action/trackClickActions.ts
@@ -42,7 +42,6 @@ export interface ClickAction {
     selector: string | undefined
     width: number
     height: number
-    masked?: boolean
   }
   position?: { x: number; y: number }
   startClocks: ClocksState
diff --git a/rum-events-format b/rum-events-format
index dcd62e5856..97908ae7f4 160000
--- a/rum-events-format
+++ b/rum-events-format
@@ -1 +1 @@
-Subproject commit dcd62e58566b9d158c404f3588edc62c041262dd
+Subproject commit 97908ae7f45d27f7eaa3ebdf094acf92c9061d89

From 0582b8a006bcc3b3d55b111992685620439425e1 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Mon, 10 Jun 2024 16:35:15 +0200
Subject: [PATCH 31/32] Fix typo

---
 packages/rum-core/src/domain/configuration.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rum-core/src/domain/configuration.ts b/packages/rum-core/src/domain/configuration.ts
index e882f3b013..e9bfc5a467 100644
--- a/packages/rum-core/src/domain/configuration.ts
+++ b/packages/rum-core/src/domain/configuration.ts
@@ -135,7 +135,7 @@ export function validateAndBuildRumConfiguration(
         : DefaultPrivacyLevel.MASK,
       enablePrivacyForActionName:
         isExperimentalFeatureEnabled(ExperimentalFeature.ENABLE_PRIVACY_FOR_ACTION_NAME) &&
-          !!initConfiguration.enablePrivacyForActionName
+        !!initConfiguration.enablePrivacyForActionName,
       customerDataTelemetrySampleRate: 1,
       traceContextInjection: objectHasValue(TraceContextInjection, initConfiguration.traceContextInjection)
         ? initConfiguration.traceContextInjection

From ab4261c9a7fddc3acb4a5c9fa2196bac7ba55329 Mon Sep 17 00:00:00 2001
From: cy-moi <congyao119@gmail.com>
Date: Mon, 10 Jun 2024 18:55:00 +0200
Subject: [PATCH 32/32] Fix typo

---
 .../src/domain/action/getActionNameFromElement.spec.ts        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
index 53cdf4e750..5017702347 100644
--- a/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
+++ b/packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts
@@ -508,7 +508,7 @@ describe('getActionNameFromElement', () => {
         ).toEqual('Masked Element')
       })
 
-      it('inherent privacy level and does not fallback to masked child text', () => {
+      it('inherit privacy level and does not fallback to masked child text', () => {
         expect(
           getActionNameFromElement(
             appendElement(`
@@ -553,7 +553,7 @@ describe('getActionNameFromElement', () => {
         ).toEqual('bar foo')
       })
 
-      it('inherent privacy level and does not fallback to masked child text with mixed classname and attribute', () => {
+      it('inherit privacy level and does not fallback to masked child text with mixed classname and attribute', () => {
         expect(
           getActionNameFromElement(
             appendElement(`