@datadog/datadog-ci 3.2.0 → 3.3.1

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

@@ -0,0 +1,412 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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.UploadCommand = void 0;
+const fs_1 = __importDefault(require("fs"));
+const clipanion_1 = require("clipanion");
+const glob_1 = __importDefault(require("glob"));
+const upath_1 = __importDefault(require("upath"));
+const constants_1 = require("../../constants");
+const apikey_1 = require("../../helpers/apikey");
+const concurrency_1 = require("../../helpers/concurrency");
+const env_1 = require("../../helpers/env");
+const fips_1 = require("../../helpers/fips");
+const format_git_sourcemaps_data_1 = require("../../helpers/git/format-git-sourcemaps-data");
+const metrics_1 = require("../../helpers/metrics");
+const upload_1 = require("../../helpers/upload");
+// import {buildPath, DEFAULT_CONFIG_PATHS, execute, resolveConfigFromFileAndEnvironment} from '../../helpers/utils'
+const utils_1 = require("../../helpers/utils");
+const validation = __importStar(require("../../helpers/validation"));
+const validation_1 = require("../../helpers/validation");
+const version_1 = require("../../helpers/version");
+const helpers_1 = require("./helpers");
+const interfaces_1 = require("./interfaces");
+const pe_1 = require("./pe");
+const pe_constants_1 = require("./pe-constants");
+const renderer_1 = require("./renderer");
+class UploadCommand extends clipanion_1.Command {
+    constructor() {
+        var _a, _b;
+        super(...arguments);
+        this.disableGit = clipanion_1.Option.Boolean('--disable-git', false);
+        this.dryRun = clipanion_1.Option.Boolean('--dry-run', false);
+        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.replaceExisting = clipanion_1.Option.Boolean('--replace-existing', false);
+        this.symbolsLocations = clipanion_1.Option.Rest({ required: 1 });
+        this.cliVersion = version_1.version;
+        this.config = {
+            datadogSite: 'datadoghq.com',
+        };
+        this.fips = clipanion_1.Option.Boolean('--fips', false);
+        this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
+        this.fipsConfig = {
+            fips: (_a = (0, env_1.toBoolean)(process.env[constants_1.FIPS_ENV_VAR])) !== null && _a !== void 0 ? _a : false,
+            fipsIgnoreError: (_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
+        };
+    }
+    execute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            (0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
+            if (!(yield this.verifyParameters())) {
+                return 1;
+            }
+            const initialTime = Date.now();
+            this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.dryRun, this.symbolsLocations));
+            this.config = yield (0, utils_1.resolveConfigFromFileAndEnvironment)(this.config, {
+                apiKey: process.env.DATADOG_API_KEY,
+                datadogSite: process.env.DATADOG_SITE,
+            }, {
+                configPath: this.configPath,
+                defaultConfigPaths: utils_1.DEFAULT_CONFIG_PATHS,
+                configFromFileCallback: (configFromFile) => {
+                    (0, validation_1.checkAPIKeyOverride)(process.env.DATADOG_API_KEY, configFromFile.apiKey, this.context.stdout);
+                },
+            });
+            if (!this.disableGit) {
+                this.gitData = yield this.getGitMetadata();
+            }
+            const callResults = [];
+            try {
+                callResults.push(...(yield this.performPESymbolsUpload()));
+                const totalTime = (Date.now() - initialTime) / 1000;
+                this.context.stdout.write((0, renderer_1.renderCommandSummary)(callResults, totalTime, this.dryRun));
+            }
+            catch (e) {
+                this.context.stderr.write((0, renderer_1.renderGeneralizedError)(e));
+                return 1;
+            }
+            return 0;
+        });
+    }
+    getApiKeyValidator(metricsLogger) {
+        return (0, apikey_1.newApiKeyValidator)({
+            apiKey: this.config.apiKey,
+            datadogSite: this.config.datadogSite,
+            metricsLogger: metricsLogger.logger,
+        });
+    }
+    getGitDataPayload(gitData) {
+        const files = gitData.trackedFilesMatcher.rawTrackedFilesList();
+        const repoPayload = {
+            data: [
+                {
+                    files,
+                    hash: gitData.hash,
+                    repository_url: gitData.remote,
+                },
+            ],
+            version: 1,
+        };
+        return {
+            type: 'string',
+            options: { filename: 'repository', contentType: 'application/json' },
+            value: JSON.stringify(repoPayload),
+        };
+    }
+    getGitMetadata() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                return yield (0, format_git_sourcemaps_data_1.getRepositoryData)(yield (0, format_git_sourcemaps_data_1.newSimpleGit)(), this.repositoryUrl);
+            }
+            catch (e) {
+                this.context.stdout.write((0, renderer_1.renderGitWarning)(e));
+            }
+            return undefined;
+        });
+    }
+    getPESymbolSource(peFileMetadata) {
+        if (peFileMetadata.hasPdbInfo) {
+            return 'debug_info';
+        }
+        return 'none';
+    }
+    getArchitecture(architecture) {
+        if (architecture === pe_constants_1.MachineArchitecture.x86) {
+            return 'x86';
+        }
+        else if (architecture === pe_constants_1.MachineArchitecture.x64) {
+            return 'x64';
+        }
+        else if (architecture === pe_constants_1.MachineArchitecture.Arm32) {
+            return 'arm32';
+        }
+        else if (architecture === pe_constants_1.MachineArchitecture.Arm64) {
+            return 'arm64';
+        }
+        else {
+            return 'unknown';
+        }
+    }
+    getMappingMetadata(peFileMetadata) {
+        var _a, _b;
+        return {
+            cli_version: this.cliVersion,
+            origin_version: this.cliVersion,
+            origin: 'datadog-ci',
+            arch: this.getArchitecture(peFileMetadata.arch),
+            pdb_age: peFileMetadata.pdbAge,
+            pdb_sig: peFileMetadata === null || peFileMetadata === void 0 ? void 0 : peFileMetadata.pdbSig,
+            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,
+            symbol_source: this.getPESymbolSource(peFileMetadata),
+            filename: upath_1.default.basename(peFileMetadata.pdbFilename),
+            overwrite: this.replaceExisting,
+            type: interfaces_1.TYPE_PE_DEBUG_INFOS,
+        };
+    }
+    getMetricsLogger() {
+        const metricsLogger = (0, metrics_1.getMetricsLogger)({
+            apiKey: this.config.apiKey,
+            datadogSite: this.config.datadogSite,
+            defaultTags: [`cli_version:${this.cliVersion}`, 'platform:pe'],
+            prefix: 'datadog.ci.pe_symbols.',
+        });
+        return metricsLogger;
+    }
+    getPESymbolFiles(symbolsLocation) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let paths = [];
+            let reportFailure;
+            const stat = yield fs_1.default.promises.stat(symbolsLocation);
+            if (stat.isDirectory()) {
+                // strict: false is needed to avoid throwing an error if a directory is not readable
+                paths = glob_1.default.sync((0, utils_1.buildPath)(symbolsLocation, '**'), { dot: true, dotRelative: true });
+                reportFailure = (message) => this.context.stdout.write((0, renderer_1.renderWarning)(message));
+                // throw an error if top-level directory is not readable
+                // eslint-disable-next-line no-bitwise
+                yield fs_1.default.promises.access(symbolsLocation, fs_1.default.constants.R_OK | fs_1.default.constants.X_OK).catch(() => {
+                    throw Error(`Directory ${symbolsLocation} is not readable`);
+                });
+            }
+            else {
+                paths = [symbolsLocation];
+                // in single file mode, we want to report failures as errors
+                reportFailure = (message) => {
+                    throw Error(message);
+                };
+            }
+            const filesMetadata = [];
+            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(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 a PE file
+                    const metadata = yield (0, pe_1.getPEFileMetadata)(p);
+                    // handle all possible failures
+                    if (!metadata.isPE) {
+                        reportFailure(`Input location ${p} is not a PE file`);
+                        continue;
+                    }
+                    if (metadata.error) {
+                        reportFailure(`Error reading PE file ${p}: ${metadata.error.message}`);
+                        continue;
+                    }
+                    if (!metadata.hasPdbInfo) {
+                        reportFailure(`Skipped ${p} because it has no debug info, nor symbols`);
+                        continue;
+                    }
+                    filesMetadata.push(metadata);
+                }
+            }
+            // sort files to make output deterministic
+            filesMetadata.sort((a, b) => a.filename.localeCompare(b.filename));
+            return filesMetadata;
+        });
+    }
+    removeBuildIdDuplicates(filesMetadata) {
+        const buildIds = new Map();
+        for (const metadata of filesMetadata) {
+            const buildId = (0, pe_1.getBuildId)(metadata);
+            const existing = buildIds.get(buildId);
+            if (existing) {
+                // if both files have debug info and symbols, we keep the first one
+                this.context.stderr.write((0, renderer_1.renderWarning)(`Duplicate build_id found: ${buildId} in ${metadata.filename} and ${existing.filename} - skipping ${metadata.filename}`));
+            }
+            else {
+                buildIds.set(buildId, metadata);
+            }
+        }
+        return Array.from(buildIds.values()).sort((a, b) => a.filename.localeCompare(b.filename));
+    }
+    getFileInSameFolder(pathname, newFilename) {
+        const dirname = upath_1.default.dirname(pathname);
+        const newPathname = upath_1.default.join(dirname, upath_1.default.basename(newFilename));
+        return newPathname;
+    }
+    getAssociatedPdbFilename(pathname) {
+        const basename = upath_1.default.basename(pathname, upath_1.default.extname(pathname));
+        const dirname = upath_1.default.dirname(pathname);
+        const newPathname = upath_1.default.join(dirname, `${basename}.pdb`);
+        return newPathname;
+    }
+    performPESymbolsUpload() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const metricsLogger = this.getMetricsLogger();
+            const apiKeyValidator = this.getApiKeyValidator(metricsLogger);
+            let peFilesMetadata = (yield Promise.all(this.symbolsLocations.map((location) => this.getPESymbolFiles(location)))).flat();
+            peFilesMetadata = this.removeBuildIdDuplicates(peFilesMetadata);
+            const requestBuilder = (0, helpers_1.getPERequestBuilder)(this.config.apiKey, this.cliVersion, this.config.datadogSite);
+            try {
+                const results = yield (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, peFilesMetadata, (fileMetadata) => __awaiter(this, void 0, void 0, function* () {
+                    const metadata = this.getMappingMetadata(fileMetadata);
+                    if (this.dryRun) {
+                        this.context.stdout.write(`[DRYRUN] ${(0, renderer_1.renderUpload)(fileMetadata.filename, metadata)}`);
+                        // TODO: uncomment the following when dryRun won't be TRUE by default
+                        // return UploadStatus.Success
+                    }
+                    // get the .pdb filename based on the .dll filename and copy it into a temp folder
+                    // --> not sure the ELF-based code makes any sense for PE files...
+                    //     instead, we should not need to copy anything:
+                    //     1. get the .pdb filename from the .dll file (ex: foo64.dll --> foo.pdb)
+                    //     2. look for it in the same folder as the .dll file
+                    //     3. if it is not there, look in the same folder for a file with the same name as .dll but with a .pdb extension
+                    //     4. if it is there, upload it; if not generate a skip warning
+                    //
+                    let pdbFilename = this.getFileInSameFolder(fileMetadata.filename, fileMetadata.pdbFilename);
+                    // TODO: remove this log after debugging
+                    this.context.stdout.write(`[LOG] Look for pdb file = ${pdbFilename}\n`);
+                    if (!fs_1.default.existsSync(pdbFilename)) {
+                        pdbFilename = this.getAssociatedPdbFilename(fileMetadata.filename);
+                        if (!fs_1.default.existsSync(pdbFilename)) {
+                            this.context.stdout.write((0, renderer_1.renderMissingPdbFile)(fileMetadata.pdbFilename, fileMetadata.filename));
+                            return upload_1.UploadStatus.Skipped;
+                        }
+                    }
+                    // TODO: remove this log after debugging
+                    this.context.stdout.write(`[LOG]      Use pdb file = ${pdbFilename}\n`);
+                    const eventValue = JSON.stringify(metadata);
+                    this.context.stdout.write((0, renderer_1.renderEventPayload)(eventValue));
+                    const payload = {
+                        content: new Map([
+                            [
+                                'event',
+                                {
+                                    type: 'string',
+                                    value: eventValue,
+                                    options: { filename: 'event', contentType: 'application/json' },
+                                },
+                            ],
+                            [
+                                interfaces_1.VALUE_NAME_PE_DEBUG_INFOS,
+                                {
+                                    type: 'file',
+                                    path: pdbFilename,
+                                    options: { filename: interfaces_1.PE_DEBUG_INFOS_FILENAME },
+                                },
+                            ],
+                        ]),
+                    };
+                    if (this.gitData !== undefined) {
+                        payload.content.set('repository', this.getGitDataPayload(this.gitData));
+                    }
+                    return (0, helpers_1.uploadMultipartHelper)(requestBuilder, payload, {
+                        apiKeyValidator,
+                        onError: (e) => {
+                            this.context.stdout.write((0, renderer_1.renderFailedUpload)(fileMetadata.filename, e.message));
+                            metricsLogger.logger.increment('failed', 1);
+                        },
+                        onRetry: (e, attempts) => {
+                            this.context.stdout.write((0, renderer_1.renderRetriedUpload)(fileMetadata.filename, e.message, attempts));
+                            metricsLogger.logger.increment('retries', 1);
+                        },
+                        onUpload: () => {
+                            this.context.stdout.write((0, renderer_1.renderUpload)(fileMetadata.filename, metadata));
+                        },
+                        retries: 5,
+                        useGzip: true,
+                    });
+                }));
+                return results;
+            }
+            catch (error) {
+                throw error;
+            }
+            finally {
+                try {
+                    yield metricsLogger.flush();
+                }
+                catch (err) {
+                    this.context.stdout.write(`WARN: ${err}\n`);
+                }
+            }
+        });
+    }
+    verifyParameters() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let parametersOkay = true;
+            if (!this.symbolsLocations || this.symbolsLocations.length === 0) {
+                this.context.stderr.write((0, renderer_1.renderArgumentMissingError)('symbols locations'));
+                parametersOkay = false;
+            }
+            else {
+                for (const symbolsLocation of this.symbolsLocations) {
+                    if (fs_1.default.existsSync(symbolsLocation)) {
+                        const stats = fs_1.default.statSync(symbolsLocation);
+                        if (!stats.isDirectory() && !stats.isFile()) {
+                            this.context.stderr.write((0, renderer_1.renderInvalidSymbolsLocation)(symbolsLocation));
+                            parametersOkay = false;
+                        }
+                    }
+                    else {
+                        this.context.stderr.write((0, renderer_1.renderInvalidSymbolsLocation)(symbolsLocation));
+                        parametersOkay = false;
+                    }
+                }
+            }
+            return parametersOkay;
+        });
+    }
+}
+exports.UploadCommand = UploadCommand;
+UploadCommand.paths = [['pe-symbols', 'upload']];
+UploadCommand.usage = clipanion_1.Command.Usage({
+    category: 'Profiling',
+    description: 'Upload Windows PE debug info files to Datadog.',
+    details: `
+            This command will upload debug info from all PE files found recursively in the given location in order to symbolicate profiles
+        `,
+    examples: [['Upload debug infos for all PE files in the current directory', 'datadog-ci pe-symbols upload .']],
+});
+//# sourceMappingURL=upload.js.map

package/dist/commands/pe-symbols/upload.js.map

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

package/dist/commands/sbom/__tests__/payload.test.js

@@ -49,9 +49,11 @@ describe('generation of payload', () => {
         expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].version).toBe('1.3.0');
         expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].licenses.length).toBe(0);
         expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].language).toBe(types_1.DependencyLanguage.PHP);
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_NAME]).toBe('cyclonedx-php-composer');
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_VERSION]).toBe('in-dev');
     }));
-    test('should correctly work with a CycloneDX 1.6 file', () => __awaiter(void 0, void 0, void 0, function* () {
-        const sbomFile = './src/commands/sbom/__tests__/fixtures/cdxgen-cyclonedx1.6.json';
+    test('should succeed when called on a valid SBOM file for CycloneDX 1.5', () => __awaiter(void 0, void 0, void 0, function* () {
+        const sbomFile = './src/commands/sbom/__tests__/fixtures/sbom.1.5.ok.json';
         const sbomContent = JSON.parse(fs_1.default.readFileSync(sbomFile).toString('utf8'));
         const config = {
             apiKey: undefined,
@@ -70,18 +72,44 @@ describe('generation of payload', () => {
         expect(payload === null || payload === void 0 ? void 0 : payload.commit.branch).toStrictEqual(expect.any(String));
         expect(payload === null || payload === void 0 ? void 0 : payload.repository.url).toContain('github.com');
         expect(payload === null || payload === void 0 ? void 0 : payload.repository.url).toContain('DataDog/datadog-ci');
-        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies).toHaveLength(2);
-        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].name).toBe('Flask');
-        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].version).toBe('3.0.0');
-        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].licenses).toHaveLength(0);
-        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].language).toBe(types_1.DependencyLanguage.PYTHON);
-        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].name).toBe('requests');
-        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].version).toBe('2.31.0');
-        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].licenses).toHaveLength(0);
-        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].language).toBe(types_1.DependencyLanguage.PYTHON);
+        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies.length).toBe(147);
+        expect(payload === null || payload === void 0 ? void 0 : payload.files.length).toBe(2);
+        expect(payload === null || payload === void 0 ? void 0 : payload.relations.length).toBe(154);
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_NAME]).toBe('trivy');
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_VERSION]).toBe('0.44.1');
+        const dependenciesWithoutLicense = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.licenses.length === 0);
+        expect(dependenciesWithoutLicense === null || dependenciesWithoutLicense === void 0 ? void 0 : dependenciesWithoutLicense.length).toBe(147);
+        const directDependencies = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.is_direct);
+        expect(directDependencies === null || directDependencies === void 0 ? void 0 : directDependencies.length).toBe(1);
+        const devDependencies = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.is_dev);
+        expect(devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies.length).toBe(1);
+        const dependenciesWithPackageManager = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.package_manager.length > 0);
+        expect(dependenciesWithPackageManager === null || dependenciesWithPackageManager === void 0 ? void 0 : dependenciesWithPackageManager.length).toBe(1);
+        const filesWithPURL = payload === null || payload === void 0 ? void 0 : payload.files.filter((d) => d.purl);
+        expect(filesWithPURL === null || filesWithPURL === void 0 ? void 0 : filesWithPURL.length).toBe(2);
     }));
-    test('should succeed when called on a valid SBOM file for CycloneDX 1.5', () => __awaiter(void 0, void 0, void 0, function* () {
-        const sbomFile = './src/commands/sbom/__tests__/fixtures/sbom.1.5.ok.json';
+    test('should succeed when called on a valid SBOM file for CycloneDX 1.5 with tools declared in components', () => __awaiter(void 0, void 0, void 0, function* () {
+        const sbomFile = './src/commands/sbom/__tests__/fixtures/sbom.1.5.ok-with-tools-as-components.json';
+        const sbomContent = JSON.parse(fs_1.default.readFileSync(sbomFile).toString('utf8'));
+        const config = {
+            apiKey: undefined,
+            env: undefined,
+            envVarTags: undefined,
+        };
+        const tags = yield (0, tags_1.getSpanTags)(config, [], true);
+        const payload = (0, payload_1.generatePayload)(sbomContent, tags, 'service', 'env');
+        expect(payload).not.toBeNull();
+        expect(payload === null || payload === void 0 ? void 0 : payload.id).toStrictEqual(expect.any(String));
+        expect(payload === null || payload === void 0 ? void 0 : payload.commit.sha).toStrictEqual(expect.any(String));
+        expect(payload === null || payload === void 0 ? void 0 : payload.repository.url).toContain('github.com');
+        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies.length).toBe(147);
+        expect(payload === null || payload === void 0 ? void 0 : payload.files.length).toBe(2);
+        expect(payload === null || payload === void 0 ? void 0 : payload.relations.length).toBe(154);
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_NAME]).toBe('grype');
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_VERSION]).toBe('0.87.0');
+    }));
+    test('should correctly work with a CycloneDX 1.6 file', () => __awaiter(void 0, void 0, void 0, function* () {
+        const sbomFile = './src/commands/sbom/__tests__/fixtures/cdxgen-cyclonedx1.6.json';
         const sbomContent = JSON.parse(fs_1.default.readFileSync(sbomFile).toString('utf8'));
         const config = {
             apiKey: undefined,
@@ -100,19 +128,17 @@ describe('generation of payload', () => {
         expect(payload === null || payload === void 0 ? void 0 : payload.commit.branch).toStrictEqual(expect.any(String));
         expect(payload === null || payload === void 0 ? void 0 : payload.repository.url).toContain('github.com');
         expect(payload === null || payload === void 0 ? void 0 : payload.repository.url).toContain('DataDog/datadog-ci');
-        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies.length).toBe(147);
-        expect(payload === null || payload === void 0 ? void 0 : payload.files.length).toBe(2);
-        expect(payload === null || payload === void 0 ? void 0 : payload.relations.length).toBe(154);
-        const dependenciesWithoutLicense = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.licenses.length === 0);
-        expect(dependenciesWithoutLicense === null || dependenciesWithoutLicense === void 0 ? void 0 : dependenciesWithoutLicense.length).toBe(147);
-        const directDependencies = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.is_direct);
-        expect(directDependencies === null || directDependencies === void 0 ? void 0 : directDependencies.length).toBe(1);
-        const devDependencies = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.is_dev);
-        expect(devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies.length).toBe(1);
-        const dependenciesWithPackageManager = payload === null || payload === void 0 ? void 0 : payload.dependencies.filter((d) => d.package_manager.length > 0);
-        expect(dependenciesWithPackageManager === null || dependenciesWithPackageManager === void 0 ? void 0 : dependenciesWithPackageManager.length).toBe(1);
-        const filesWithPURL = payload === null || payload === void 0 ? void 0 : payload.files.filter((d) => d.purl);
-        expect(filesWithPURL === null || filesWithPURL === void 0 ? void 0 : filesWithPURL.length).toBe(2);
+        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies).toHaveLength(2);
+        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].name).toBe('Flask');
+        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].version).toBe('3.0.0');
+        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].licenses).toHaveLength(0);
+        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[0].language).toBe(types_1.DependencyLanguage.PYTHON);
+        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].name).toBe('requests');
+        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].version).toBe('2.31.0');
+        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].licenses).toHaveLength(0);
+        expect(payload === null || payload === void 0 ? void 0 : payload.dependencies[1].language).toBe(types_1.DependencyLanguage.PYTHON);
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_NAME]).toBe('cdxgen');
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_VERSION]).toBe('11.0.7');
     }));
     test('SBOM for rust with multiple licenses', () => __awaiter(void 0, void 0, void 0, function* () {
         const sbomFile = './src/commands/sbom/__tests__/fixtures/sbom-rust.json';
@@ -346,6 +372,42 @@ describe('generation of payload', () => {
             fs_1.default.rmSync(tmpdir, { recursive: true, force: true });
         }
     }));
+    test('should not override provided tool.generator with value from SBOM', () => __awaiter(void 0, void 0, void 0, function* () {
+        const sbomFile = './src/commands/sbom/__tests__/fixtures/sbom.1.4.ok.json';
+        const sbomContent = JSON.parse(fs_1.default.readFileSync(sbomFile).toString('utf8'));
+        const config = {
+            apiKey: undefined,
+            env: undefined,
+            envVarTags: undefined,
+        };
+        const tagsWithoutTool = yield (0, tags_1.getSpanTags)(config, [], true);
+        let payload = (0, payload_1.generatePayload)(sbomContent, tagsWithoutTool, 'service', 'env');
+        expect(payload).not.toBeNull();
+        expect(payload === null || payload === void 0 ? void 0 : payload.id).toStrictEqual(expect.any(String));
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_NAME]).toBe('cyclonedx-php-composer');
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_VERSION]).toBe('in-dev');
+        const tagsWithTool = yield (0, tags_1.getSpanTags)(config, ['tool.generator.name:foo', 'tool.generator.version:1.1.1.1'], true);
+        payload = (0, payload_1.generatePayload)(sbomContent, tagsWithTool, 'service', 'env');
+        expect(payload).not.toBeNull();
+        expect(payload === null || payload === void 0 ? void 0 : payload.id).toStrictEqual(expect.any(String));
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_NAME]).toBe('foo');
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_VERSION]).toBe('1.1.1.1');
+    }));
+    test('should not read tool.generator when missing from SBOM', () => __awaiter(void 0, void 0, void 0, function* () {
+        const sbomFile = './src/commands/sbom/__tests__/fixtures/sbom.1.4.ok-without-metadata.json';
+        const sbomContent = JSON.parse(fs_1.default.readFileSync(sbomFile).toString('utf8'));
+        const config = {
+            apiKey: undefined,
+            env: undefined,
+            envVarTags: undefined,
+        };
+        const tags = yield (0, tags_1.getSpanTags)(config, [], true);
+        const payload = (0, payload_1.generatePayload)(sbomContent, tags, 'service', 'env');
+        expect(payload).not.toBeNull();
+        expect(payload === null || payload === void 0 ? void 0 : payload.id).toStrictEqual(expect.any(String));
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_NAME]).toBeUndefined();
+        expect(payload === null || payload === void 0 ? void 0 : payload.tags[tags_1.SBOM_TOOL_GENERATOR_VERSION]).toBeUndefined();
+    }));
     test('should fail to read git information', () => __awaiter(void 0, void 0, void 0, function* () {
         const nonExistingGitRepository = '/you/cannot/find/me';
         const config = {