Yoann/integration test

.gitignore

@@ -15,6 +15,7 @@ yarn-error.log
 node_modules/
 dist/
 dist-basic/
+.dts-tmp-*/
 
 .vitrine/*
 !.vitrine/project.json

.yarn/patches/dts-bundle-generator-npm-9.5.1-0927b6826f.patch

@@ -0,0 +1,14 @@
+diff --git a/dist/types-usage-evaluator.js b/dist/types-usage-evaluator.js
+index a09f141f087b152c34ad9c88e66ed516f8294865..b3eb7f6a799992fe6c15b7caaa17a7eecde24478 100644
+--- a/dist/types-usage-evaluator.js
++++ b/dist/types-usage-evaluator.js
+@@ -111,6 +111,9 @@ class TypesUsageEvaluator {
+         if (ts.isExportDeclaration(node) && node.exportClause !== undefined && ts.isNamedExports(node.exportClause)) {
+             for (const exportElement of node.exportClause.elements) {
+                 const exportElementSymbol = (0, typescript_1.getImportExportReferencedSymbol)(exportElement, this.typeChecker);
++                if (exportElementSymbol === undefined) {
++                    continue;
++                }
+                 // i.e. `import * as NS from './local-module'`
+                 const namespaceImportForElement = (0, typescript_1.getDeclarationsForSymbol)(exportElementSymbol).find(ts.isNamespaceImport);
+                 if (namespaceImportForElement !== undefined) {

LICENSES-3rdparty.csv

@@ -374,6 +374,7 @@ diff,npm,BSD-3-Clause,(https://www.npmjs.com/package/diff)
 diff-sequences,npm,MIT,(https://www.npmjs.com/package/diff-sequences)
 dir-glob,npm,MIT,Kevin Mårtensson (github.com/kevva)
 doctrine,npm,Apache-2.0,(https://github.com/eslint/doctrine)
+dts-bundle-generator,patch,MIT,Evgeniy Timokhov (https://github.com/timocov/dts-bundle-generator)
 eastasianwidth,npm,MIT,Masaki Komagata (https://www.npmjs.com/package/eastasianwidth)
 ecc-jsbn,npm,MIT,Jeremie Miller (https://github.com/quartzjer/ecc-jsbn)
 ejs,npm,Apache-2.0,Matthew Eernisse (https://github.com/mde/ejs)
@@ -700,7 +701,6 @@ retry,npm,MIT,Tim Koschützki (https://github.com/tim-kos/node-retry)
 reusify,npm,MIT,Matteo Collina (https://github.com/mcollina/reusify#readme)
 rimraf,npm,ISC,Isaac Z. Schlueter (http://blog.izs.me/)
 rollup,npm,MIT,Rich Harris (https://rollupjs.org/)
-rollup-plugin-dts,virtual,LGPL-3.0-only,Arpad Borsos (https://github.com/Swatinem/rollup-plugin-dts#readme)
 rollup-plugin-esbuild,virtual,MIT,EGOIST (https://www.npmjs.com/package/rollup-plugin-esbuild)
 rollup-plugin-import-css,virtual,MIT,Jacob Leeson (https://github.com/jleeson/rollup-plugin-import-css#readme)
 run-parallel,npm,MIT,Feross Aboukhadijeh (https://github.com/feross/run-parallel)

package.json

@@ -57,7 +57,9 @@
         "typescript": "5.4.3"
     },
     "resolutions": {
-        "rollup": "4.45.1"
+        "rollup": "4.45.1",
+        "dts-bundle-generator/typescript": "5.4.3",
+        "dts-bundle-generator@npm:9.5.1": "patch:dts-bundle-generator@npm%3A9.5.1#~/.yarn/patches/dts-bundle-generator-npm-9.5.1-0927b6826f.patch"
     },
     "packageManager": "yarn@4.10.3"
 }

packages/core/src/helpers/request.ts

@@ -3,10 +3,7 @@
 // Copyright 2019-Present Datadog, Inc.
 
 import retry from 'async-retry';
-import { Readable } from 'stream';
 import type { RequestInit } from 'undici-types';
-import type { Gzip } from 'zlib';
-import { createGzip } from 'zlib';
 
 import type { RequestOpts } from '../types';
 
@@ -61,7 +58,7 @@ export const getOriginHeaders = (opts: { bundler: string; plugin: string; versio
 };
 
 export type RequestData = {
-    data: Gzip | Readable;
+    data: ReadableStream;
     headers: Record<string, string>;
 };
 
@@ -78,8 +75,12 @@ export const createRequestData = async (options: {
     // Serialize FormData through Request to get a streaming body
     // and auto-generated headers (boundary) that we can forward while piping through gzip.
     const req = new Request('fake://url', { method: 'POST', body: form });
-    const formStream = Readable.fromWeb(req.body!);
-    const data = zip ? formStream.pipe(createGzip()) : formStream;
+
+    // Use Web Streams pipeThrough instead of Node.js pipe() to keep the pipeline lazy.
+    // Node.js pipe() immediately puts the source into flowing mode (starts reading blobs
+    // via process.nextTick), which races with cleanup of file-backed blobs after the
+    // request completes. Web Streams only start reading when the output is consumed.
+    const data = zip ? req.body!.pipeThrough(new CompressionStream('gzip')) : req.body!;
 
     const headers = {
         'Content-Encoding': zip ? 'gzip' : 'multipart/form-data',

packages/plugins/apps/package.json

@@ -12,14 +12,14 @@
         "directory": "packages/plugins/apps"
     },
     "buildPlugin": {
-        "hideFromRootReadme": true
-    },
-    "toBuild": {
-        "apps-runtime": {
-            "entry": "./src/built/apps-runtime.ts",
-            "format": [
-                "esm"
-            ]
+        "hideFromRootReadme": true,
+        "toBuild": {
+            "apps-runtime": {
+                "entry": "./src/built/apps-runtime.ts",
+                "format": [
+                    "esm"
+                ]
+            }
         }
     },
     "exports": {

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

@@ -20,8 +20,6 @@ import {
     getSourcemapsConfiguration,
     addFixtureFiles,
 } from '@dd/tests/_jest/helpers/mocks';
-import { type Stream } from 'stream';
-import { unzipSync } from 'zlib';
 
 jest.mock('@dd/core/helpers/fs', () => {
     const original = jest.requireActual('@dd/core/helpers/fs');
@@ -42,19 +40,6 @@ jest.mock('@dd/core/helpers/request', () => {
 
 const doRequestMock = jest.mocked(doRequest);
 
-function readFully(stream: Stream): Promise<Buffer> {
-    const chunks: any[] = [];
-    return new Promise((resolve, reject) => {
-        stream.on('data', (chunk) => chunks.push(chunk));
-
-        stream.on('end', () => {
-            resolve(Buffer.concat(chunks));
-        });
-
-        stream.on('error', reject);
-    });
-}
-
 const contextMock = getContextMock();
 const uploadContextMock = {
     apiKey: contextMock.auth.apiKey,
@@ -106,8 +91,9 @@ describe('Error Tracking Plugin Sourcemaps', () => {
             const payload = getPayloadMock();
 
             const { data, headers } = await getData(payload)();
-            const zippedData = await readFully(data);
-            const unzippedData = unzipSync(zippedData).toString('utf-8');
+            const unzippedData = await new Response(
+                data.pipeThrough(new DecompressionStream('gzip')),
+            ).text();
             const dataLines = unzippedData.split(/[\r\n]/g).filter(Boolean);
             const boundary = headers['content-type']
                 .split('boundary=')

packages/plugins/metrics/src/common/sender.ts

@@ -7,6 +7,7 @@ import type { Logger, Metric, MetricToSend } from '@dd/core/types';
 import chalk from 'chalk';
 
 export const METRICS_API_PATH = 'api/v1/series';
+const METRICS_BATCH_SIZE = 500;
 
 const green = chalk.bold.green;
 
@@ -54,15 +55,28 @@ Sending ${metricsToSend.length} metrics with configuration:
 Metrics:
     - ${metricsNames.join('\n    - ')}`);
 
-    return doRequest({
-        method: 'POST',
-        url: `https://api.${auth.site}/${METRICS_API_PATH}?api_key=${auth.apiKey}`,
-        getData: () => ({
-            data: JSON.stringify({ series: metricsToSend } satisfies {
-                series: Metric[];
+    const batches: Metric[][] = [];
+    for (let i = 0; i < metricsToSend.length; i += METRICS_BATCH_SIZE) {
+        batches.push(metricsToSend.slice(i, i + METRICS_BATCH_SIZE));
+    }
+
+    if (batches.length > 1) {
+        log.debug(`Sending metrics in ${batches.length} batches of up to ${METRICS_BATCH_SIZE}.`);
+    }
+
+    return Promise.all(
+        batches.map((batch) =>
+            doRequest({
+                method: 'POST',
+                url: `https://api.${auth.site}/${METRICS_API_PATH}?api_key=${auth.apiKey}`,
+                getData: () => ({
+                    data: JSON.stringify({ series: batch } satisfies {
+                        series: Metric[];
+                    }),
+                }),
             }),
-        }),
-    }).catch((e) => {
+        ),
+    ).catch((e) => {
         log.error(`Error sending metrics ${e}`);
     });
 };

packages/plugins/rum/package.json

@@ -12,18 +12,22 @@
         "directory": "packages/plugins/rum"
     },
     "buildPlugin": {
-        "hideFromRootReadme": true
-    },
-    "toBuild": {
-        "rum-browser-sdk": {
-            "entry": "./src/built/rum-browser-sdk.ts"
-        },
-        "privacy-helpers": {
-            "format": [
-                "cjs",
-                "esm"
-            ],
-            "entry": "./src/built/privacy-helpers.ts"
+        "hideFromRootReadme": true,
+        "inlinedLibraries": [
+            "@datadog/browser-core",
+            "@datadog/browser-rum-core"
+        ],
+        "toBuild": {
+            "rum-browser-sdk": {
+                "entry": "./src/built/rum-browser-sdk.ts"
+            },
+            "privacy-helpers": {
+                "format": [
+                    "cjs",
+                    "esm"
+                ],
+                "entry": "./src/built/privacy-helpers.ts"
+            }
         }
     },
     "exports": {
@@ -40,6 +44,7 @@
     },
     "devDependencies": {
         "@datadog/browser-rum": "6.26.0",
+        "@datadog/browser-rum-core": "6.26.0",
         "typescript": "5.4.3"
     }
 }

packages/plugins/rum/src/browserSdkTypes.ts

@@ -0,0 +1,5 @@
+// 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.
+
+export type { RumPublicApi, RumInitConfiguration } from '@datadog/browser-rum-core';

packages/plugins/rum/src/index.ts

@@ -6,11 +6,12 @@ import type { PluginOptions, GetPlugins } from '@dd/core/types';
 import { InjectPosition } from '@dd/core/types';
 import path from 'path';
 
+import type { RumInitConfiguration, RumPublicApi } from './browserSdkTypes';
 import { CONFIG_KEY, PLUGIN_NAME } from './constants';
 import { getSourceCodeContextSnippet } from './getSourceCodeContextSnippet';
 import { getPrivacyPlugin } from './privacy';
 import { getInjectionValue } from './sdk';
-import type { RumOptions, RumOptionsWithSdk, RumPublicApi, RumInitConfiguration } from './types';
+import type { RumOptions, RumOptionsWithSdk } from './types';
 import { validateOptions } from './validate';
 
 export { CONFIG_KEY, PLUGIN_NAME };

packages/plugins/rum/src/types.ts

@@ -2,12 +2,9 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2019-Present Datadog, Inc.
 
-import type {
-    datadogRum,
-    RumInitConfiguration as ExpRumInitConfiguration,
-} from '@datadog/browser-rum';
 import type { Assign } from '@dd/core/types';
 
+import type { RumInitConfiguration } from './browserSdkTypes';
 import type { PrivacyOptions, PrivacyOptionsWithDefaults } from './privacy/types';
 
 export type SourceCodeContextOptions = {
@@ -22,9 +19,6 @@ export type RumOptions = {
     sourceCodeContext?: SourceCodeContextOptions;
 };
 
-export type RumPublicApi = typeof datadogRum;
-export type RumInitConfiguration = ExpRumInitConfiguration;
-
 export type SDKOptions = Assign<
     RumInitConfiguration,
     {

packages/published/esbuild-plugin/package.json

@@ -78,9 +78,9 @@
         "@rollup/plugin-terser": "0.4.4",
         "@types/babel__core": "^7",
         "@types/babel__preset-env": "^7",
+        "dts-bundle-generator": "patch:dts-bundle-generator@npm%3A9.5.1#~/.yarn/patches/dts-bundle-generator-npm-9.5.1-0927b6826f.patch",
         "esbuild": "0.25.8",
         "rollup": "4.45.1",
-        "rollup-plugin-dts": "6.1.1",
         "rollup-plugin-esbuild": "6.1.1",
         "typescript": "5.4.3"
     },

packages/published/rollup-plugin/package.json

@@ -81,9 +81,9 @@
         "@rollup/plugin-terser": "0.4.4",
         "@types/babel__core": "^7",
         "@types/babel__preset-env": "^7",
+        "dts-bundle-generator": "patch:dts-bundle-generator@npm%3A9.5.1#~/.yarn/patches/dts-bundle-generator-npm-9.5.1-0927b6826f.patch",
         "esbuild": "0.25.8",
         "rollup": "4.45.1",
-        "rollup-plugin-dts": "6.1.1",
         "rollup-plugin-esbuild": "6.1.1",
         "typescript": "5.4.3"
     },

packages/published/rspack-plugin/package.json

@@ -78,9 +78,9 @@
         "@rollup/plugin-terser": "0.4.4",
         "@types/babel__core": "^7",
         "@types/babel__preset-env": "^7",
+        "dts-bundle-generator": "patch:dts-bundle-generator@npm%3A9.5.1#~/.yarn/patches/dts-bundle-generator-npm-9.5.1-0927b6826f.patch",
         "esbuild": "0.25.8",
         "rollup": "4.45.1",
-        "rollup-plugin-dts": "6.1.1",
         "rollup-plugin-esbuild": "6.1.1",
         "typescript": "5.4.3"
     },

packages/published/vite-plugin/package.json

@@ -78,9 +78,9 @@
         "@rollup/plugin-terser": "0.4.4",
         "@types/babel__core": "^7",
         "@types/babel__preset-env": "^7",
+        "dts-bundle-generator": "patch:dts-bundle-generator@npm%3A9.5.1#~/.yarn/patches/dts-bundle-generator-npm-9.5.1-0927b6826f.patch",
         "esbuild": "0.25.8",
         "rollup": "4.45.1",
-        "rollup-plugin-dts": "6.1.1",
         "rollup-plugin-esbuild": "6.1.1",
         "typescript": "5.4.3"
     },

packages/published/webpack-plugin/package.json

@@ -78,9 +78,9 @@
         "@rollup/plugin-terser": "0.4.4",
         "@types/babel__core": "^7",
         "@types/babel__preset-env": "^7",
+        "dts-bundle-generator": "patch:dts-bundle-generator@npm%3A9.5.1#~/.yarn/patches/dts-bundle-generator-npm-9.5.1-0927b6826f.patch",
         "esbuild": "0.25.8",
         "rollup": "4.45.1",
-        "rollup-plugin-dts": "6.1.1",
         "rollup-plugin-esbuild": "6.1.1",
         "typescript": "5.4.3"
     },

packages/tools/src/commands/integrity/index.ts

@@ -26,6 +26,7 @@ class Integrity extends Command {
         const { updateDependencies } = await import('./dependencies');
         const { updateFiles } = await import('./files');
         const { updateReadmes, injectTocsInAllReadmes, verifyLinks } = await import('./readme');
+        const { updateTsconfigPaths } = await import('./tsconfig');
         const { getWorkspaces } = await import('@dd/tools/helpers');
 
         const workspaces = await getWorkspaces();
@@ -51,6 +52,8 @@ class Integrity extends Command {
         errors.push(...(await verifyLinks()));
         // Update the files that need to be updated.
         errors.push(...(await updateFiles(plugins)));
+        // Sync @dd/* paths in the root tsconfig with each workspace's package.json exports.
+        updateTsconfigPaths(workspaces);
         // Run auto-fixes to ensure the code is correct.
         errors.push(...(await runAutoFixes()));