@datadog/datadog-ci 3.12.0 → 3.13.0

package/dist/commands/dsyms/upload.js

@@ -74,111 +74,47 @@ class UploadCommand extends clipanion_1.Command {
         this.config = {
             datadogSite: 'datadoghq.com',
         };
-        this.compressDSYMsToDirectory = (dsyms, directoryPath) => __awaiter(this, void 0, void 0, function* () {
-            yield fs_1.promises.mkdir(directoryPath, { recursive: true });
-            return Promise.all(dsyms.map((dsym) => __awaiter(this, void 0, void 0, function* () {
-                const archivePath = (0, utils_1.buildPath)(directoryPath, `${dsym.slices[0].uuid}.zip`);
-                yield (0, utils_2.zipDirectoryToArchive)(dsym.bundlePath, archivePath);
-                return new interfaces_1.CompressedDsym(archivePath, dsym);
-            })));
-        });
-        this.findDSYMsInDirectory = (directoryPath) => __awaiter(this, void 0, void 0, function* () {
-            const dsyms = [];
-            for (const dSYMPath of (0, glob_1.globSync)((0, utils_1.buildPath)(directoryPath, '**/*.dSYM'))) {
+    }
+    execute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            (0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
+            this.basePath = upath_1.default.normalize(this.basePath);
+            this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.basePath, this.maxConcurrency, this.dryRun));
+            yield this.loadConfig();
+            const { metricsLogger, apiKeyValidator } = this.createServices();
+            const initialTime = Date.now();
+            try {
+                const tmpDirectory = yield (0, utils_2.createUniqueTmpDirectory)();
                 try {
-                    const stdout = (yield (0, utils_2.executeDwarfdump)(dSYMPath)).stdout;
-                    const archSlices = this.parseDwarfdumpOutput(stdout);
-                    dsyms.push({ bundlePath: dSYMPath, slices: archSlices });
+                    const results = yield this.processAndUploadDsyms(tmpDirectory, metricsLogger, apiKeyValidator);
+                    const totalTime = (Date.now() - initialTime) / 1000;
+                    this.context.stdout.write((0, renderer_1.renderSuccessfulCommand)(results, totalTime, this.dryRun));
+                    metricsLogger.logger.gauge('duration', totalTime);
+                    return 0;
                 }
-                catch (_c) {
-                    this.context.stdout.write((0, renderer_1.renderInvalidDsymWarning)(dSYMPath));
+                finally {
+                    yield (0, utils_2.deleteDirectory)(tmpDirectory);
                 }
             }
-            return Promise.all(dsyms);
-        });
-        /**
-         * Parses the output of `dwarfdump --uuid` command (ref.: https://www.unix.com/man-page/osx/1/dwarfdump/).
-         * It returns one or many arch slices read from the output.
-         *
-         * Example `dwarfdump --uuid` output:
-         * ```
-         * $ dwarfdump --uuid DDTest.framework.dSYM
-         * UUID: C8469F85-B060-3085-B69D-E46C645560EA (armv7) DDTest.framework.dSYM/Contents/Resources/DWARF/DDTest
-         * UUID: 06EE3D68-D605-3E92-B92D-2F48C02A505E (arm64) DDTest.framework.dSYM/Contents/Resources/DWARF/DDTest
-         * ```
-         */
-        this.parseDwarfdumpOutput = (output) => {
-            const lineRegexp = /UUID: ([0-9A-F]{8}-(?:[0-9A-F]{4}-){3}[0-9A-F]{12}) \(([a-z0-9_]+)\) (.+)/;
-            return output
-                .split('\n')
-                .map((line) => {
-                const match = line.match(lineRegexp);
-                return match ? [{ arch: match[2], objectPath: match[3], uuid: match[1] }] : [];
-            })
-                .reduce((acc, nextSlice) => acc.concat(nextSlice), []);
-        };
-        /**
-         * It takes fat dSYM as input and returns multiple dSYMs by extracting **each arch**
-         * to separate dSYM file. New files are saved to `intermediatePath` and named by their object uuid (`<uuid>.dSYM`).
-         *
-         * For example, given `<source path>/Foo.dSYM/Contents/Resources/DWARF/Foo` dSYM with two arch slices: `arm64` (uuid1)
-         * and `x86_64` (uuid2), it will:
-         * - create `<intermediate path>/<uuid1>.dSYM/Contents/Resources/DWARF/Foo` for `arm64`,
-         * - create `<intermediate path>/<uuid2>.dSYM/Contents/Resources/DWARF/Foo` for `x86_64`.
-         */
-        this.thinDSYM = (dsym, intermediatePath) => __awaiter(this, void 0, void 0, function* () {
-            const slimmedDSYMs = [];
-            for (const slice of dsym.slices) {
-                try {
-                    const newDSYMBundleName = `${slice.uuid}.dSYM`;
-                    const newDSYMBundlePath = (0, utils_1.buildPath)(intermediatePath, newDSYMBundleName);
-                    const newObjectPath = (0, utils_1.buildPath)(newDSYMBundlePath, upath_1.default.relative(dsym.bundlePath, slice.objectPath));
-                    // Extract arch slice:
-                    yield fs_1.promises.mkdir(upath_1.default.dirname(newObjectPath), { recursive: true });
-                    yield (0, utils_2.executeLipo)(slice.objectPath, slice.arch, newObjectPath);
-                    // The original dSYM bundle can also include `Info.plist` file, so copy it to the `<uuid>.dSYM` as well.
-                    // Ref.: https://opensource.apple.com/source/lldb/lldb-179.1/www/symbols.html
-                    const infoPlistPath = (0, glob_1.globSync)((0, utils_1.buildPath)(dsym.bundlePath, '**/Info.plist'))[0];
-                    if (infoPlistPath) {
-                        const newInfoPlistPath = (0, utils_1.buildPath)(newDSYMBundlePath, upath_1.default.relative(dsym.bundlePath, infoPlistPath));
-                        yield fs_1.promises.mkdir(upath_1.default.dirname(newInfoPlistPath), { recursive: true });
-                        yield fs_1.promises.copyFile(infoPlistPath, newInfoPlistPath);
-                    }
-                    slimmedDSYMs.push({
-                        bundlePath: newDSYMBundlePath,
-                        slices: [{ arch: slice.arch, uuid: slice.uuid, objectPath: newObjectPath }],
-                    });
-                }
-                catch (_d) {
-                    this.context.stdout.write((0, renderer_1.renderDSYMSlimmingFailure)(dsym, slice));
+            catch (error) {
+                if (error instanceof errors_1.InvalidConfigurationError) {
+                    this.context.stdout.write((0, renderer_1.renderConfigurationError)(error));
+                    return 1;
                 }
+                throw error;
             }
-            return Promise.all(slimmedDSYMs);
-        });
-        /**
-         * It takes `N` dSYMs and returns `N` or more dSYMs. If a dSYM includes more than one arch slice,
-         * it will be thinned by extracting each arch to a new dSYM in `intermediatePath`.
-         */
-        this.thinDSYMs = (dsyms, intermediatePath) => __awaiter(this, void 0, void 0, function* () {
-            yield fs_1.promises.mkdir(intermediatePath, { recursive: true });
-            let slimDSYMs = [];
-            for (const dsym of dsyms) {
-                if (dsym.slices.length > 1) {
-                    slimDSYMs = slimDSYMs.concat(yield this.thinDSYM(dsym, intermediatePath));
+            finally {
+                try {
+                    yield metricsLogger.flush();
                 }
-                else {
-                    slimDSYMs.push(dsym);
+                catch (err) {
+                    this.context.stdout.write(`WARN: ${err}\n`);
                 }
             }
-            return Promise.all(slimDSYMs);
         });
     }
-    execute() {
+    loadConfig() {
         return __awaiter(this, void 0, void 0, function* () {
-            (0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
-            // Normalizing the basePath to resolve .. and .
-            this.basePath = upath_1.default.normalize(this.basePath);
-            this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.basePath, this.maxConcurrency, this.dryRun));
             this.config = yield (0, utils_1.resolveConfigFromFileAndEnvironment)(this.config, {
                 apiKey: process.env.DATADOG_API_KEY,
                 datadogSite: process.env.DATADOG_SITE,
@@ -189,64 +125,160 @@ class UploadCommand extends clipanion_1.Command {
                     (0, validation_1.checkAPIKeyOverride)(process.env.DATADOG_API_KEY, configFromFile.apiKey, this.context.stdout);
                 },
             });
-            const metricsLogger = (0, metrics_1.getMetricsLogger)({
-                apiKey: this.config.apiKey,
-                datadogSite: this.config.datadogSite,
-                defaultTags: [`cli_version:${this.cliVersion}`],
-                prefix: 'datadog.ci.dsyms.',
-            });
-            const apiKeyValidator = (0, apikey_1.newApiKeyValidator)({
-                apiKey: this.config.apiKey,
-                datadogSite: this.config.datadogSite,
-                metricsLogger: metricsLogger.logger,
-            });
-            const initialTime = Date.now();
-            const tmpDirectory = yield (0, utils_2.createUniqueTmpDirectory)();
+        });
+    }
+    createServices() {
+        const metricsLogger = (0, metrics_1.getMetricsLogger)({
+            apiKey: this.config.apiKey,
+            datadogSite: this.config.datadogSite,
+            defaultTags: [`cli_version:${this.cliVersion}`],
+            prefix: 'datadog.ci.dsyms.',
+        });
+        const apiKeyValidator = (0, apikey_1.newApiKeyValidator)({
+            apiKey: this.config.apiKey,
+            datadogSite: this.config.datadogSite,
+            metricsLogger: metricsLogger.logger,
+        });
+        return { metricsLogger, apiKeyValidator };
+    }
+    processAndUploadDsyms(tmpDirectory, metricsLogger, apiKeyValidator) {
+        return __awaiter(this, void 0, void 0, function* () {
             const intermediateDirectory = (0, utils_1.buildPath)(tmpDirectory, 'datadog-ci', 'dsyms', 'intermediate');
             const uploadDirectory = (0, utils_1.buildPath)(tmpDirectory, 'datadog-ci', 'dsyms', 'upload');
             this.context.stdout.write((0, renderer_1.renderCommandDetail)(intermediateDirectory, uploadDirectory));
-            // The CLI input path can be a folder or `.zip` archive with `*.dSYM` files.
-            // In case of `.zip`, extract it to temporary location, so it can be handled the same way as folder.
-            let dSYMsSearchDirectory = this.basePath;
+            const searchDirectory = yield this.prepareSearchDirectory(tmpDirectory);
+            const dsyms = yield this.findDsyms(searchDirectory);
+            const thinDsyms = yield this.processDsyms(dsyms, intermediateDirectory);
+            const compressedDsyms = yield this.compressDsyms(thinDsyms, uploadDirectory);
+            const requestBuilder = this.createRequestBuilder();
+            const uploadFunction = this.createUploadFunction(requestBuilder, metricsLogger, apiKeyValidator);
+            return (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, compressedDsyms, uploadFunction);
+        });
+    }
+    prepareSearchDirectory(tmpDirectory) {
+        return __awaiter(this, void 0, void 0, function* () {
             if (yield (0, utils_2.isZipFile)(this.basePath)) {
                 yield (0, utils_2.unzipArchiveToDirectory)(this.basePath, tmpDirectory);
-                dSYMsSearchDirectory = tmpDirectory;
-            }
-            const dsyms = yield this.findDSYMsInDirectory(dSYMsSearchDirectory);
-            // Reduce dSYMs size by extracting arch slices from fat dSYMs to separate single-arch dSYMs in intermediate location.
-            // This is to avoid exceeding intake limit whenever possible.
-            const slimDSYMs = yield this.thinDSYMs(dsyms, intermediateDirectory);
-            // Compress each dSYM into single `.zip` archive.
-            const compressedDSYMs = yield this.compressDSYMsToDirectory(slimDSYMs, uploadDirectory);
-            const requestBuilder = this.getRequestBuilder();
-            const uploadDSYM = this.uploadDSYM(requestBuilder, metricsLogger, apiKeyValidator);
-            try {
-                const results = yield (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, compressedDSYMs, uploadDSYM);
-                const totalTime = (Date.now() - initialTime) / 1000;
-                this.context.stdout.write((0, renderer_1.renderSuccessfulCommand)(results, totalTime, this.dryRun));
-                metricsLogger.logger.gauge('duration', totalTime);
-                return 0;
+                return tmpDirectory;
             }
-            catch (error) {
-                if (error instanceof errors_1.InvalidConfigurationError) {
-                    this.context.stdout.write((0, renderer_1.renderConfigurationError)(error));
-                    return 1;
+            return this.basePath;
+        });
+    }
+    findDsyms(directoryPath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const dsymPaths = (0, glob_1.globSync)((0, utils_1.buildPath)(directoryPath, '**/*.dSYM'));
+            const results = yield Promise.all(dsymPaths.map((bundle) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const { stdout } = yield (0, utils_2.executeDwarfdump)(bundle);
+                    const dwarf = this.parseDwarfdumpOutput(stdout);
+                    return [{ bundle, dwarf }];
                 }
-                // Otherwise unknown error, let's propagate the exception
-                throw error;
-            }
-            finally {
-                yield (0, utils_2.deleteDirectory)(tmpDirectory);
+                catch (_a) {
+                    this.context.stdout.write((0, renderer_1.renderInvalidDsymWarning)(bundle));
+                    return [];
+                }
+            })));
+            return results.flat();
+        });
+    }
+    /**
+     * Parses the output of `dwarfdump --uuid` command (ref.: https://www.unix.com/man-page/osx/1/dwarfdump/).
+     * It returns one or many DWARF UUID and arch read from the output.
+     *
+     * Example `dwarfdump --uuid` output:
+     * ```
+     * $ dwarfdump --uuid DDTest.framework.dSYM
+     * UUID: C8469F85-B060-3085-B69D-E46C645560EA (armv7) DDTest.framework.dSYM/Contents/Resources/DWARF/DDTest
+     * UUID: 06EE3D68-D605-3E92-B92D-2F48C02A505E (arm64) DDTest.framework.dSYM/Contents/Resources/DWARF/DDTest
+     * ```
+     */
+    parseDwarfdumpOutput(output) {
+        const lineRegexp = /UUID: ([0-9A-F]{8}-(?:[0-9A-F]{4}-){3}[0-9A-F]{12}) \(([a-z0-9_]+)\) (.+)/;
+        return output
+            .split('\n')
+            .map((line) => {
+            const match = line.match(lineRegexp);
+            return match ? [{ uuid: match[1], arch: match[2], object: match[3] }] : [];
+        })
+            .flat();
+    }
+    /**
+     * It takes `N` dSYMs and returns `N` or more dSYMs. If a dSYM includes more than one arch slice,
+     * it will be thinned by extracting each arch to a new dSYM in `output`.
+     */
+    processDsyms(dsyms, output) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield fs_1.promises.mkdir(output, { recursive: true });
+            const results = yield Promise.all(dsyms.map((dsym) => __awaiter(this, void 0, void 0, function* () {
+                // Reduce dSYMs size by extracting single UUIDs and arch slices from fat dSYMs to separate
+                // single-arch dSYMs in intermediate location. This is to avoid exceeding intake limit whenever possible.
+                return dsym.dwarf.length > 1 ? this.thinDsym(dsym, output) : [dsym];
+            })));
+            return results.flat();
+        });
+    }
+    /**
+     * It takes fat dSYM as input and returns multiple dSYMs by extracting **each arch**
+     * to separate dSYM file. New files are saved to `output` and named by their object uuid (`<uuid>.dSYM`).
+     *
+     * For example, given `<source path>/Foo.dSYM/Contents/Resources/DWARF/Foo` dSYM with two arch slices: `arm64` (uuid1)
+     * and `x86_64` (uuid2), it will:
+     * - create `<intermediate path>/<uuid1>.dSYM/Contents/Resources/DWARF/Foo` for `arm64`,
+     * - create `<intermediate path>/<uuid2>.dSYM/Contents/Resources/DWARF/Foo` for `x86_64`.
+     */
+    thinDsym(dsym, output) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const results = yield Promise.all(dsym.dwarf.map((dwarf) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    yield metricsLogger.flush();
+                    const bundle = (0, utils_1.buildPath)(output, `${dwarf.uuid}.dSYM`);
+                    const object = (0, utils_1.buildPath)(bundle, upath_1.default.relative(dsym.bundle, dwarf.object));
+                    yield fs_1.promises.mkdir(upath_1.default.dirname(object), { recursive: true });
+                    try {
+                        // Attempt to extract the single arch object file.
+                        // We could use the `lipo -archs` command to get the list of archs,
+                        // but it's more straightforward to just attempt to extract
+                        // the single arch.
+                        yield (0, utils_2.executeLipo)(dwarf.object, dwarf.arch, object);
+                    }
+                    catch (_a) {
+                        // The thinning using `lipo` failed, meaning the dSYM is already
+                        // a single arch dSYM. Copy the object file to the new dSYM.
+                        yield fs_1.promises.copyFile(dwarf.object, object);
+                    }
+                    yield this.copyInfoPlist(dsym.bundle, bundle);
+                    return [{ bundle, dwarf: [Object.assign(Object.assign({}, dwarf), { object })] }];
                 }
-                catch (err) {
-                    this.context.stdout.write(`WARN: ${err}\n`);
+                catch (error) {
+                    this.context.stdout.write((0, renderer_1.renderDSYMSlimmingFailure)(dsym, dwarf, error));
+                    return [];
                 }
+            })));
+            return results.flat();
+        });
+    }
+    copyInfoPlist(src, dst) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const infoPlistPaths = (0, glob_1.globSync)((0, utils_1.buildPath)(src, '**/Info.plist'));
+            if (infoPlistPaths.length === 0) {
+                return;
             }
+            const infoPlistPath = infoPlistPaths[0];
+            const newInfoPlistPath = (0, utils_1.buildPath)(dst, upath_1.default.relative(src, infoPlistPath));
+            yield fs_1.promises.mkdir(upath_1.default.dirname(newInfoPlistPath), { recursive: true });
+            yield fs_1.promises.copyFile(infoPlistPath, newInfoPlistPath);
+        });
+    }
+    compressDsyms(dsyms, output) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield fs_1.promises.mkdir(output, { recursive: true });
+            return Promise.all(dsyms.map((dsym) => __awaiter(this, void 0, void 0, function* () {
+                const archivePath = (0, utils_1.buildPath)(output, `${dsym.dwarf[0].uuid}.zip`);
+                yield (0, utils_2.zipDirectoryToArchive)(dsym.bundle, archivePath);
+                return new interfaces_1.CompressedDsym(archivePath, dsym);
+            })));
         });
     }
-    getRequestBuilder() {
+    createRequestBuilder() {
         if (!this.config.apiKey) {
             throw new errors_1.InvalidConfigurationError(`Missing ${chalk_1.default.bold('DATADOG_API_KEY')} in your environment.`);
         }
@@ -260,25 +292,25 @@ class UploadCommand extends clipanion_1.Command {
             overrideUrl: 'api/v2/srcmap',
         });
     }
-    uploadDSYM(requestBuilder, metricsLogger, apiKeyValidator) {
-        return (dSYM) => __awaiter(this, void 0, void 0, function* () {
-            const payload = dSYM.asMultipartPayload();
+    createUploadFunction(requestBuilder, metricsLogger, apiKeyValidator) {
+        return (dsym) => __awaiter(this, void 0, void 0, function* () {
+            const payload = dsym.asMultipartPayload();
             if (this.dryRun) {
-                this.context.stdout.write(`[DRYRUN] ${(0, renderer_1.renderUpload)(dSYM)}`);
+                this.context.stdout.write(`[DRYRUN] ${(0, renderer_1.renderUpload)(dsym)}`);
                 return upload_1.UploadStatus.Success;
             }
             return (0, upload_1.upload)(requestBuilder)(payload, {
                 apiKeyValidator,
                 onError: (e) => {
-                    this.context.stdout.write((0, renderer_1.renderFailedUpload)(dSYM, e.message));
+                    this.context.stdout.write((0, renderer_1.renderFailedUpload)(dsym, e.message));
                     metricsLogger.logger.increment('failed', 1);
                 },
                 onRetry: (e, attempts) => {
-                    this.context.stdout.write((0, renderer_1.renderRetriedUpload)(dSYM, e.message, attempts));
+                    this.context.stdout.write((0, renderer_1.renderRetriedUpload)(dsym, e.message, attempts));
                     metricsLogger.logger.increment('retries', 1);
                 },
                 onUpload: () => {
-                    this.context.stdout.write((0, renderer_1.renderUpload)(dSYM));
+                    this.context.stdout.write((0, renderer_1.renderUpload)(dsym));
                 },
                 retries: 5,
             });

package/dist/commands/dsyms/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/dsyms/upload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/dsyms/upload.ts"],"names":[],"mappings":"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"}

package/dist/commands/junit/utils.d.ts

@@ -1,4 +1,4 @@
 import { SpanTags } from '../../helpers/interfaces';
-export declare const getBaseUrl: () => string;
-export declare const getTestRunsUrl: (spanTags: SpanTags) => string;
+export declare const getTestRunsUrlPath: (spanTags: SpanTags, queryPrefix?: string) => string;
+export declare const getTestRunsUrl: (spanTags: SpanTags, queryPrefix?: string) => string;
 export declare const getTestCommitRedirectURL: (spanTags: SpanTags, service?: string, env?: string) => string;

package/dist/commands/junit/utils.js

@@ -1,26 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTestCommitRedirectURL = exports.getTestRunsUrl = exports.getBaseUrl = void 0;
+exports.getTestCommitRedirectURL = exports.getTestRunsUrl = exports.getTestRunsUrlPath = void 0;
 const app_1 = require("../../helpers/app");
 const tags_1 = require("../../helpers/tags");
-const getBaseUrl = () => {
-    const site = process.env.DATADOG_SITE || process.env.DD_SITE || 'datadoghq.com';
-    const subdomain = process.env.DD_SUBDOMAIN || '';
-    return (0, app_1.getCommonAppBaseURL)(site, subdomain);
-};
-exports.getBaseUrl = getBaseUrl;
-const getTestRunsUrl = (spanTags) => {
+const getTestRunsUrlPath = (spanTags, queryPrefix = '') => {
     if (!spanTags[tags_1.CI_PIPELINE_URL] && !spanTags[tags_1.CI_JOB_URL]) {
         return '';
     }
-    let query = '';
+    let query = queryPrefix;
     if (spanTags[tags_1.CI_JOB_URL]) {
         query += ` @ci.job.url:"${spanTags[tags_1.CI_JOB_URL]}"`;
     }
     else if (spanTags[tags_1.CI_PIPELINE_URL]) {
         query += ` @ci.pipeline.url:"${spanTags[tags_1.CI_PIPELINE_URL]}"`;
     }
-    return `${(0, exports.getBaseUrl)()}ci/test-runs?query=${encodeURIComponent(query)}`;
+    return `ci/test-runs?query=${encodeURIComponent(query)}`;
+};
+exports.getTestRunsUrlPath = getTestRunsUrlPath;
+const getTestRunsUrl = (spanTags, queryPrefix = '') => {
+    return `${(0, app_1.getBaseUrl)()}/${(0, exports.getTestRunsUrlPath)(spanTags, queryPrefix)}`;
 };
 exports.getTestRunsUrl = getTestRunsUrl;
 const getTestCommitRedirectURL = (spanTags, service, env) => {
@@ -31,7 +29,7 @@ const getTestCommitRedirectURL = (spanTags, service, env) => {
     const encodedService = encodeURIComponent(service);
     const encodedBranch = encodeURIComponent(`${spanTags[tags_1.GIT_BRANCH]}`);
     const commitSha = `${spanTags[tags_1.GIT_SHA]}`;
-    let url = `${(0, exports.getBaseUrl)()}ci/redirect/tests/${encodedRepoUrl}/-/${encodedService}/-/${encodedBranch}/-/${commitSha}`;
+    let url = `${(0, app_1.getBaseUrl)()}ci/redirect/tests/${encodedRepoUrl}/-/${encodedService}/-/${encodedBranch}/-/${commitSha}`;
     if (env) {
         url += `?env=${encodeURIComponent(env)}`;
     }

package/dist/commands/junit/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/junit/utils.ts"],"names":[],"mappings":";;;AAAA,2CAAqD;AAErD,6CAAuG;AAEhG,MAAM,UAAU,GAAG,GAAG,EAAE;IAC7B,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,eAAe,CAAA;IAC/E,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAA;IAEhD,OAAO,IAAA,yBAAmB,EAAC,IAAI,EAAE,SAAS,CAAC,CAAA;AAC7C,CAAC,CAAA;AALY,QAAA,UAAU,cAKtB;AAEM,MAAM,cAAc,GAAG,CAAC,QAAkB,EAAU,EAAE;IAC3D,IAAI,CAAC,QAAQ,CAAC,sBAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAU,CAAC,EAAE;QACvD,OAAO,EAAE,CAAA;KACV;IAED,IAAI,KAAK,GAAG,EAAE,CAAA;IACd,IAAI,QAAQ,CAAC,iBAAU,CAAC,EAAE;QACxB,KAAK,IAAI,iBAAiB,QAAQ,CAAC,iBAAU,CAAC,GAAG,CAAA;KAClD;SAAM,IAAI,QAAQ,CAAC,sBAAe,CAAC,EAAE;QACpC,KAAK,IAAI,sBAAsB,QAAQ,CAAC,sBAAe,CAAC,GAAG,CAAA;KAC5D;IAED,OAAO,GAAG,IAAA,kBAAU,GAAE,sBAAsB,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAA;AACzE,CAAC,CAAA;AAbY,QAAA,cAAc,kBAa1B;AAEM,MAAM,wBAAwB,GAAG,CAAC,QAAkB,EAAE,OAAgB,EAAE,GAAY,EAAU,EAAE;IACrG,IAAI,CAAC,QAAQ,CAAC,yBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAO,CAAC,IAAI,CAAC,OAAO,EAAE;QAC5F,OAAO,EAAE,CAAA;KACV;IAED,MAAM,cAAc,GAAG,kBAAkB,CAAC,GAAG,QAAQ,CAAC,yBAAkB,CAAC,EAAE,CAAC,CAAA;IAC5E,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAClD,MAAM,aAAa,GAAG,kBAAkB,CAAC,GAAG,QAAQ,CAAC,iBAAU,CAAC,EAAE,CAAC,CAAA;IACnE,MAAM,SAAS,GAAG,GAAG,QAAQ,CAAC,cAAO,CAAC,EAAE,CAAA;IAExC,IAAI,GAAG,GAAG,GAAG,IAAA,kBAAU,GAAE,qBAAqB,cAAc,MAAM,cAAc,MAAM,aAAa,MAAM,SAAS,EAAE,CAAA;IACpH,IAAI,GAAG,EAAE;QACP,GAAG,IAAI,QAAQ,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAA;KACzC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAhBY,QAAA,wBAAwB,4BAgBpC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/junit/utils.ts"],"names":[],"mappings":";;;AAAA,2CAA4C;AAE5C,6CAAuG;AAEhG,MAAM,kBAAkB,GAAG,CAAC,QAAkB,EAAE,WAAW,GAAG,EAAE,EAAU,EAAE;IACjF,IAAI,CAAC,QAAQ,CAAC,sBAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAU,CAAC,EAAE;QACvD,OAAO,EAAE,CAAA;KACV;IAED,IAAI,KAAK,GAAG,WAAW,CAAA;IACvB,IAAI,QAAQ,CAAC,iBAAU,CAAC,EAAE;QACxB,KAAK,IAAI,iBAAiB,QAAQ,CAAC,iBAAU,CAAC,GAAG,CAAA;KAClD;SAAM,IAAI,QAAQ,CAAC,sBAAe,CAAC,EAAE;QACpC,KAAK,IAAI,sBAAsB,QAAQ,CAAC,sBAAe,CAAC,GAAG,CAAA;KAC5D;IAED,OAAO,sBAAsB,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAA;AAC1D,CAAC,CAAA;AAbY,QAAA,kBAAkB,sBAa9B;AAEM,MAAM,cAAc,GAAG,CAAC,QAAkB,EAAE,WAAW,GAAG,EAAE,EAAU,EAAE;IAC7E,OAAO,GAAG,IAAA,gBAAU,GAAE,IAAI,IAAA,0BAAkB,EAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAA;AACvE,CAAC,CAAA;AAFY,QAAA,cAAc,kBAE1B;AAEM,MAAM,wBAAwB,GAAG,CAAC,QAAkB,EAAE,OAAgB,EAAE,GAAY,EAAU,EAAE;IACrG,IAAI,CAAC,QAAQ,CAAC,yBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAO,CAAC,IAAI,CAAC,OAAO,EAAE;QAC5F,OAAO,EAAE,CAAA;KACV;IAED,MAAM,cAAc,GAAG,kBAAkB,CAAC,GAAG,QAAQ,CAAC,yBAAkB,CAAC,EAAE,CAAC,CAAA;IAC5E,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAA;IAClD,MAAM,aAAa,GAAG,kBAAkB,CAAC,GAAG,QAAQ,CAAC,iBAAU,CAAC,EAAE,CAAC,CAAA;IACnE,MAAM,SAAS,GAAG,GAAG,QAAQ,CAAC,cAAO,CAAC,EAAE,CAAA;IAExC,IAAI,GAAG,GAAG,GAAG,IAAA,gBAAU,GAAE,qBAAqB,cAAc,MAAM,cAAc,MAAM,aAAa,MAAM,SAAS,EAAE,CAAA;IACpH,IAAI,GAAG,EAAE;QACP,GAAG,IAAI,QAAQ,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAA;KACzC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAhBY,QAAA,wBAAwB,4BAgBpC"}

package/dist/commands/lambda/constants.d.ts

@@ -50,13 +50,10 @@ export declare const CORECLR_PROFILER_PATH = "/opt/datadog/Datadog.Trace.ClrProf
 export declare const DD_DOTNET_TRACER_HOME = "/opt/datadog";
 export declare const API_KEY_SECRET_ARN_ENV_VAR = "DD_API_KEY_SECRET_ARN";
 export declare const KMS_API_KEY_ENV_VAR = "DD_KMS_API_KEY";
-export declare const TRACE_ENABLED_ENV_VAR = "DD_TRACE_ENABLED";
 export declare const MERGE_XRAY_TRACES_ENV_VAR = "DD_MERGE_XRAY_TRACES";
 export declare const FLUSH_TO_LOG_ENV_VAR = "DD_FLUSH_TO_LOG";
-export declare const LOG_LEVEL_ENV_VAR = "DD_LOG_LEVEL";
 export declare const LOG_ENABLED_ENV_VAR = "DD_SERVERLESS_LOGS_ENABLED";
 export declare const LAMBDA_HANDLER_ENV_VAR = "DD_LAMBDA_HANDLER";
-export declare const EXTRA_TAGS_ENV_VAR = "DD_TAGS";
 export declare const CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = "DD_CAPTURE_LAMBDA_PAYLOAD";
 export declare const APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR = "DD_APM_FLUSH_DEADLINE_MILLISECONDS";
 export declare const APPSEC_ENABLED_ENV_VAR = "DD_SERVERLESS_APPSEC_ENABLED";
@@ -64,9 +61,6 @@ export declare const ENABLE_PROFILING_ENV_VAR = "CORECLR_ENABLE_PROFILING";
 export declare const PROFILER_ENV_VAR = "CORECLR_PROFILER";
 export declare const PROFILER_PATH_ENV_VAR = "CORECLR_PROFILER_PATH";
 export declare const DOTNET_TRACER_HOME_ENV_VAR = "DD_DOTNET_TRACER_HOME";
-export declare const DD_LLMOBS_ENABLED_ENV_VAR = "DD_LLMOBS_ENABLED";
-export declare const DD_LLMOBS_ML_APP_ENV_VAR = "DD_LLMOBS_ML_APP";
-export declare const DD_LLMOBS_AGENTLESS_ENABLED_ENV_VAR = "DD_LLMOBS_AGENTLESS_ENABLED";
 export declare const CI_API_KEY_SECRET_ARN_ENV_VAR = "DATADOG_API_KEY_SECRET_ARN";
 export declare const CI_KMS_API_KEY_ENV_VAR = "DATADOG_KMS_API_KEY";
 export declare const AWS_ACCESS_KEY_ID_ENV_VAR = "AWS_ACCESS_KEY_ID";
@@ -74,7 +68,6 @@ export declare const AWS_SECRET_ACCESS_KEY_ENV_VAR = "AWS_SECRET_ACCESS_KEY";
 export declare const AWS_DEFAULT_REGION_ENV_VAR = "AWS_DEFAULT_REGION";
 export declare const AWS_SESSION_TOKEN_ENV_VAR = "AWS_SESSION_TOKEN";
 export declare const AWS_SHARED_CREDENTIALS_FILE_ENV_VAR = "AWS_SHARED_CREDENTIALS_FILE";
-export declare const EXTRA_TAGS_REG_EXP: RegExp;
 export declare const AWS_ACCESS_KEY_ID_REG_EXP: RegExp;
 export declare const AWS_SECRET_ACCESS_KEY_REG_EXP: RegExp;
 export declare const AWS_SECRET_ARN_REG_EXP: RegExp;

package/dist/commands/lambda/constants.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AWS_SECRET_ARN_REG_EXP = exports.AWS_SECRET_ACCESS_KEY_REG_EXP = exports.AWS_ACCESS_KEY_ID_REG_EXP = exports.EXTRA_TAGS_REG_EXP = exports.AWS_SHARED_CREDENTIALS_FILE_ENV_VAR = exports.AWS_SESSION_TOKEN_ENV_VAR = exports.AWS_DEFAULT_REGION_ENV_VAR = exports.AWS_SECRET_ACCESS_KEY_ENV_VAR = exports.AWS_ACCESS_KEY_ID_ENV_VAR = exports.CI_KMS_API_KEY_ENV_VAR = exports.CI_API_KEY_SECRET_ARN_ENV_VAR = exports.DD_LLMOBS_AGENTLESS_ENABLED_ENV_VAR = exports.DD_LLMOBS_ML_APP_ENV_VAR = exports.DD_LLMOBS_ENABLED_ENV_VAR = exports.DOTNET_TRACER_HOME_ENV_VAR = exports.PROFILER_PATH_ENV_VAR = exports.PROFILER_ENV_VAR = exports.ENABLE_PROFILING_ENV_VAR = exports.APPSEC_ENABLED_ENV_VAR = exports.APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR = exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = exports.EXTRA_TAGS_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_ENABLED_ENV_VAR = exports.LOG_LEVEL_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.TRACE_ENABLED_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_SECRET_ARN_ENV_VAR = exports.DD_DOTNET_TRACER_HOME = exports.CORECLR_PROFILER_PATH = exports.CORECLR_PROFILER = exports.CORECLR_ENABLE_PROFILING = exports.AWS_LAMBDA_EXEC_WRAPPER = exports.AWS_LAMBDA_EXEC_WRAPPER_VAR = exports.TAG_VERSION_NAME = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.NODE_HANDLER_LOCATION = exports.PYTHON_HANDLER_LOCATION = exports.ARM_LAYER_SUFFIX = exports.ARM64_ARCHITECTURE = exports.ARM_LAYERS = exports.RUNTIME_LOOKUP = exports.RuntimeType = exports.LAYER_LOOKUP = exports.EXTENSION_LAYER_KEY = exports.DD_LAMBDA_EXTENSION_LAYER_NAME = void 0;
-exports.EXPONENTIAL_BACKOFF_RETRY_STRATEGY = exports.LAMBDA_PROJECT_FILES = exports.FRAMEWORK_FILES_MAPPING = exports.DeploymentFrameworks = exports.SKIP_MASKING_LAMBDA_ENV_VARS = exports.DATADOG_APP_KEY_REG_EXP = exports.DATADOG_API_KEY_REG_EXP = void 0;
+exports.EXPONENTIAL_BACKOFF_RETRY_STRATEGY = exports.LAMBDA_PROJECT_FILES = exports.FRAMEWORK_FILES_MAPPING = exports.DeploymentFrameworks = exports.SKIP_MASKING_LAMBDA_ENV_VARS = exports.DATADOG_APP_KEY_REG_EXP = exports.DATADOG_API_KEY_REG_EXP = exports.AWS_SECRET_ARN_REG_EXP = exports.AWS_SECRET_ACCESS_KEY_REG_EXP = exports.AWS_ACCESS_KEY_ID_REG_EXP = exports.AWS_SHARED_CREDENTIALS_FILE_ENV_VAR = exports.AWS_SESSION_TOKEN_ENV_VAR = exports.AWS_DEFAULT_REGION_ENV_VAR = exports.AWS_SECRET_ACCESS_KEY_ENV_VAR = exports.AWS_ACCESS_KEY_ID_ENV_VAR = exports.CI_KMS_API_KEY_ENV_VAR = exports.CI_API_KEY_SECRET_ARN_ENV_VAR = exports.DOTNET_TRACER_HOME_ENV_VAR = exports.PROFILER_PATH_ENV_VAR = exports.PROFILER_ENV_VAR = exports.ENABLE_PROFILING_ENV_VAR = exports.APPSEC_ENABLED_ENV_VAR = exports.APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR = exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = exports.LAMBDA_HANDLER_ENV_VAR = exports.LOG_ENABLED_ENV_VAR = exports.FLUSH_TO_LOG_ENV_VAR = exports.MERGE_XRAY_TRACES_ENV_VAR = exports.KMS_API_KEY_ENV_VAR = exports.API_KEY_SECRET_ARN_ENV_VAR = exports.DD_DOTNET_TRACER_HOME = exports.CORECLR_PROFILER_PATH = exports.CORECLR_PROFILER = exports.CORECLR_ENABLE_PROFILING = exports.AWS_LAMBDA_EXEC_WRAPPER = exports.AWS_LAMBDA_EXEC_WRAPPER_VAR = exports.TAG_VERSION_NAME = exports.SUBSCRIPTION_FILTER_NAME = exports.GOVCLOUD_LAYER_AWS_ACCOUNT = exports.DEFAULT_LAYER_AWS_ACCOUNT = exports.NODE_HANDLER_LOCATION = exports.PYTHON_HANDLER_LOCATION = exports.ARM_LAYER_SUFFIX = exports.ARM64_ARCHITECTURE = exports.ARM_LAYERS = exports.RUNTIME_LOOKUP = exports.RuntimeType = exports.LAYER_LOOKUP = exports.EXTENSION_LAYER_KEY = exports.DD_LAMBDA_EXTENSION_LAYER_NAME = void 0;
 const util_retry_1 = require("@smithy/util-retry");
 const constants_1 = require("../../constants");
 exports.DD_LAMBDA_EXTENSION_LAYER_NAME = 'Datadog-Extension';
@@ -91,13 +90,10 @@ exports.DD_DOTNET_TRACER_HOME = '/opt/datadog';
 // Environment variables used in the Lambda environment
 exports.API_KEY_SECRET_ARN_ENV_VAR = 'DD_API_KEY_SECRET_ARN';
 exports.KMS_API_KEY_ENV_VAR = 'DD_KMS_API_KEY';
-exports.TRACE_ENABLED_ENV_VAR = 'DD_TRACE_ENABLED';
 exports.MERGE_XRAY_TRACES_ENV_VAR = 'DD_MERGE_XRAY_TRACES';
 exports.FLUSH_TO_LOG_ENV_VAR = 'DD_FLUSH_TO_LOG';
-exports.LOG_LEVEL_ENV_VAR = 'DD_LOG_LEVEL';
 exports.LOG_ENABLED_ENV_VAR = 'DD_SERVERLESS_LOGS_ENABLED';
 exports.LAMBDA_HANDLER_ENV_VAR = 'DD_LAMBDA_HANDLER';
-exports.EXTRA_TAGS_ENV_VAR = 'DD_TAGS';
 exports.CAPTURE_LAMBDA_PAYLOAD_ENV_VAR = 'DD_CAPTURE_LAMBDA_PAYLOAD';
 exports.APM_FLUSH_DEADLINE_MILLISECONDS_ENV_VAR = 'DD_APM_FLUSH_DEADLINE_MILLISECONDS';
 exports.APPSEC_ENABLED_ENV_VAR = 'DD_SERVERLESS_APPSEC_ENABLED';
@@ -105,9 +101,6 @@ exports.ENABLE_PROFILING_ENV_VAR = 'CORECLR_ENABLE_PROFILING';
 exports.PROFILER_ENV_VAR = 'CORECLR_PROFILER';
 exports.PROFILER_PATH_ENV_VAR = 'CORECLR_PROFILER_PATH';
 exports.DOTNET_TRACER_HOME_ENV_VAR = 'DD_DOTNET_TRACER_HOME';
-exports.DD_LLMOBS_ENABLED_ENV_VAR = 'DD_LLMOBS_ENABLED';
-exports.DD_LLMOBS_ML_APP_ENV_VAR = 'DD_LLMOBS_ML_APP';
-exports.DD_LLMOBS_AGENTLESS_ENABLED_ENV_VAR = 'DD_LLMOBS_AGENTLESS_ENABLED';
 // Environment variables used by Datadog CI
 exports.CI_API_KEY_SECRET_ARN_ENV_VAR = 'DATADOG_API_KEY_SECRET_ARN';
 exports.CI_KMS_API_KEY_ENV_VAR = 'DATADOG_KMS_API_KEY';
@@ -116,11 +109,6 @@ exports.AWS_SECRET_ACCESS_KEY_ENV_VAR = 'AWS_SECRET_ACCESS_KEY';
 exports.AWS_DEFAULT_REGION_ENV_VAR = 'AWS_DEFAULT_REGION';
 exports.AWS_SESSION_TOKEN_ENV_VAR = 'AWS_SESSION_TOKEN';
 exports.AWS_SHARED_CREDENTIALS_FILE_ENV_VAR = 'AWS_SHARED_CREDENTIALS_FILE';
-// DD_TAGS Regular Expression
-// This RegExp ensures that the --extra-tags string
-// matches a list of <key>:<value> separated by commas
-// such as: layer:api,team:intake
-exports.EXTRA_TAGS_REG_EXP = /^(([a-zA-Z]+)[\w\-/\.]*:[^,]+)+((\,)([a-zA-Z]+)[\w\-/\.]*:[^,]+)*$/g;
 exports.AWS_ACCESS_KEY_ID_REG_EXP = /(?<![A-Z0-9])[A-Z0-9]{20}(?![A-Z0-9])/g;
 exports.AWS_SECRET_ACCESS_KEY_REG_EXP = /(?<![A-Za-z0-9/+=])[A-Za-z0-9/+=]{40}(?![A-Za-z0-9/+=])/g;
 exports.AWS_SECRET_ARN_REG_EXP = /arn:aws:secretsmanager:[\w-]+:\d{12}:secret:.+/;
@@ -132,9 +120,9 @@ exports.SKIP_MASKING_LAMBDA_ENV_VARS = new Set([
     exports.API_KEY_SECRET_ARN_ENV_VAR,
     exports.DOTNET_TRACER_HOME_ENV_VAR,
     constants_1.ENVIRONMENT_ENV_VAR,
-    exports.EXTRA_TAGS_ENV_VAR,
+    constants_1.DD_TAGS_ENV_VAR,
     exports.LAMBDA_HANDLER_ENV_VAR,
-    exports.LOG_LEVEL_ENV_VAR,
+    constants_1.DD_LOG_LEVEL_ENV_VAR,
     exports.KMS_API_KEY_ENV_VAR,
     exports.PROFILER_ENV_VAR,
     exports.PROFILER_PATH_ENV_VAR,