feat:add sourcemaps and telemetry

Author: cy-moi

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

@@ -31,7 +31,7 @@
         "typecheck": "tsc --noEmit"
     },
     "dependencies": {
-        "@datadog/js-instrumentation-wasm": "0.9.4",
+        "@datadog/js-instrumentation-wasm": "1.0.0",
         "@dd/core": "workspace:*",
         "@rollup/pluginutils": "5.1.4",
         "chalk": "2.3.1"

.yarn/cache/@datadog-js-instrumentation-wasm-npm-1.0.0-5d29c5eabe-9a7fe9d117.zip

@@ -57,7 +57,7 @@ export const getPlugins: GetPlugins = ({ options, context }) => {
 
     if (validatedOptions.privacy) {
         // Add the privacy plugin.
-        const privacyPlugin = getPrivacyPlugin(validatedOptions.privacy);
+        const privacyPlugin = getPrivacyPlugin(validatedOptions.privacy, context);
         if (privacyPlugin) {
             plugins.push(privacyPlugin);
         }

.yarn/cache/@rollup-plugin-typescript-npm-12.1.4-9003c60309-c2082e225f.zip

@@ -3,7 +3,7 @@
 // Copyright 2019-Present Datadog, Inc.
 
 import { instrument } from '@datadog/js-instrumentation-wasm';
-import type { PluginOptions } from '@dd/core/types';
+import type { GlobalContext, PluginOptions } from '@dd/core/types';
 import { createFilter } from '@rollup/pluginutils';
 import fs from 'node:fs';
 import path from 'node:path';
@@ -12,20 +12,18 @@ import { PRIVACY_HELPERS_MODULE_ID, PLUGIN_NAME } from './constants';
 import { buildTransformOptions } from './transform';
 import type { PrivacyOptions } from './types';
 
-export const getPrivacyPlugin = (pluginOptions: PrivacyOptions): PluginOptions | undefined => {
+export const getPrivacyPlugin = (
+    pluginOptions: PrivacyOptions,
+    context: GlobalContext,
+): PluginOptions | undefined => {
+    const log = context.getLogger(PLUGIN_NAME);
+
     if (pluginOptions.disabled) {
         return;
     }
 
     const transformOptions = buildTransformOptions(pluginOptions);
     const transformFilter = createFilter(pluginOptions.include, pluginOptions.exclude);
-
-    // Read the privacy helpers code
-    const privacyHelpersPath = path.join(
-        __dirname,
-        pluginOptions.module === 'cjs' ? './privacy-helpers.js' : './privacy-helpers.mjs',
-    );
-
     return {
         name: PLUGIN_NAME,
         // Enforce when the plugin will be executed.
@@ -35,15 +33,33 @@ export const getPrivacyPlugin = (pluginOptions: PrivacyOptions): PluginOptions |
         // webpack's id filter is outside of loader logic,
         // an additional hook is needed for better perf on webpack
         async resolveId(source) {
-            if (source === PRIVACY_HELPERS_MODULE_ID) {
-                return { id: PRIVACY_HELPERS_MODULE_ID };
+            if (source.includes(PRIVACY_HELPERS_MODULE_ID)) {
+                return { id: source };
             }
             return null;
         },
 
         async load(id) {
-            if (id === PRIVACY_HELPERS_MODULE_ID) {
-                return { code: fs.readFileSync(privacyHelpersPath, 'utf8') };
+            let privacyHelpersPath: string;
+            if (id.includes(PRIVACY_HELPERS_MODULE_ID)) {
+                if (id.endsWith('.cjs')) {
+                    privacyHelpersPath = path.join(__dirname, 'privacy-helpers.js');
+                } else {
+                    privacyHelpersPath = path.join(__dirname, 'privacy-helpers.mjs');
+                }
+                const code = fs.readFileSync(privacyHelpersPath, 'utf8');
+                if (context.bundler.name === 'rollup') {
+                    // prepend AAAA to sourcemap
+                    const sourcemap = {
+                        version: 3,
+                        sources: [privacyHelpersPath],
+                        sourcesContent: [code],
+                        names: [],
+                        mappings: Array(code.split('\n').length).fill('AAAA').join(';'),
+                    };
+                    return { code, map: sourcemap };
+                }
+                return { code, map: null };
             }
             return null;
         },
@@ -53,7 +69,25 @@ export const getPrivacyPlugin = (pluginOptions: PrivacyOptions): PluginOptions |
             return transformFilter(id);
         },
         async transform(code, id) {
-            return instrument({ id, code }, transformOptions);
+            try {
+                if (
+                    context.bundler.name === 'esbuild' ||
+                    context.bundler.name === 'webpack' ||
+                    context.bundler.name === 'rspack'
+                ) {
+                    transformOptions.output = {
+                        ...transformOptions.output,
+                        inlineSourceMap: false,
+                        embedCodeInSourceMap: true,
+                    };
+                }
+                return instrument({ id, code }, transformOptions);
+            } catch (e) {
+                log.error(`Instrumentation Error: ${e}`);
+                return {
+                    code,
+                };
+            }
         },
     };
 };

.yarn/cache/enhanced-resolve-npm-5.18.2-0b3f7769a8-d1b517c908.zip

@@ -22,8 +22,9 @@ export function buildTransformOptions(pluginOptions: PrivacyOptions): Instrument
         privacy: {
             addToDictionaryHelper: {
                 import: {
-                    module: PRIVACY_HELPERS_MODULE_ID,
-                    func: '$',
+                    cjsModule: pluginOptions.helpersModule ?? `${PRIVACY_HELPERS_MODULE_ID}.cjs`,
+                    esmModule: pluginOptions.helpersModule ?? `${PRIVACY_HELPERS_MODULE_ID}.mjs`,
+                    func: pluginOptions.globalFunc ?? '$',
                 },
             },
         },

.yarn/cache/ts-loader-npm-9.5.2-15fe2fd8a6-b2d0a4ae9e.zip

@@ -7,6 +7,8 @@ import type { Assign } from '@dd/core/types';
 export interface PrivacyOptions {
     exclude?: RegExp[] | string[];
     include?: RegExp[] | string[];
+    helpersModule?: string;
+    globalFunc?: string;
     module?: 'cjs' | 'esm';
     jsx?: boolean;
     transformStrategy?: 'ast';
@@ -16,5 +18,5 @@ export interface PrivacyOptions {
 
 export type PrivacyOptionsWithDefaults = Assign<
     PrivacyOptions,
-    Pick<Required<PrivacyOptions>, 'exclude' | 'include' | 'module' | 'transformStrategy'>
+    Pick<Required<PrivacyOptions>, 'exclude' | 'include' | 'transformStrategy'>
 >;