Integrate congyao/use-treewalker-for-action-name (#3972) into staging-09

Integrated commit sha: 77d6150

Co-authored-by: BenoitZugmeyer <benoit.zugmeyer@datadoghq.com>

Author: gh-worker-dd-mergequeue-cf854d[bot]

AGENTS.md

@@ -76,6 +76,8 @@ scripts/             # Build, deploy, release automation
 - Test framework: Jasmine + Karma. Spec files co-located with implementation: `feature.ts` → `feature.spec.ts`
 - Focus tests with `fit()` / `fdescribe()`, skip with `xit()` / `xdescribe()`
 - Use `registerCleanupTask()` for cleanup, NOT `afterEach()`
+- Prefer `collectAsyncCalls(spy, n)` over `waitFor(() => spy.calls.count() > 0)` for waiting on spy calls
+- Don't destructure methods from `spy.calls` (e.g., `argsFor`, `mostRecent`) - use `calls.argsFor()` to avoid `@typescript-eslint/unbound-method` errors
 - Mock values/functions: wrap with `mockable()` in source, use `replaceMockable()` or `replaceMockableWithSpy()` in tests (auto-cleanup)
 
 ### Naming Conventions

CHANGELOG.md

@@ -18,6 +18,12 @@
 
 ---
 
+## v7.0.0-alpha.0
+
+**Internal Changes:**
+
+- 👷 bump all packages to version to v7.0.0-alpha.0
+
 ## v6.27.1
 
 **Public Changes:**

developer-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-sdk-developer-extension",
-  "version": "6.27.1",
+  "version": "7.0.0-alpha.0",
   "private": true,
   "scripts": {
     "build": "wxt build",

developer-extension/src/content-scripts/main.ts

@@ -175,19 +175,11 @@ function loadSdkScriptFromURL(url: string) {
   if (xhr.status === 200) {
     let sdkCode = xhr.responseText
 
-    // Webpack expects the script to be loaded with a `<script src="...">` tag to get its URL to
-    // know where to load the relative chunks. By loading it with an XHR and evaluating it in an
-    // inline script tag, Webpack does not know where to load the chunks from.
-    //
-    // Let's replace Webpack logic that breaks with our own logic to define the URL. It's not
-    // pretty, but loading the script this way isn't either, so...
-    //
-    // We'll probably have to revisit when using actual `import()` expressions instead of relying on
-    // Webpack runtime to load the chunks.
-    sdkCode = sdkCode.replace(
-      'if (!scriptUrl) throw new Error("Automatic publicPath is not supported in this browser");',
-      `if (!scriptUrl) scriptUrl = ${JSON.stringify(url)};`
-    )
+    // Webpack chunks are loaded via ESM dynamic imports with relative paths (e.g. `import('./chunks/...')`).
+    // Since this script is injected inline rather than loaded via `<script src>`, relative import()
+    // paths would resolve against the page URL instead of the SDK URL. Replace them with absolute URLs.
+    const baseUrl = url.slice(0, url.lastIndexOf('/') + 1)
+    sdkCode = sdkCode.replaceAll(/\bimport\(['"]\.\/['"]/g, `import('${baseUrl}'`)
 
     const script = document.createElement('script')
     script.type = 'text/javascript'

lerna.json

@@ -1,4 +1,4 @@
 {
   "npmClient": "yarn",
-  "version": "6.27.1"
+  "version": "7.0.0-alpha.0"
 }

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datadog/browser-core",
-  "version": "6.27.1",
+  "version": "7.0.0-alpha.0",
   "license": "Apache-2.0",
   "main": "cjs/index.js",
   "module": "esm/index.js",

packages/core/src/domain/configuration/configuration.ts

@@ -10,7 +10,6 @@ import type { SessionPersistence } from '../session/sessionConstants'
 import type { MatchOption } from '../../tools/matchOption'
 import { isAllowedTrackingOrigins } from '../allowedTrackingOrigins'
 import type { Site } from '../intakeSites'
-import { isWorkerEnvironment } from '../../tools/globalObject'
 import type { TransportConfiguration } from './transportConfiguration'
 import { computeTransportConfiguration } from './transportConfiguration'
 
@@ -216,15 +215,6 @@ export interface InitConfiguration {
    */
   trackAnonymousUser?: boolean | undefined
 
-  /**
-   * Encode cookie options in the cookie value. This can be used as a mitigation for microssession issues.
-   * ⚠️ This is a beta feature and may be changed or removed in the future.
-   *
-   * @category Beta
-   * @defaultValue false
-   */
-  betaEncodeCookieOptions?: boolean | undefined
-
   // internal options
   /**
    * [Internal option] Enable experimental features
@@ -327,7 +317,6 @@ export interface Configuration extends TransportConfiguration {
   trackingConsent: TrackingConsent
   storeContextsAcrossPages: boolean
   trackAnonymousUser?: boolean
-  betaEncodeCookieOptions: boolean
 
   // internal
   sdkVersion: string | undefined
@@ -401,7 +390,7 @@ export function validateAndBuildConfiguration(
   return {
     beforeSend:
       initConfiguration.beforeSend && catchUserErrors(initConfiguration.beforeSend, 'beforeSend threw an error:'),
-    sessionStoreStrategyType: isWorkerEnvironment ? undefined : selectSessionStoreStrategyType(initConfiguration),
+    sessionStoreStrategyType: selectSessionStoreStrategyType(initConfiguration),
     sessionSampleRate: initConfiguration.sessionSampleRate ?? 100,
     telemetrySampleRate: initConfiguration.telemetrySampleRate ?? 20,
     telemetryConfigurationSampleRate: initConfiguration.telemetryConfigurationSampleRate ?? 5,
@@ -415,7 +404,6 @@ export function validateAndBuildConfiguration(
     trackingConsent: initConfiguration.trackingConsent ?? TrackingConsent.GRANTED,
     trackAnonymousUser: initConfiguration.trackAnonymousUser ?? true,
     storeContextsAcrossPages: !!initConfiguration.storeContextsAcrossPages,
-    betaEncodeCookieOptions: !!initConfiguration.betaEncodeCookieOptions,
 
     /**
      * The source of the SDK, used for support plugins purposes.
@@ -448,7 +436,6 @@ export function serializeConfiguration(initConfiguration: InitConfiguration) {
     allow_untrusted_events: !!initConfiguration.allowUntrustedEvents,
     tracking_consent: initConfiguration.trackingConsent,
     use_allowed_tracking_origins: Array.isArray(initConfiguration.allowedTrackingOrigins),
-    beta_encode_cookie_options: initConfiguration.betaEncodeCookieOptions,
     source: initConfiguration.source,
     sdk_version: initConfiguration.sdkVersion,
     variant: initConfiguration.variant,

packages/core/src/domain/contexts/userContext.spec.ts

@@ -16,7 +16,7 @@ describe('user context', () => {
     findTrackedSession: () =>
       ({
         anonymousId: 'device-123',
-      }) as SessionContext<string>,
+      }) as SessionContext,
   }
 
   beforeEach(() => {

…-core/src/domain/sampler/sampler.spec.ts packages/core/src/domain/sampler.spec.tspackages/rum-core/src/domain/sampler/sampler.spec.ts renamed to packages/core/src/domain/sampler.spec.ts packages/rum-core/src/domain/sampler/sampler.spec.ts renamed to packages/core/src/domain/sampler.spec.ts

@@ -1,19 +1,10 @@
-import { isSampled, resetSampleDecisionCache, sampleUsingKnuthFactor } from './sampler'
-
-// UUID known to yield a low hash value using the Knuth formula, making it more likely to be sampled
-const LOW_HASH_UUID = '29a4b5e3-9859-4290-99fa-4bc4a1a348b9'
-// UUID known to yield a high hash value using the Knuth formula, making it less likely to be
-// sampled
-const HIGH_HASH_UUID = '5321b54a-d6ec-4b24-996d-dd70c617e09a'
+import { HIGH_HASH_UUID, LOW_HASH_UUID } from '../../test'
+import { correctedChildSampleRate, isSampled, resetSampleDecisionCache, sampleUsingKnuthFactor } from './sampler'
 
 // UUID chosen arbitrarily, to be used when the test doesn't actually depend on it.
 const ARBITRARY_UUID = '1ff81c8c-6e32-473b-869b-55af08048323'
 
 describe('isSampled', () => {
-  beforeEach(() => {
-    resetSampleDecisionCache()
-  })
-
   it('returns true when sampleRate is 100', () => {
     expect(isSampled(ARBITRARY_UUID, 100)).toBeTrue()
   })
@@ -75,6 +66,28 @@ describe('isSampled', () => {
   })
 })
 
+describe('correctedChildSampleRate', () => {
+  it('should apply the correction formula', () => {
+    expect(correctedChildSampleRate(60, 20)).toBe(12)
+  })
+
+  it('should return the child rate unchanged when parent is 100%', () => {
+    expect(correctedChildSampleRate(100, 50)).toBe(50)
+  })
+
+  it('should return 0 when child rate is 0', () => {
+    expect(correctedChildSampleRate(60, 0)).toBe(0)
+  })
+
+  it('should return 0 when parent rate is 0', () => {
+    expect(correctedChildSampleRate(0, 50)).toBe(0)
+  })
+
+  it('should return the parent rate when child rate is 100%', () => {
+    expect(correctedChildSampleRate(60, 100)).toBe(60)
+  })
+})
+
 describe('sampleUsingKnuthFactor', () => {
   beforeEach(() => {
     if (!window.BigInt) {

…s/rum-core/src/domain/sampler/sampler.ts packages/core/src/domain/sampler.tspackages/rum-core/src/domain/sampler/sampler.ts renamed to packages/core/src/domain/sampler.ts packages/rum-core/src/domain/sampler/sampler.ts renamed to packages/core/src/domain/sampler.ts

@@ -1,8 +1,12 @@
-import { performDraw } from '@datadog/browser-core'
+import { performDraw } from '../tools/utils/numberUtils'
+
+export function correctedChildSampleRate(parentRate: number, childRate: number): number {
+  return (parentRate * childRate) / 100
+}
 
 const sampleDecisionCache: Map<number, { sessionId: string; decision: boolean }> = new Map()
 
-export function isSampled(sessionId: string, sampleRate: number) {
+export function isSampled(sessionId: string, sampleRate: number): boolean {
   // Shortcuts for common cases. This is not strictly necessary, but it makes the code faster for
   // customers willing to ingest all traces.
   if (sampleRate === 100) {
@@ -43,7 +47,7 @@ export function resetSampleDecisionCache() {
  * @param identifier - The identifier to use for sampling.
  * @param sampleRate - The sample rate in percentage between 0 and 100.
  */
-export function sampleUsingKnuthFactor(identifier: bigint, sampleRate: number) {
+export function sampleUsingKnuthFactor(identifier: bigint, sampleRate: number): boolean {
   // The formula is:
   //
   //   (identifier * knuthFactor) % 2^64 < sampleRate * 2^64