Remove FF of use_treewalker_for_action_name and make it the default approach

Author: cy-moi

packages/core/src/tools/experimentalFeatures.ts

@@ -15,7 +15,6 @@ import { objectHasValue } from './utils/objectUtils'
 // eslint-disable-next-line no-restricted-syntax
 export enum ExperimentalFeature {
   TRACK_INTAKE_REQUESTS = 'track_intake_requests',
-  USE_TREE_WALKER_FOR_ACTION_NAME = 'use_tree_walker_for_action_name',
   FEATURE_OPERATION_VITAL = 'feature_operation_vital',
   SHORT_SESSION_INVESTIGATION = 'short_session_investigation',
   START_STOP_ACTION = 'start_stop_action',

packages/rum-core/src/domain/action/getActionNameFromElement.spec.ts

@@ -1,4 +1,3 @@
-import { addExperimentalFeatures, ExperimentalFeature } from '@datadog/browser-core'
 import { appendElement, mockRumConfiguration } from '../../../test'
 import { NodePrivacyLevel } from '../privacyConstants'
 import { getNodeSelfPrivacyLevel } from '../privacy'
@@ -114,7 +113,6 @@ describe('getActionNameFromElement', () => {
   })
 
   it('should introduce whitespace for block-level display values', () => {
-    addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
     const testCases = [
       { display: 'block', expected: 'space' },
       { display: 'inline-block', expected: 'no-space' },
@@ -483,7 +481,6 @@ describe('getActionNameFromElement', () => {
     })
 
     it('removes only the child with programmatic action name in textual content', () => {
-      addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
       const { name, nameSource } = getActionNameFromElement(
         appendElement('<div>Foobar Baz<div data-dd-action-name="custom action">bar<div></div>'),
         defaultConfiguration
@@ -511,7 +508,6 @@ describe('getActionNameFromElement', () => {
     }
 
     it('preserves privacy level of the element when defaultPrivacyLevel is mask-unless-allowlisted', () => {
-      addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
       const { name, nameSource } = getActionNameFromElement(
         appendElement(`
         <div data-dd-privacy="mask">
@@ -665,7 +661,6 @@ describe('getActionNameFromElement', () => {
         },
       ]
       testCases.forEach(({ html, defaultPrivacyLevel, allowlist, expectedName, expectedNameSource }) => {
-        addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
         ;(window as BrowserWindow).$DD_ALLOW = new Set(allowlist)
         const target = appendElement(html)
         const { name, nameSource } = getActionNameFromElement(
@@ -882,7 +877,6 @@ describe('getActionNameFromElement', () => {
       })
 
       it('inherit privacy level and remove only the masked child', () => {
-        addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
         expect(
           getActionNameFromElement(
             appendElement(`

packages/rum-core/src/domain/action/getActionNameFromElement.ts

@@ -1,5 +1,5 @@
-import { ExperimentalFeature, isExperimentalFeatureEnabled, safeTruncate } from '@datadog/browser-core'
-import { getPrivacySelector, NodePrivacyLevel } from '../privacyConstants'
+import { safeTruncate } from '@datadog/browser-core'
+import { NodePrivacyLevel } from '../privacyConstants'
 import { getNodePrivacyLevel, maskDisallowedTextContent, shouldMaskNode, shouldMaskAttribute } from '../privacy'
 import type { NodePrivacyLevelCache } from '../privacy'
 import type { RumConfiguration } from '../configuration'
@@ -247,50 +247,13 @@ function getTextualContent(
     defaultPrivacyLevel,
   } = rumConfiguration
 
-  if (isExperimentalFeatureEnabled(ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME)) {
-    return getTextualContentWithTreeWalker(
-      element,
-      userProgrammaticAttribute,
-      enablePrivacyForActionName,
-      defaultPrivacyLevel,
-      nodePrivacyLevelCache
-    )
-  }
-
-  if ('innerText' in element) {
-    let text = (element as HTMLElement).innerText
-
-    const removeTextFromElements = (query: string) => {
-      const list = element.querySelectorAll<Element | HTMLElement>(query)
-      for (let index = 0; index < list.length; index += 1) {
-        const element = list[index]
-        if ('innerText' in element) {
-          const textToReplace = element.innerText
-          if (textToReplace && textToReplace.trim().length > 0) {
-            text = text.replace(textToReplace, '')
-          }
-        }
-      }
-    }
-
-    // remove the text of elements with programmatic attribute value
-    removeTextFromElements(`[${DEFAULT_PROGRAMMATIC_ACTION_NAME_ATTRIBUTE}]`)
-
-    if (userProgrammaticAttribute) {
-      removeTextFromElements(`[${userProgrammaticAttribute}]`)
-    }
-
-    if (enablePrivacyForActionName) {
-      // remove the text of elements with privacy override
-      removeTextFromElements(
-        `${getPrivacySelector(NodePrivacyLevel.HIDDEN)}, ${getPrivacySelector(NodePrivacyLevel.MASK)}`
-      )
-    }
-
-    return text
-  }
-
-  return element.textContent
+  return getTextualContentWithTreeWalker(
+    element,
+    userProgrammaticAttribute,
+    enablePrivacyForActionName,
+    defaultPrivacyLevel,
+    nodePrivacyLevelCache
+  )
 }
 
 function getTextualContentWithTreeWalker(

packages/rum-core/src/domain/action/trackClickActions.spec.ts

@@ -6,9 +6,7 @@ import {
   relativeNow,
   DefaultPrivacyLevel,
   Observable,
-  ExperimentalFeature,
   PageExitReason,
-  addExperimentalFeatures,
 } from '@datadog/browser-core'
 import type { Clock } from '@datadog/browser-core/test'
 import { createNewEvent, mockClock } from '@datadog/browser-core/test'
@@ -479,7 +477,6 @@ describe('trackClickActions', () => {
     })
 
     it('should mask action name when defaultPrivacyLevel is mask_unless_allowlisted and not in allowlist', () => {
-      addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
       startClickActionsTracking({
         defaultPrivacyLevel: DefaultPrivacyLevel.MASK_UNLESS_ALLOWLISTED,
         enablePrivacyForActionName: true,
@@ -524,7 +521,6 @@ describe('trackClickActions', () => {
     })
 
     it('should use allowlist masking when defaultPrivacyLevel is allow and node privacy level is mask-unless-allowlisted', () => {
-      addExperimentalFeatures([ExperimentalFeature.USE_TREE_WALKER_FOR_ACTION_NAME])
       button.setAttribute('data-dd-privacy', 'mask-unless-allowlisted')
       startClickActionsTracking({
         defaultPrivacyLevel: DefaultPrivacyLevel.ALLOW,