@datadog/datadog-ci 2.40.3 → 2.42.0

package/README.md

@@ -104,6 +104,7 @@ The following are **beta** commands, you can enable them with with `DD_BETA_COMM
 
 #### `deployment`
 - `mark`: Mark a CI job as a [deployment](src/commands/deployment). [📚](https://docs.datadoghq.com/continuous_delivery/)
+- `correlate`: [Correlate](src/commands/deployment/) GitOps CD deployments with application repositories CI pipelines. [📚](https://docs.datadoghq.com/continuous_delivery/deployments/argocd#correlate-deployments-with-ci-pipelines)
 
 #### `dora`
 - `deployment`: Send a new deployment event for [DORA Metrics](src/commands/dora) to Datadog. [📚](https://docs.datadoghq.com/dora_metrics/)

package/dist/commands/deployment/cli.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const correlate_1 = require("./correlate");
 const mark_1 = require("./mark");
-module.exports = [mark_1.DeploymentMarkCommand];
+module.exports = [mark_1.DeploymentMarkCommand, correlate_1.DeploymentCorrelateCommand];
 //# sourceMappingURL=cli.js.map

package/dist/commands/deployment/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/commands/deployment/cli.ts"],"names":[],"mappings":";;AAAA,iCAA4C;AAE5C,MAAM,CAAC,OAAO,GAAG,CAAC,4BAAqB,CAAC,CAAA"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/commands/deployment/cli.ts"],"names":[],"mappings":";;AAAA,2CAAsD;AACtD,iCAA4C;AAE5C,MAAM,CAAC,OAAO,GAAG,CAAC,4BAAqB,EAAE,sCAA0B,CAAC,CAAA"}

package/dist/commands/deployment/correlate.d.ts

@@ -0,0 +1,18 @@
+import { Command } from 'clipanion';
+/**
+ * This command collects environment variables and git information to correlate commits from the
+ * source code repository to the configuration repository. This allows to connect pipelines triggering
+ * changes on the configuration repository to deployments from gitOps CD providers
+ */
+export declare class DeploymentCorrelateCommand extends Command {
+    static paths: string[][];
+    static usage: import("clipanion").Usage;
+    private cdProviderParam;
+    private configurationRepo;
+    private dryRun;
+    private config;
+    private logger;
+    execute(): Promise<1 | undefined>;
+    private sendCorrelationData;
+    private validateTags;
+}

package/dist/commands/deployment/correlate.js

@@ -0,0 +1,154 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeploymentCorrelateCommand = void 0;
+const chalk_1 = __importDefault(require("chalk"));
+const clipanion_1 = require("clipanion");
+const simple_git_1 = __importDefault(require("simple-git"));
+const ci_1 = require("../../helpers/ci");
+const get_git_data_1 = require("../../helpers/git/get-git-data");
+const logger_1 = require("../../helpers/logger");
+const retry_1 = require("../../helpers/retry");
+const tags_1 = require("../../helpers/tags");
+const utils_1 = require("../../helpers/utils");
+/**
+ * This command collects environment variables and git information to correlate commits from the
+ * source code repository to the configuration repository. This allows to connect pipelines triggering
+ * changes on the configuration repository to deployments from gitOps CD providers
+ */
+class DeploymentCorrelateCommand extends clipanion_1.Command {
+    constructor() {
+        super(...arguments);
+        this.cdProviderParam = clipanion_1.Option.String('--provider');
+        this.configurationRepo = clipanion_1.Option.String('--config-repo');
+        this.dryRun = clipanion_1.Option.Boolean('--dry-run', false);
+        this.config = {
+            apiKey: process.env.DATADOG_API_KEY || process.env.DD_API_KEY,
+        };
+        this.logger = new logger_1.Logger((s) => this.context.stdout.write(s), logger_1.LogLevel.INFO);
+    }
+    execute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.config.apiKey) {
+                this.logger.error(`Neither ${chalk_1.default.red.bold('DATADOG_API_KEY')} nor ${chalk_1.default.red.bold('DD_API_KEY')} is in your environment.`);
+                return 1;
+            }
+            if (!this.cdProviderParam) {
+                this.logger.error('Missing CD provider. It must be provided with --provider');
+                return 1;
+            }
+            this.cdProviderParam = this.cdProviderParam.toLowerCase();
+            const tags = (0, ci_1.getCISpanTags)() || {};
+            if (!this.validateTags(tags)) {
+                return 1;
+            }
+            let envVars = {};
+            if (tags[tags_1.CI_ENV_VARS]) {
+                envVars = JSON.parse(tags[tags_1.CI_ENV_VARS]);
+                delete tags[tags_1.CI_ENV_VARS];
+            }
+            const ciEnv = Object.assign(Object.assign({}, tags), envVars);
+            const git = (0, simple_git_1.default)({
+                baseDir: process.cwd(),
+                binary: 'git',
+                maxConcurrentProcesses: 2, // max 2 git commands at the same time
+            });
+            const currentBranch = yield (0, get_git_data_1.gitCurrentBranch)(git);
+            if (!currentBranch) {
+                this.logger.error('Could not get current branch');
+                return 1;
+            }
+            let localCommitShas;
+            if (this.configurationRepo) {
+                localCommitShas = yield (0, get_git_data_1.gitLocalCommitShas)(git, currentBranch);
+            }
+            else {
+                ;
+                [this.configurationRepo, localCommitShas] = yield Promise.all([
+                    (0, get_git_data_1.gitRepositoryURL)(git),
+                    (0, get_git_data_1.gitLocalCommitShas)(git, currentBranch),
+                ]);
+            }
+            if (this.configurationRepo === undefined || this.configurationRepo === '') {
+                this.logger.error('Could not retrieve repository URL, check out a repository or provide it with --config-repo');
+                return 1;
+            }
+            yield this.sendCorrelationData(ciEnv[tags_1.CI_PROVIDER_NAME], localCommitShas, ciEnv, this.config.apiKey);
+        });
+    }
+    sendCorrelationData(ciProvider, configCommitShas, ciEnv, apiKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const correlateEvent = {
+                type: 'ci_app_deployment_correlate',
+                attributes: {
+                    ci_provider: ciProvider,
+                    cd_provider: this.cdProviderParam,
+                    config_repo_url: this.configurationRepo,
+                    config_commit_shas: configCommitShas,
+                    ci_env: ciEnv,
+                },
+            };
+            if (this.dryRun) {
+                this.logger.info(`[DRYRUN] Sending correlation event\n data: ` + JSON.stringify(correlateEvent, undefined, 2));
+                return;
+            }
+            const site = process.env.DATADOG_SITE || process.env.DD_SITE || 'datadoghq.com';
+            const baseAPIURL = `https://${(0, utils_1.getApiHostForSite)(site)}`;
+            const request = (0, utils_1.getRequestBuilder)({ baseUrl: baseAPIURL, apiKey });
+            const doRequest = () => request({
+                data: {
+                    data: correlateEvent,
+                },
+                method: 'post',
+                url: '/api/v2/ci/deployments/correlate',
+            });
+            try {
+                yield (0, retry_1.retryRequest)(doRequest, {
+                    maxTimeout: 30000,
+                    minTimeout: 5000,
+                    onRetry: (e, attempt) => {
+                        this.logger.warn(`[attempt ${attempt}] Could not send deployment correlation data. Retrying...: ${e.message}\n`);
+                    },
+                    retries: 5,
+                });
+            }
+            catch (error) {
+                this.logger.error(`Failed to send deployment correlation data: ${error.message}`);
+            }
+        });
+    }
+    validateTags(tags) {
+        if (!tags[tags_1.GIT_REPOSITORY_URL]) {
+            this.logger.error('Could not extract the source code repository URL from the CI environment variables');
+            return false;
+        }
+        if (!tags[tags_1.GIT_SHA]) {
+            this.logger.error('Could not extract the commit SHA from the CI environment variables');
+            return false;
+        }
+        return true;
+    }
+}
+exports.DeploymentCorrelateCommand = DeploymentCorrelateCommand;
+DeploymentCorrelateCommand.paths = [['deployment', 'correlate']];
+DeploymentCorrelateCommand.usage = clipanion_1.Command.Usage({
+    category: 'CI Visibility',
+    description: 'Correlate GitOps CD deployments with CI pipelines.',
+    details: `
+      This command will correlate the pipeline with a GitOps CD deployment.\n
+      See README for additional details.
+    `,
+    examples: [['Correlate an Argo CD deployment', 'datadog-ci deployment correlate --provider argocd']],
+});
+//# sourceMappingURL=correlate.js.map

package/dist/commands/deployment/correlate.js.map

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

package/dist/commands/dsyms/utils.js

@@ -16,7 +16,7 @@ exports.pluralize = exports.getBaseIntakeUrl = exports.executeLipo = exports.exe
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = __importDefault(require("path"));
-const rimraf_1 = require("rimraf");
+const rimraf_1 = __importDefault(require("rimraf"));
 const utils_1 = require("../../helpers/utils");
 const isZipFile = (filepath) => __awaiter(void 0, void 0, void 0, function* () {
     try {
@@ -36,9 +36,7 @@ const createUniqueTmpDirectory = () => __awaiter(void 0, void 0, void 0, functio
     return directoryPath;
 });
 exports.createUniqueTmpDirectory = createUniqueTmpDirectory;
-const deleteDirectory = (directoryPath) => __awaiter(void 0, void 0, void 0, function* () {
-    yield (0, rimraf_1.rimraf)(directoryPath);
-});
+const deleteDirectory = (directoryPath) => __awaiter(void 0, void 0, void 0, function* () { return new Promise((resolve, reject) => (0, rimraf_1.default)(directoryPath, () => resolve())); });
 exports.deleteDirectory = deleteDirectory;
 const zipDirectoryToArchive = (directoryPath, archivePath) => __awaiter(void 0, void 0, void 0, function* () {
     const cwd = path_1.default.dirname(directoryPath);

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

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

package/dist/commands/elf-symbols/elf.d.ts

@@ -10,9 +10,10 @@ export type ElfFileMetadata = {
     gnuBuildId: string;
     goBuildId: string;
     fileHash: string;
-    type: string;
+    elfType: string;
     hasDebugInfo: boolean;
-    hasSymbols: boolean;
+    hasDynamicSymbolTable: boolean;
+    hasSymbolTable: boolean;
     hasCode: boolean;
     error?: Error;
 };
@@ -93,7 +94,8 @@ export declare const isSupportedArch: (arch: string) => boolean;
 export declare const isSupportedElfType: (type: string) => boolean;
 export declare const getSectionInfo: (sections: SectionHeader[]) => {
     hasDebugInfo: boolean;
-    hasSymbols: boolean;
+    hasSymbolTable: boolean;
+    hasDynamicSymbolTable: boolean;
     hasCode: boolean;
 };
 export declare const getElfFileMetadata: (filename: string) => Promise<ElfFileMetadata>;

package/dist/commands/elf-symbols/elf.js

@@ -64,14 +64,6 @@ const SUPPORTED_ARCHS = [
     elf_constants_1.MACHINE_TYPES_DESCRIPTION[elf_constants_1.MachineType.EM_ARM],
 ];
 const SUPPORTED_ELF_TYPES = [elf_constants_1.ELF_TYPES_DESCRIPTION[elf_constants_1.ElfFileType.ET_DYN], elf_constants_1.ELF_TYPES_DESCRIPTION[elf_constants_1.ElfFileType.ET_EXEC]];
-const BFD_TARGET_FOR_ARCH = {
-    [elf_constants_1.MACHINE_TYPES_DESCRIPTION[elf_constants_1.MachineType.EM_AARCH64]]: 'elf64-littleaarch64',
-    [elf_constants_1.MACHINE_TYPES_DESCRIPTION[elf_constants_1.MachineType.EM_X86_64]]: 'elf64-x86_64',
-};
-const GENERIC_BFD_TARGET_FOR_ARCH = {
-    [elf_constants_1.MACHINE_TYPES_DESCRIPTION[elf_constants_1.MachineType.EM_AARCH64]]: 'elf64-little',
-    [elf_constants_1.MACHINE_TYPES_DESCRIPTION[elf_constants_1.MachineType.EM_X86_64]]: 'elf64-little',
-};
 const getBFDTargetForArch = (arch, littleEndian, elfClass) => {
     if (arch === elf_constants_1.MACHINE_TYPES_DESCRIPTION[elf_constants_1.MachineType.EM_X86_64]) {
         return `elf${elfClass}-x86-64`;
@@ -293,9 +285,10 @@ const isSupportedElfType = (type) => {
 exports.isSupportedElfType = isSupportedElfType;
 const getSectionInfo = (sections) => {
     const hasDebugInfo = sections.some((section) => section.name === '.debug_info');
-    const hasSymbols = sections.some((section) => section.name === '.symtab');
+    const hasSymbolTable = sections.some((section) => section.name === '.symtab');
+    const hasDynamicSymbolTable = sections.some((section) => section.name === '.dynsym');
     const hasCode = sections.some((section) => section.name === '.text' && section.sh_type === elf_constants_1.SectionHeaderType.SHT_PROGBITS);
-    return { hasDebugInfo, hasSymbols, hasCode };
+    return { hasDebugInfo, hasSymbolTable, hasDynamicSymbolTable, hasCode };
 };
 exports.getSectionInfo = getSectionInfo;
 const getElfFileMetadata = (filename) => __awaiter(void 0, void 0, void 0, function* () {
@@ -308,9 +301,10 @@ const getElfFileMetadata = (filename) => __awaiter(void 0, void 0, void 0, funct
         gnuBuildId: '',
         goBuildId: '',
         fileHash: '',
-        type: '',
+        elfType: '',
         hasDebugInfo: false,
-        hasSymbols: false,
+        hasSymbolTable: false,
+        hasDynamicSymbolTable: false,
         hasCode: false,
     };
     let fileHandle;
@@ -322,23 +316,31 @@ const getElfFileMetadata = (filename) => __awaiter(void 0, void 0, void 0, funct
             metadata.littleEndian = elfHeader.littleEndian;
             metadata.elfClass = elfHeader.elfClass === elf_constants_1.ElfClass.ELFCLASS64 ? 64 : 32;
             metadata.arch = elf_constants_1.MACHINE_TYPES_DESCRIPTION[elfHeader.e_machine];
-            metadata.type = elf_constants_1.ELF_TYPES_DESCRIPTION[elfHeader.e_type];
+            metadata.elfType = elf_constants_1.ELF_TYPES_DESCRIPTION[elfHeader.e_type];
         }
         metadata.error = error;
         metadata.isElf = isElf;
-        if (!isElf || error || !(0, exports.isSupportedArch)(metadata.arch) || !(0, exports.isSupportedElfType)(metadata.type)) {
+        if (!isElf || error || !(0, exports.isSupportedArch)(metadata.arch) || !(0, exports.isSupportedElfType)(metadata.elfType)) {
             return metadata;
         }
         const sectionHeaders = yield (0, exports.readElfSectionHeaderTable)(reader, elfHeader);
         const { gnuBuildId, goBuildId } = yield (0, exports.getBuildIds)(reader, sectionHeaders, elfHeader);
-        const { hasDebugInfo, hasSymbols, hasCode } = (0, exports.getSectionInfo)(sectionHeaders);
+        const { hasDebugInfo, hasSymbolTable, hasDynamicSymbolTable, hasCode } = (0, exports.getSectionInfo)(sectionHeaders);
         let fileHash = '';
         if (hasCode) {
             // Only compute file hash if the file has code:
             // if the file has no code, it is likely a debug info file and its hash is useless
             fileHash = yield (0, exports.computeFileHash)(filename);
         }
-        Object.assign(metadata, { fileHash, gnuBuildId, goBuildId, hasDebugInfo, hasSymbols, hasCode });
+        Object.assign(metadata, {
+            fileHash,
+            gnuBuildId,
+            goBuildId,
+            hasDebugInfo,
+            hasSymbolTable,
+            hasDynamicSymbolTable,
+            hasCode,
+        });
     }
     catch (error) {
         metadata.error = error;

package/dist/commands/elf-symbols/elf.js.map

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

package/dist/commands/elf-symbols/helpers.js

@@ -17,7 +17,7 @@ const getElfRequestBuilder = (apiKey, cliVersion, site) => (0, utils_1.getReques
     apiKey,
     baseUrl: (0, base_intake_url_1.getBaseSourcemapIntakeUrl)(site),
     headers: new Map([
-        ['DD-EVP-ORIGIN', 'datadog-ci elf-symbols'],
+        ['DD-EVP-ORIGIN', 'datadog-ci_elf-symbols'],
         ['DD-EVP-ORIGIN-VERSION', cliVersion],
     ]),
     overrideUrl: 'api/v2/srcmap',

package/dist/commands/elf-symbols/interfaces.d.ts

@@ -2,13 +2,17 @@ export declare const TYPE_ELF_DEBUG_INFOS = "elf_symbol_file";
 export declare const VALUE_NAME_ELF_DEBUG_INFOS = "elf_symbol_file";
 export declare const ELF_DEBUG_INFOS_FILENAME = "elf_symbol_file";
 export interface MappingMetadata {
-    arch?: string;
     cli_version: string;
+    origin_version: string;
+    arch: string;
+    origin: string;
     git_commit_sha?: string;
     git_repository_url?: string;
-    platform?: string;
     gnu_build_id: string;
     go_build_id: string;
     file_hash: string;
+    symbol_source: string;
+    filename: string;
     type: string;
+    overwrite: boolean;
 }

package/dist/commands/elf-symbols/upload.d.ts

@@ -7,6 +7,8 @@ export declare class UploadCommand extends Command {
     private configPath;
     private maxConcurrency;
     private repositoryUrl;
+    private acceptDynamicSymbolTableAsSymbolSource;
+    private replaceExisting;
     private symbolsLocations;
     private cliVersion;
     private config;
@@ -15,6 +17,7 @@ export declare class UploadCommand extends Command {
     private getApiKeyValidator;
     private getGitDataPayload;
     private getGitMetadata;
+    private getElfSymbolSource;
     private getMappingMetadata;
     private getMetricsLogger;
     private getElfSymbolFiles;

package/dist/commands/elf-symbols/upload.js

@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UploadCommand = void 0;
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
 const clipanion_1 = require("clipanion");
 const glob_1 = __importDefault(require("glob"));
 const apikey_1 = require("../../helpers/apikey");
@@ -61,6 +62,8 @@ class UploadCommand extends clipanion_1.Command {
         this.configPath = clipanion_1.Option.String('--config');
         this.maxConcurrency = clipanion_1.Option.String('--max-concurrency', '20', { validator: validation.isInteger() });
         this.repositoryUrl = clipanion_1.Option.String('--repository-url');
+        this.acceptDynamicSymbolTableAsSymbolSource = clipanion_1.Option.Boolean('--upload-dynamic-symbols', false);
+        this.replaceExisting = clipanion_1.Option.Boolean('--replace-existing', false);
         this.symbolsLocations = clipanion_1.Option.Rest({ required: 1 });
         this.cliVersion = version_1.version;
         this.config = {
@@ -136,17 +139,33 @@ class UploadCommand extends clipanion_1.Command {
             return undefined;
         });
     }
-    getMappingMetadata(gnuBuildId, goBuildId, fileHash, arch) {
+    getElfSymbolSource(elfFileMetadata) {
+        if (elfFileMetadata.hasDebugInfo) {
+            return 'debug_info';
+        }
+        if (elfFileMetadata.hasSymbolTable) {
+            return 'symbol_table';
+        }
+        if (elfFileMetadata.hasDynamicSymbolTable) {
+            return 'dynamic_symbol_table';
+        }
+        return 'none';
+    }
+    getMappingMetadata(elfFileMetadata) {
         var _a, _b;
         return {
-            arch,
-            gnu_build_id: gnuBuildId,
-            go_build_id: goBuildId,
-            file_hash: fileHash,
             cli_version: this.cliVersion,
+            origin_version: this.cliVersion,
+            origin: 'datadog-ci',
+            arch: elfFileMetadata.arch,
+            gnu_build_id: elfFileMetadata.gnuBuildId,
+            go_build_id: elfFileMetadata.goBuildId,
+            file_hash: elfFileMetadata.fileHash,
             git_commit_sha: (_a = this.gitData) === null || _a === void 0 ? void 0 : _a.hash,
             git_repository_url: (_b = this.gitData) === null || _b === void 0 ? void 0 : _b.remote,
-            platform: 'elf',
+            symbol_source: this.getElfSymbolSource(elfFileMetadata),
+            filename: path_1.default.basename(elfFileMetadata.filename),
+            overwrite: this.replaceExisting,
             type: interfaces_1.TYPE_ELF_DEBUG_INFOS,
         };
     }
@@ -182,41 +201,43 @@ class UploadCommand extends clipanion_1.Command {
                 };
             }
             const filesMetadata = [];
-            for (const path of paths) {
-                const pathStat = yield fs_1.default.promises.lstat(path);
+            for (const p of paths) {
+                const pathStat = yield fs_1.default.promises.lstat(p);
                 if (pathStat.isDirectory()) {
                     // check if directory is readable and if not emit a warning
                     // eslint-disable-next-line no-bitwise
-                    yield fs_1.default.promises.access(path, fs_1.default.constants.R_OK | fs_1.default.constants.X_OK).catch(() => {
-                        reportFailure(`Skipped directory ${path} because it is not readable`);
+                    yield fs_1.default.promises.access(p, fs_1.default.constants.R_OK | fs_1.default.constants.X_OK).catch(() => {
+                        reportFailure(`Skipped directory ${p} because it is not readable`);
                     });
                 }
                 else if (pathStat.isFile()) {
                     // check that path is a file and is an ELF file
-                    const metadata = yield (0, elf_1.getElfFileMetadata)(path);
+                    const metadata = yield (0, elf_1.getElfFileMetadata)(p);
                     // handle all possible failures
                     if (!metadata.isElf) {
-                        reportFailure(`Input location ${path} is not an ELF file`);
+                        reportFailure(`Input location ${p} is not an ELF file`);
                         continue;
                     }
                     if (metadata.error) {
-                        reportFailure(`Error reading ELF file ${path}: ${metadata.error.message}`);
+                        reportFailure(`Error reading ELF file ${p}: ${metadata.error.message}`);
                         continue;
                     }
-                    if (!(0, elf_1.isSupportedElfType)(metadata.type)) {
-                        reportFailure(`Skipped ${path} because its not an executable, nor a shared library`);
+                    if (!(0, elf_1.isSupportedElfType)(metadata.elfType)) {
+                        reportFailure(`Skipped ${p} because its not an executable, nor a shared library`);
                         continue;
                     }
                     if (!(0, elf_1.isSupportedArch)(metadata.arch)) {
-                        reportFailure(`Skipped ${path} because it has an unsupported architecture (${metadata.arch})`);
+                        reportFailure(`Skipped ${p} because it has an unsupported architecture (${metadata.arch})`);
                         continue;
                     }
                     if (!(metadata.gnuBuildId || metadata.goBuildId || metadata.fileHash)) {
-                        reportFailure(`Skipped ${path} because it has no build id`);
+                        reportFailure(`Skipped ${p} because it has no build id`);
                         continue;
                     }
-                    if (!metadata.hasDebugInfo && !metadata.hasSymbols) {
-                        reportFailure(`Skipped ${path} because it has no debug info, nor symbols`);
+                    if (!metadata.hasDebugInfo &&
+                        !metadata.hasSymbolTable &&
+                        (!metadata.hasDynamicSymbolTable || !this.acceptDynamicSymbolTableAsSymbolSource)) {
+                        reportFailure(`Skipped ${p} because it has no debug info, nor symbols`);
                         continue;
                     }
                     filesMetadata.push(metadata);
@@ -233,7 +254,10 @@ class UploadCommand extends clipanion_1.Command {
             const buildId = (0, elf_1.getBuildId)(metadata);
             const existing = buildIds.get(buildId);
             if (existing) {
-                if ((metadata.hasDebugInfo && !existing.hasDebugInfo) || (metadata.hasSymbols && !existing.hasSymbols)) {
+                if ((metadata.hasDebugInfo && !existing.hasDebugInfo) ||
+                    (metadata.hasSymbolTable && !existing.hasSymbolTable) ||
+                    (metadata.hasDynamicSymbolTable && !existing.hasDynamicSymbolTable) // this probably should never happen
+                ) {
                     // if we have a duplicate build_id, we keep the one with debug info and symbols
                     this.context.stderr.write((0, renderer_1.renderWarning)(`Duplicate build_id found: ${buildId} in ${metadata.filename} and ${existing.filename} - skipping ${existing.filename} because it has no debug info or symbols`));
                     buildIds.set(buildId, metadata);
@@ -259,7 +283,7 @@ class UploadCommand extends clipanion_1.Command {
             const tmpDirectory = yield (0, utils_2.createUniqueTmpDirectory)();
             try {
                 const results = yield (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, elfFilesMetadata, (fileMetadata) => __awaiter(this, void 0, void 0, function* () {
-                    const metadata = this.getMappingMetadata(fileMetadata.gnuBuildId, fileMetadata.goBuildId, fileMetadata.fileHash, fileMetadata.arch);
+                    const metadata = this.getMappingMetadata(fileMetadata);
                     const outputFilename = (0, elf_1.getOutputFilenameFromBuildId)((0, elf_1.getBuildId)(fileMetadata));
                     const outputFilePath = (0, utils_1.buildPath)(tmpDirectory, outputFilename);
                     yield (0, elf_1.copyElfDebugInfo)(fileMetadata.filename, outputFilePath, fileMetadata, false);
@@ -370,7 +394,7 @@ class UploadCommand extends clipanion_1.Command {
 exports.UploadCommand = UploadCommand;
 UploadCommand.paths = [['elf-symbols', 'upload']];
 UploadCommand.usage = clipanion_1.Command.Usage({
-    category: 'RUM',
+    category: 'Profiling',
     description: 'Upload Elf debug info files to Datadog.',
     details: `
             This command will upload debug info from all Elf files found recursively in the given location in order to symbolicate profiles