fix(error-tracking): derive debug_id from file content, not a filename Map

The RUM plugin embeds debug_id inside each chunk's own JS content as a
ddDebugId literal, but a side-channel Map keyed by filename was used to
pass it to error-tracking's uploader. Bundlers like webpack/rspack can
rename a chunk's file after the RUM plugin's injection (e.g.
realContentHash), so the Map's key goes stale and the lookup misses for
most chunks.

Read the debug_id straight out of the minified file's own content at
upload time instead. This removes the filename coordination between the
two plugins entirely, so it stays correct regardless of any bundler
renaming step.

Author: jhssilva

packages/core/src/types.ts

@@ -345,8 +345,6 @@ export type GlobalData = {
 };
 
 export type GlobalStores = {
-    // Keyed by chunk relative path, filled in by the RUM plugin, read by error-tracking.
-    debugIds: Map<string, string>;
     errors: string[];
     logs: Log[];
     metrics: Set<Metric>;

packages/factory/src/index.ts

@@ -117,7 +117,6 @@ export const buildPluginFactory = ({
         };
 
         const stores: GlobalStores = {
-            debugIds: new Map(),
             errors: [],
             logs: [],
             metrics: new Set(),

packages/plugins/error-tracking/src/index.ts

@@ -18,7 +18,7 @@ export type types = {
     ErrorTrackingOptions: ErrorTrackingOptions;
 };
 
-export const getPlugins: GetPlugins = ({ options, context, stores }) => {
+export const getPlugins: GetPlugins = ({ options, context }) => {
     const log = context.getLogger(PLUGIN_NAME);
     const timeOptions = log.time('validate options');
     const validatedOptions = validateOptions(options, log);
@@ -41,7 +41,6 @@ export const getPlugins: GetPlugins = ({ options, context, stores }) => {
             {
                 apiKey: context.auth.apiKey,
                 bundlerName: context.bundler.name,
-                debugIds: stores.debugIds,
                 git: gitInfo,
                 addMetric: context.addMetric,
                 outDir: context.bundler.outDir,

packages/plugins/error-tracking/src/sourcemaps/debugId.test.ts

@@ -0,0 +1,24 @@
+// 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 { extractDebugId } from './debugId';
+
+describe('extractDebugId', () => {
+    const debugId = '93fd4850-7b77-4f2e-9aa2-ba013e1a5027';
+
+    test('Should extract the debug ID when the key is quoted (unminified JSON.stringify output)', () => {
+        const content = `!function(){}({"service":"app","version":"1.0.0","ddDebugId":"${debugId}"},"DD_SOURCE_CODE_CONTEXT");`;
+        expect(extractDebugId(content)).toBe(debugId);
+    });
+
+    test('Should extract the debug ID when the key is unquoted (minifiers strip quotes from valid identifier keys)', () => {
+        const content = `!function(){}({service:"app",version:"1.0.0",ddDebugId:"${debugId}"},"DD_SOURCE_CODE_CONTEXT");`;
+        expect(extractDebugId(content)).toBe(debugId);
+    });
+
+    test('Should return undefined when there is no debug ID in the content', () => {
+        const content = `!function(){}({service:"app",version:"1.0.0"},"DD_SOURCE_CODE_CONTEXT");`;
+        expect(extractDebugId(content)).toBeUndefined();
+    });
+});

packages/plugins/error-tracking/src/sourcemaps/debugId.ts

@@ -0,0 +1,16 @@
+// 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.
+
+// Matches the `ddDebugId:"<uuid>"` literal the RUM plugin injects into each chunk's own content
+// (see packages/plugins/rum/src/getSourceCodeContextSnippet.ts). The key is quoted in source
+// (`JSON.stringify(context)`) but minifiers like terser strip quotes from object keys that are
+// valid identifiers, so the built output can have either `"ddDebugId":"..."` or `ddDebugId:"..."`.
+// Reading it back out of the file we're about to upload means we never have to trust a filename
+// as a coordination key between the RUM plugin and this one, so it stays correct across any
+// bundler renaming step.
+const DEBUG_ID_RX = /"?ddDebugId"?:"([0-9a-fA-F-]{36})"/;
+
+export const extractDebugId = (fileContent: string): string | undefined => {
+    return DEBUG_ID_RX.exec(fileContent)?.[1];
+};

packages/plugins/error-tracking/src/sourcemaps/index.ts

@@ -35,7 +35,6 @@ export const uploadSourcemaps = async (
             addMetric: context.addMetric,
             apiKey: context.apiKey,
             bundlerName: context.bundlerName,
-            debugIds: context.debugIds,
             git: context.git,
             outDir: context.outDir,
             sendMetrics: context.sendMetrics,

packages/plugins/error-tracking/src/sourcemaps/sender.test.ts

@@ -30,6 +30,7 @@ jest.mock('@dd/core/helpers/fs', () => {
         ...original,
         checkFile: jest.fn(),
         getFile: jest.fn(),
+        readFile: jest.fn(),
     };
 });
 
@@ -54,7 +55,6 @@ const uploadContextMock = {
 };
 const senderContextMock = {
     ...uploadContextMock,
-    debugIds: new Map(),
     git: contextMock.git,
 };
 
@@ -167,34 +167,34 @@ describe('Error Tracking Plugin Sourcemaps', () => {
             expect(doRequestMock).not.toHaveBeenCalled();
         });
 
-        test('Should resolve the debug ID for a chunk nested in a subdirectory of the output dir', async () => {
-            // Add some fixtures.
+        test('Should resolve the debug ID straight from the minified file content, regardless of its filename', async () => {
+            // The minified file's name here has nothing to do with the debug ID lookup —
+            // it's extracted from the file's own content, so it survives any bundler
+            // renaming step (e.g. webpack/rspack's realContentHash) that happens after
+            // the RUM plugin injects it.
+            const debugId = '12345678-1234-4123-8123-123456789012';
             addFixtureFiles({
-                '/path/to/minified.min.js': 'Some JS File with some content.',
+                '/path/to/minified.min.js':
+                    // Minifiers strip quotes from object keys that are valid identifiers, so
+                    // the real on-disk shape has an unquoted key, not `"ddDebugId":"..."`.
+                    `Some JS File with some content.(function(c,n){...})({ddDebugId:"${debugId}"},"DD_SOURCE_CODE_CONTEXT");`,
                 '/path/to/sourcemap.js.map': '{"version":3,"sources":["/path/to/minified.min.js"]}',
             });
 
             const getPayloadSpy = jest.spyOn(payloadModule, 'getPayload');
 
-            // `relativePath` mirrors what error-tracking's own file decomposition
-            // produces for a chunk nested under the output dir (e.g. rspack/webpack
-            // module federation output). The stored key must match this format,
-            // not a bare basename, or the debug ID lookup silently misses.
             const sourcemap = getSourcemapMock({ relativePath: 'path/to/minified.min.js' });
 
             await sendSourcemaps(
                 [sourcemap],
                 getSourcemapsConfiguration(),
-                {
-                    ...senderContextMock,
-                    debugIds: new Map([['path/to/minified.min.js', 'debug-id-1']]),
-                },
+                senderContextMock,
                 mockLogger,
             );
 
             expect(getPayloadSpy).toHaveBeenCalledTimes(1);
             const debugIdArg = getPayloadSpy.mock.calls[0][4];
-            expect(debugIdArg).toBe('debug-id-1');
+            expect(debugIdArg).toBe(debugId);
 
             getPayloadSpy.mockRestore();
         });

packages/plugins/error-tracking/src/sourcemaps/sender.ts

@@ -3,7 +3,7 @@
 // Copyright 2019-Present Datadog, Inc.
 
 import { getDDEnvValue } from '@dd/core/helpers/env';
-import { getFile } from '@dd/core/helpers/fs';
+import { getFile, readFile } from '@dd/core/helpers/fs';
 import {
     createRequestData,
     doRequest,
@@ -15,10 +15,10 @@ import { formatDuration, prettyObject } from '@dd/core/helpers/strings';
 import type { Logger, Metric, RepositoryData } from '@dd/core/types';
 import chalk from 'chalk';
 import PQueue from 'p-queue';
-import path from 'path';
 
 import type { SourcemapsOptionsWithDefaults, Sourcemap } from '../types';
 
+import { extractDebugId } from './debugId';
 import type { Metadata, MultipartFileValue, Payload } from './payload';
 import { getPayload } from './payload';
 import {
@@ -78,14 +78,6 @@ export type UploadContext = {
     outDir: string;
 };
 
-export type DebugIdsContext = {
-    // Keyed by chunk relative path (forward-slashed), filled in by the RUM plugin.
-    debugIds: Map<string, string>;
-};
-
-// Bundlers report chunk paths with forward slashes regardless of OS.
-const toPosixPath = (filePath: string) => filePath.split(path.sep).join('/');
-
 export const upload = async (
     payloads: Payload[],
     options: SourcemapsOptionsWithDefaults,
@@ -184,10 +176,9 @@ export const upload = async (
     return { warnings, errors };
 };
 
-export type SourcemapsSenderContext = UploadContext &
-    DebugIdsContext & {
-        git?: RepositoryData;
-    };
+export type SourcemapsSenderContext = UploadContext & {
+    git?: RepositoryData;
+};
 
 export const sendSourcemaps = async (
     sourcemaps: Sourcemap[],
@@ -210,8 +201,13 @@ export const sendSourcemaps = async (
 
     const payloadsTimer = log.time('Compute payloads');
     const payloads = await Promise.all(
-        sourcemaps.map((sourcemap) => {
-            const debugId = context.debugIds.get(toPosixPath(sourcemap.relativePath));
+        sourcemaps.map(async (sourcemap) => {
+            // Read the debug_id straight from the minified file's own content instead of
+            // trusting a filename as a coordination key with the RUM plugin — the bundler may
+            // still rename the file after injection (e.g. webpack/rspack's realContentHash),
+            // but the content, and the debug_id embedded in it, is unaffected.
+            const fileContent = await readFile(sourcemap.minifiedFilePath).catch(() => undefined);
+            const debugId = fileContent ? extractDebugId(fileContent) : undefined;
             return getPayload(sourcemap, metadata, prefix, context.git, debugId);
         }),
     );

packages/plugins/rum/src/index.ts

@@ -26,7 +26,7 @@ export type types = {
     RumInitConfiguration: RumInitConfiguration;
 };
 
-export const getPlugins: GetPlugins = ({ options, context, stores }) => {
+export const getPlugins: GetPlugins = ({ options, context }) => {
     const log = context.getLogger(PLUGIN_NAME);
     const validatedOptions = validateOptions(options, log);
     const plugins: PluginOptions[] = [];
@@ -38,13 +38,10 @@ export const getPlugins: GetPlugins = ({ options, context, stores }) => {
             position: InjectPosition.BEFORE,
             injectIntoAllChunks: true,
             value: (chunk) => {
-                const { code, debugId } = getSourceCodeContextSnippet(sourceCodeContext, chunk);
-                if (debugId && chunk) {
-                    // Let the error-tracking plugin pick this up when uploading its sourcemap.
-                    // Keyed by the chunk's relative path, since some bundlers can emit
-                    // sibling chunks sharing the same basename in different subdirectories.
-                    stores.debugIds.set(chunk.fileName, debugId);
-                }
+                // The debug_id is embedded directly in the returned code (see
+                // getSourceCodeContextSnippet.ts); error-tracking reads it back out of the
+                // built file's content at upload time, so it doesn't need to be tracked here.
+                const { code } = getSourceCodeContextSnippet(sourceCodeContext, chunk);
                 return code;
             },
         });

packages/tests/src/_jest/helpers/mocks.ts

@@ -86,7 +86,6 @@ export const getMockData = (overrides: Partial<GlobalData> = {}): GlobalData =>
 });
 
 export const getMockStores = (overrides: Partial<GlobalStores> = {}): GlobalStores => ({
-    debugIds: new Map(),
     logs: [],
     errors: [],
     warnings: [],