Merge branch 'master' into yoann/add-submit-log-flag

Author: yoannmoinet

.github/CODEOWNERS

@@ -23,6 +23,7 @@ packages/plugins/error-tracking                                       @yoannmoin
 
 # Rum
 packages/plugins/rum                                                  @yoannmoinet
+packages/plugins/rum/src/privacy                                      @DataDog/rum-browser
 
 # Analytics
 packages/plugins/analytics                                            @yoannmoinet

.github/workflows/ci.yaml

@@ -28,7 +28,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: packages/published/**/dist
-        key: ${{ matrix.node }}-cache-build-${{ hashFiles('packages/published/**', 'yarn.lock') }}
+        key: ${{ matrix.node }}-cache-build-${{ hashFiles('packages/published/**', 'yarn.lock', 'packages/tools/src/rollupConfig.mjs') }}
 
     - name: Configure Datadog Test Optimization
       uses: datadog/test-visibility-github-action@v2

.yarn/cache/@datadog-js-instrumentation-wasm-npm-0.9.4-151eed3103-167b9ff05a.zip

@@ -119,6 +119,7 @@ Component,Origin,Licence,Copyright
 @datadog/browser-core,npm,Apache-2.0,(https://www.npmjs.com/package/@datadog/browser-core)
 @datadog/browser-rum,virtual,Apache-2.0,(https://www.npmjs.com/package/@datadog/browser-rum)
 @datadog/browser-rum-core,npm,Apache-2.0,(https://www.npmjs.com/package/@datadog/browser-rum-core)
+@datadog/js-instrumentation-wasm,npm,MIT,(https://github.com/datadog/js-instrumentation-wasm#readme)
 @esbuild/darwin-arm64,npm,MIT,(https://www.npmjs.com/package/@esbuild/darwin-arm64)
 @esbuild/darwin-x64,npm,MIT,(https://www.npmjs.com/package/@esbuild/darwin-x64)
 @esbuild/linux-x64,npm,MIT,(https://www.npmjs.com/package/@esbuild/linux-x64)

.yarn/cache/@rollup-pluginutils-npm-5.1.4-83ce21024f-598f628988.zip

@@ -5,7 +5,6 @@
 // This file is partially generated.
 // Anything between #imports-injection-marker and #types-injection-marker
 // will be updated using the 'yarn cli integrity' command.
-
 import type { TrackedFilesMatcher } from '@dd/internal-git-plugin/trackedFilesMatcher';
 /* eslint-disable arca/import-ordering */
 // #imports-injection-marker

LICENSES-3rdparty.csv

@@ -14,6 +14,13 @@
     "toBuild": {
         "rum-browser-sdk": {
             "entry": "./src/built/rum-browser-sdk.ts"
+        },
+        "privacy-helpers": {
+            "format": [
+                "cjs",
+                "esm"
+            ],
+            "entry": "./src/built/privacy-helpers.ts"
         }
     },
     "exports": {
@@ -24,7 +31,9 @@
         "typecheck": "tsc --noEmit"
     },
     "dependencies": {
+        "@datadog/js-instrumentation-wasm": "0.9.4",
         "@dd/core": "workspace:*",
+        "@rollup/pluginutils": "5.1.4",
         "chalk": "2.3.1"
     },
     "devDependencies": {

packages/core/src/types.ts

@@ -0,0 +1,20 @@
+// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2019-Present Datadog, Inc.
+
+/* eslint-env browser */
+/* global globalThis */
+const globalAny: any = globalThis;
+globalAny.$DD_ALLOW = new Set();
+
+export function $(newValues: string[] | TemplateStringsArray) {
+    const initialSize = globalAny.$DD_ALLOW.size;
+    newValues.forEach((value) => globalAny.$DD_ALLOW.add(value));
+    if (globalAny.$DD_ALLOW.size !== initialSize) {
+        if (globalAny.$DD_ALLOW_OBSERVERS) {
+            globalAny.$DD_ALLOW_OBSERVERS.forEach((cb: () => void) => cb());
+        }
+    }
+
+    return newValues;
+}

packages/plugins/rum/package.json

@@ -7,6 +7,7 @@ import { InjectPosition } from '@dd/core/types';
 import path from 'path';
 
 import { CONFIG_KEY, PLUGIN_NAME } from './constants';
+import { getPrivacyPlugin } from './privacy';
 import { getInjectionValue } from './sdk';
 import type { RumOptions, RumOptionsWithSdk, RumPublicApi, RumInitConfiguration } from './types';
 import { validateOptions } from './validate';
@@ -54,5 +55,13 @@ export const getPlugins: GetPlugins = ({ options, context }) => {
         });
     }
 
+    if (validatedOptions.privacy) {
+        // Add the privacy plugin.
+        const privacyPlugin = getPrivacyPlugin(validatedOptions.privacy);
+        if (privacyPlugin) {
+            plugins.push(privacyPlugin);
+        }
+    }
+
     return plugins;
 };

packages/plugins/rum/src/built/privacy-helpers.ts

@@ -0,0 +1,8 @@
+// Unless explicitly stated otherwise all files in this repository are licensed under the MIT License.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2019-Present Datadog, Inc.
+
+import type { PluginName } from '@dd/core/types';
+
+export const PLUGIN_NAME: PluginName = 'datadog-rum-privacy-plugin' as const;
+export const PRIVACY_HELPERS_MODULE_ID = '\0datadog:privacy-helpers';