Fix DD_SITE leak from dd-trace in CI

Author: yoannmoinet

packages/factory/src/helpers/context.test.ts

@@ -4,7 +4,6 @@
 
 import type { Options, GlobalContext } from '@dd/core/types';
 import { BUNDLER_VERSIONS } from '@dd/tests/_jest/helpers/constants';
-import { cleanEnv } from '@dd/tests/_jest/helpers/env';
 import { defaultPluginOptions } from '@dd/tests/_jest/helpers/mocks';
 import { BUNDLERS, runBundlers } from '@dd/tests/_jest/helpers/runBundlers';
 
@@ -13,7 +12,6 @@ describe('Factory Helpers', () => {
     const initialContexts: Record<string, GlobalContext> = {};
     const buildRoots: Record<string, string> = {};
     let workingDir: string;
-    let restoreEnv: () => void;
 
     beforeAll(async () => {
         const pluginConfig: Options = {
@@ -41,15 +39,10 @@ describe('Factory Helpers', () => {
             },
         };
 
-        restoreEnv = cleanEnv();
         const result = await runBundlers(pluginConfig);
         workingDir = result.workingDir;
     });
 
-    afterAll(() => {
-        restoreEnv();
-    });
-
     describe('getContext', () => {
         describe.each(BUNDLERS)('[$name|$version]', ({ name, version }) => {
             test('Should have the right initial context.', () => {

packages/tests/src/_jest/setupAfterEnv.ts

@@ -27,16 +27,21 @@ jest.mock('async-retry', () => {
     });
 });
 
+let restoreEnv: () => void;
 beforeAll(() => {
     const nock = jest.requireActual('nock');
+    const { cleanEnv } = jest.requireActual('./helpers/env.ts');
     // Do not send any HTTP requests.
     nock.disableNetConnect();
+    // Need to clean env to avoid the `DD_SITE` leak from dd-trace in the CI.
+    restoreEnv = cleanEnv();
 });
 
 afterAll(async () => {
     // Clean the workingDirs from runBundlers();
     const { cleanupEverything } = jest.requireActual('./helpers/runBundlers.ts');
     await cleanupEverything();
+    restoreEnv();
 });
 
 // Have a less verbose, console.log output.

packages/tools/src/rollupConfig.test.ts

@@ -17,7 +17,7 @@ import {
 } from '@dd/error-tracking-plugin/sourcemaps/sender';
 import { METRICS_API_PATH } from '@dd/metrics-plugin/common/sender';
 import { BUNDLER_VERSIONS, KNOWN_ERRORS } from '@dd/tests/_jest/helpers/constants';
-import { cleanEnv, getOutDir, prepareWorkingDir } from '@dd/tests/_jest/helpers/env';
+import { getOutDir, prepareWorkingDir } from '@dd/tests/_jest/helpers/env';
 import {
     FAKE_SITE,
     easyProjectEntry,
@@ -148,7 +148,6 @@ const getBuiltFiles = () => {
 describe('Bundling', () => {
     let bundlerVersions: Partial<Record<BundlerName, string>> = {};
     let processErrors: string[] = [];
-    let restoreEnv: () => void;
     const pluginConfig = getFullPluginConfig({
         logLevel: 'error',
         customPlugins: () => [
@@ -202,8 +201,6 @@ describe('Bundling', () => {
             }
             return actualStderrWrite(err, ...args);
         });
-
-        restoreEnv = cleanEnv();
     });
 
     afterEach(() => {
@@ -214,7 +211,6 @@ describe('Bundling', () => {
 
     afterAll(async () => {
         nock.cleanAll();
-        restoreEnv();
     });
 
     const nameSize = Math.max(...BUNDLERS.map((bundler) => bundler.name.length)) + 1;