@datadog/datadog-ci 2.47.0 → 3.0.0

package/dist/commands/junit/__tests__/upload.test.js

@@ -0,0 +1,446 @@
+"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 });
+const os_1 = __importDefault(require("os"));
+const advanced_1 = require("clipanion/lib/advanced");
+const fixtures_1 = require("../../../helpers/__tests__/fixtures");
+const id_1 = __importDefault(require("../../../helpers/id"));
+const renderer_1 = require("../renderer");
+const upload_1 = require("../upload");
+jest.mock('../../../helpers/id', () => jest.fn());
+const makeCli = () => {
+    const cli = new advanced_1.Cli();
+    cli.register(upload_1.UploadJUnitXMLCommand);
+    return cli;
+};
+describe('upload', () => {
+    describe('getApiHelper', () => {
+        test('should throw an error if API key is undefined', () => {
+            process.env = {};
+            const write = jest.fn();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            command.context = { stdout: { write } };
+            expect(command['getApiHelper'].bind(command)).toThrow('API key is missing');
+            expect(write.mock.calls[0][0]).toContain('DD_API_KEY');
+        });
+    });
+    describe('getMatchingJUnitXMLFiles', () => {
+        test('should read all xml files and reject invalid ones', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const [firstFile, secondFile] = yield command['getMatchingJUnitXMLFiles'].call({
+                basePaths: ['./src/commands/junit/__tests__/fixtures'],
+                config: {},
+                context,
+                service: 'service',
+            }, {}, {}, {}, {}, {});
+            expect(firstFile).toMatchObject({
+                xmlPath: './src/commands/junit/__tests__/fixtures/java-report.xml',
+            });
+            expect(secondFile).toMatchObject({
+                xmlPath: './src/commands/junit/__tests__/fixtures/go-report.xml',
+            });
+            const output = context.stdout.toString();
+            expect(output).toContain((0, renderer_1.renderInvalidFile)('./src/commands/junit/__tests__/fixtures/empty.xml', 'Start tag expected.'));
+            expect(output).toContain((0, renderer_1.renderInvalidFile)('./src/commands/junit/__tests__/fixtures/invalid.xml', 'Neither <testsuites> nor <testsuite> are the root tag.'));
+        }));
+        test('should allow single files', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const files = yield command['getMatchingJUnitXMLFiles'].call({
+                basePaths: ['./src/commands/junit/__tests__/fixtures/go-report.xml'],
+                config: {},
+                context,
+                service: 'service',
+            }, {}, {}, {}, {}, {});
+            expect(files.length).toEqual(1);
+            expect(files[0]).toMatchObject({
+                xmlPath: './src/commands/junit/__tests__/fixtures/go-report.xml',
+            });
+        }));
+        test('should not fail for invalid single files', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const files = yield command['getMatchingJUnitXMLFiles'].call({
+                basePaths: ['./src/commands/junit/__tests__/fixtures/does-not-exist.xml'],
+                config: {},
+                context,
+                service: 'service',
+            }, {}, {}, {}, {}, {});
+            expect(files.length).toEqual(0);
+        }));
+        test('should allow folder and single unit paths', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const [firstFile, secondFile, thirdFile] = yield command['getMatchingJUnitXMLFiles'].call({
+                basePaths: [
+                    './src/commands/junit/__tests__/fixtures',
+                    './src/commands/junit/__tests__/fixtures/subfolder/js-report.xml',
+                ],
+                config: {},
+                context,
+                service: 'service',
+            }, {}, {}, {}, {}, {});
+            expect(firstFile).toMatchObject({
+                xmlPath: './src/commands/junit/__tests__/fixtures/java-report.xml',
+            });
+            expect(secondFile).toMatchObject({
+                xmlPath: './src/commands/junit/__tests__/fixtures/go-report.xml',
+            });
+            expect(thirdFile).toMatchObject({
+                xmlPath: './src/commands/junit/__tests__/fixtures/subfolder/js-report.xml',
+            });
+        }));
+        test('should allow folders with extensions', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const [firstFile, secondFile] = yield command['getMatchingJUnitXMLFiles'].call({
+                basePaths: ['./src/commands/junit/__tests__/fixtures/junit.xml'],
+                config: {},
+                context,
+                service: 'service',
+            }, {}, {}, {}, {}, {});
+            expect(firstFile).toMatchObject({
+                xmlPath: './src/commands/junit/__tests__/fixtures/junit.xml/valid-report.xml',
+            });
+            expect(secondFile).toMatchObject({
+                xmlPath: './src/commands/junit/__tests__/fixtures/junit.xml/valid-report-2.xml',
+            });
+        }));
+        test('should not have repeated files', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const files = yield command['getMatchingJUnitXMLFiles'].call({
+                basePaths: [
+                    './src/commands/junit/__tests__/fixtures',
+                    './src/commands/junit/__tests__/fixtures/go-report.xml',
+                ],
+                config: {},
+                context,
+                service: 'service',
+            }, {}, {}, {}, {}, {});
+            expect(files.length).toEqual(2);
+        }));
+        test('should set hostname', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const [firstFile, secondFile] = yield command['getMatchingJUnitXMLFiles'].call({
+                basePaths: ['./src/commands/junit/__tests__/fixtures'],
+                config: {},
+                context,
+                service: 'service',
+            }, {}, {}, {}, {}, {});
+            expect(firstFile.hostname).toEqual(os_1.default.hostname());
+            expect(secondFile.hostname).toEqual(os_1.default.hostname());
+        }));
+        test('should set logsEnabled for each file', () => __awaiter(void 0, void 0, void 0, function* () {
+            process.env.DD_CIVISIBILITY_LOGS_ENABLED = 'true';
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const [firstFile, secondFile] = yield command['getMatchingJUnitXMLFiles'].call({
+                basePaths: ['./src/commands/junit/__tests__/fixtures'],
+                config: {},
+                context,
+                logs: true,
+                service: 'service',
+            }, {}, {}, {}, {}, {});
+            expect(firstFile.logsEnabled).toBe(true);
+            expect(secondFile.logsEnabled).toBe(true);
+        }));
+        test('should show different error on no test report', () => __awaiter(void 0, void 0, void 0, function* () {
+            process.env.DD_CIVISIBILITY_LOGS_ENABLED = 'true';
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            yield command['getMatchingJUnitXMLFiles'].call({
+                basePaths: ['./src/commands/junit/__tests__/fixtures/subfolder/invalid-no-tests.xml'],
+                config: {},
+                context,
+                logs: true,
+                service: 'service',
+            }, {}, {}, {}, {}, {});
+            const output = context.stdout.toString();
+            expect(output).toContain((0, renderer_1.renderInvalidFile)('./src/commands/junit/__tests__/fixtures/subfolder/invalid-no-tests.xml', 'The junit report file is empty, there are no <testcase> elements.'));
+        }));
+        test('should fetch nested folders', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const files = yield command['getMatchingJUnitXMLFiles'].call({
+                basePaths: ['**/junit/**/*.xml'],
+                config: {},
+                context,
+                service: 'service',
+            }, {}, {}, {}, {}, {});
+            const fileNames = files.map((file) => file.xmlPath);
+            expect(fileNames).toEqual([
+                './src/commands/junit/__tests__/fixtures/java-report.xml',
+                './src/commands/junit/__tests__/fixtures/go-report.xml',
+                './src/commands/junit/__tests__/fixtures/subfolder/js-report.xml',
+                './src/commands/junit/__tests__/fixtures/junit.xml/valid-report.xml',
+                './src/commands/junit/__tests__/fixtures/junit.xml/valid-report-2.xml',
+            ]);
+        }));
+        test('should fetch nested folders and ignore non xml files', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const files = yield command['getMatchingJUnitXMLFiles'].call({
+                basePaths: ['**/junit/**'],
+                config: {},
+                context,
+                service: 'service',
+            }, {}, {}, {}, {}, {});
+            const fileNames = files.map((file) => file.xmlPath);
+            expect(fileNames).toEqual([
+                './src/commands/junit/__tests__/fixtures/java-report.xml',
+                './src/commands/junit/__tests__/fixtures/go-report.xml',
+                './src/commands/junit/__tests__/fixtures/subfolder/js-report.xml',
+                './src/commands/junit/__tests__/fixtures/junit.xml/valid-report.xml',
+                './src/commands/junit/__tests__/fixtures/junit.xml/valid-report-2.xml',
+            ]);
+        }));
+    });
+    describe('getSpanTags', () => {
+        test('should parse DD_ENV environment variable', () => __awaiter(void 0, void 0, void 0, function* () {
+            process.env.DD_ENV = 'ci';
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const spanTags = yield command['getSpanTags'].call({
+                config: {
+                    env: process.env.DD_ENV,
+                },
+                context,
+            });
+            expect(spanTags).toMatchObject({
+                env: 'ci',
+            });
+        }));
+    });
+    describe('parseCustomTags', () => {
+        test('should parse tags argument', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const spanTags = command['getCustomTags'].call({
+                config: {},
+                context,
+                tags: ['key1:value1', 'key2:value2'],
+            });
+            expect(spanTags).toMatchObject({
+                key1: 'value1',
+                key2: 'value2',
+            });
+        }));
+        test('should parse DD_TAGS environment variable', () => __awaiter(void 0, void 0, void 0, function* () {
+            process.env.DD_TAGS = 'key1:https://google.com,key2:value2';
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const spanTags = command['getCustomTags'].call({
+                config: {
+                    envVarTags: process.env.DD_TAGS,
+                },
+                context,
+            });
+            expect(spanTags).toMatchObject({
+                key1: 'https://google.com',
+                key2: 'value2',
+            });
+        }));
+        test('should parse measures argument', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const spanTags = command['getCustomMeasures'].call({
+                config: {},
+                context,
+                measures: ['key1:10', 'key2:20'],
+            });
+            expect(spanTags).toMatchObject({
+                key1: 10,
+                key2: 20,
+            });
+        }));
+        test('should parse DD_MEASURES environment variable', () => __awaiter(void 0, void 0, void 0, function* () {
+            process.env.DD_MEASURES = 'key1:321,key2:123,key3:321.1,key4:abc,key5:-12.1';
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const spanTags = command['getCustomMeasures'].call({
+                config: {
+                    envVarMeasures: process.env.DD_MEASURES,
+                },
+                context,
+            });
+            expect(spanTags).toMatchObject({
+                key1: 321,
+                key2: 123,
+                key3: 321.1,
+                key5: -12.1,
+            });
+        }));
+        test('should parse report tags argument', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const spanTags = command['getReportTags'].call({
+                config: {},
+                context,
+                reportTags: ['key1:value1', 'key2:value2'],
+            });
+            expect(spanTags).toMatchObject({
+                key1: 'value1',
+                key2: 'value2',
+            });
+        }));
+        test('should parse report measures argument', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const spanTags = command['getReportMeasures'].call({
+                config: {},
+                context,
+                reportMeasures: ['key1:20', 'key2:30'],
+            });
+            expect(spanTags).toMatchObject({
+                key1: 20,
+                key2: 30,
+            });
+        }));
+    });
+    describe('parseXPathTags', () => {
+        test('should parse xpath assigments', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            const xPathTags = command['parseXPathTags'].call({
+                basePaths: ['./src/commands/junit/__tests__/fixtures'],
+                config: {},
+                context,
+                service: 'service',
+            }, ['test.suite=/testcase/@classname', "custom_tag=/testcase/..//property[@name='property-name']"]);
+            expect(xPathTags).toMatchObject({
+                'test.suite': '/testcase/@classname',
+                custom_tag: "/testcase/..//property[@name='property-name']",
+            });
+        }));
+        test('should alert of invalid values', () => __awaiter(void 0, void 0, void 0, function* () {
+            const context = (0, fixtures_1.createMockContext)();
+            const command = new upload_1.UploadJUnitXMLCommand();
+            command['parseXPathTags'].call({
+                basePaths: ['./src/commands/junit/__tests__/fixtures'],
+                config: {},
+                context,
+                service: 'service',
+            }, ['test.suite=/testcase/@classname', 'invalid']);
+            const errOutput = context.stderr.toString().split(os_1.default.EOL);
+            expect(errOutput[0]).toContain('Invalid xpath');
+        }));
+    });
+});
+describe('execute', () => {
+    const runCLI = (extraArgs) => __awaiter(void 0, void 0, void 0, function* () {
+        const cli = makeCli();
+        const context = (0, fixtures_1.createMockContext)();
+        process.env = { DD_API_KEY: 'PLACEHOLDER' };
+        const code = yield cli.run(['junit', 'upload', '--service', 'test-service', '--dry-run', '--logs', ...extraArgs], context);
+        return { context, code };
+    });
+    test('relative path with double dots', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI(['./src/commands/junit/__tests__/doesnotexist/../fixtures']);
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(code).toBe(0);
+        checkConsoleOutput(output, {
+            basePaths: ['src/commands/junit/__tests__/fixtures'],
+            concurrency: 20,
+            service: 'test-service',
+        });
+    }));
+    test('multiple paths', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI(['./src/commands/junit/first/', './src/commands/junit/second/']);
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(code).toBe(0);
+        checkConsoleOutput(output, {
+            basePaths: ['src/commands/junit/first/', 'src/commands/junit/second/'],
+            concurrency: 20,
+            service: 'test-service',
+        });
+    }));
+    test('absolute path', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI([process.cwd() + '/src/commands/junit/__tests__/fixtures']);
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(code).toBe(0);
+        checkConsoleOutput(output, {
+            basePaths: [`${process.cwd()}/src/commands/junit/__tests__/fixtures`],
+            concurrency: 20,
+            service: 'test-service',
+        });
+    }));
+    test('single file', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI([process.cwd() + '/src/commands/junit/__tests__/fixtures/single_file.xml']);
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        const path = `${process.cwd()}/src/commands/junit/__tests__/fixtures/single_file.xml`;
+        expect(code).toBe(0);
+        expect(output[0]).toContain('DRY-RUN MODE ENABLED. WILL NOT UPLOAD JUNIT XML');
+        expect(output[1]).toContain('Starting upload with concurrency 20.');
+        expect(output[2]).toContain(`Will upload jUnit XML file ${path}`);
+        expect(output[3]).toContain('service: test-service');
+    }));
+    test('with git metadata without argument (default value is true)', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI([
+            '--verbose',
+            process.cwd() + '/src/commands/junit/__tests__/fixtures/single_file.xml',
+        ]);
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(id_1.default).toHaveBeenCalled();
+        expect(code).toBe(0);
+        expect(output[5]).toContain('Syncing git metadata');
+    }));
+    test('without git metadata (with argument)', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI([
+            '--verbose',
+            '--skip-git-metadata-upload',
+            process.cwd() + '/src/commands/junit/__tests__/fixtures/single_file.xml',
+        ]);
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(id_1.default).not.toHaveBeenCalled();
+        expect(code).toBe(0);
+        expect(output[5]).toContain('Not syncing git metadata (skip git upload flag detected)');
+    }));
+    test('without git metadata (with argument set to 1)', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI([
+            '--verbose',
+            '--skip-git-metadata-upload=1',
+            process.cwd() + '/src/commands/junit/__tests__/fixtures/single_file.xml',
+        ]);
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(id_1.default).not.toHaveBeenCalled();
+        expect(code).toBe(0);
+        expect(output[5]).toContain('Not syncing git metadata (skip git upload flag detected)');
+    }));
+    test('with git metadata (with argument set to 0)', () => __awaiter(void 0, void 0, void 0, function* () {
+        const { context, code } = yield runCLI([
+            '--skip-git-metadata-upload=0',
+            process.cwd() + '/src/commands/junit/__tests__/fixtures/single_file.xml',
+        ]);
+        const output = context.stdout.toString().split(os_1.default.EOL);
+        expect(code).toBe(0);
+        expect(output[5]).toContain('Syncing git metadata');
+    }));
+    test('id headers are added when git metadata is uploaded', () => __awaiter(void 0, void 0, void 0, function* () {
+        yield runCLI([
+            '--skip-git-metadata-upload=0',
+            process.cwd() + '/src/commands/junit/__tests__/fixtures/single_file.xml',
+        ]);
+        expect(id_1.default).toHaveBeenCalled();
+    }), 10000000);
+});
+const checkConsoleOutput = (output, expected) => {
+    expect(output[0]).toContain('DRY-RUN MODE ENABLED. WILL NOT UPLOAD JUNIT XML');
+    expect(output[1]).toContain(`Starting upload with concurrency ${expected.concurrency}.`);
+    expect(output[2]).toContain(`Will look for jUnit XML files in ${expected.basePaths.join(', ')}`);
+    expect(output[3]).toContain(`service: ${expected.service}`);
+};
+//# sourceMappingURL=upload.test.js.map

package/dist/commands/junit/__tests__/upload.test.js.map

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

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

@@ -4,7 +4,6 @@ export declare const renderInvalidFile: (xmlPath: string, errorMessage: string)
 export declare const renderFailedUpload: (payload: Payload, errorMessage: string) => string;
 export declare const renderFailedGitDBSync: (err: any) => string;
 export declare const renderRetriedUpload: (payload: Payload, errorMessage: string, attempt: number) => string;
-export declare const renderDeprecatedMention: (deprecatedMention: string, newMention: string, deprecatedType: string) => string;
 export declare const renderSuccessfulUpload: (dryRun: boolean, fileCount: number, duration: number) => string;
 export declare const renderSuccessfulGitDBSync: (dryRun: boolean, elapsed: number) => string;
 export declare const renderSuccessfulCommand: (spanTags: SpanTags, service: string, env?: string) => string;

package/dist/commands/junit/renderer.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderCommandInfo = exports.renderUpload = exports.renderDryRunUpload = exports.renderSuccessfulCommand = exports.renderSuccessfulGitDBSync = exports.renderSuccessfulUpload = exports.renderDeprecatedMention = exports.renderRetriedUpload = exports.renderFailedGitDBSync = exports.renderFailedUpload = exports.renderInvalidFile = void 0;
+exports.renderCommandInfo = exports.renderUpload = exports.renderDryRunUpload = exports.renderSuccessfulCommand = exports.renderSuccessfulGitDBSync = exports.renderSuccessfulUpload = exports.renderRetriedUpload = exports.renderFailedGitDBSync = exports.renderFailedUpload = exports.renderInvalidFile = void 0;
 const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
 const utils_1 = require("./utils");
@@ -31,10 +31,6 @@ const renderRetriedUpload = (payload, errorMessage, attempt) => {
     return chalk_1.default.yellow(`[attempt ${attempt}] Retrying jUnitXML upload ${jUnitXMLPath}: ${errorMessage}\n`);
 };
 exports.renderRetriedUpload = renderRetriedUpload;
-const renderDeprecatedMention = (deprecatedMention, newMention, deprecatedType) => {
-    return chalk_1.default.yellow(`${ICONS.WARNING} The "${deprecatedMention}" ${deprecatedType} is deprecated. Please use the "${newMention}" ${deprecatedType} instead.\n`);
-};
-exports.renderDeprecatedMention = renderDeprecatedMention;
 const renderSuccessfulUpload = (dryRun, fileCount, duration) => {
     return chalk_1.default.green(`${dryRun ? '[DRYRUN] ' : ''}${ICONS.SUCCESS} Uploaded ${fileCount} files in ${duration} seconds.`);
 };

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

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

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

@@ -8,12 +8,10 @@ export declare class UploadJUnitXMLCommand extends Command {
     private env;
     private logs;
     private maxConcurrency;
-    private metrics;
     private measures;
     private service;
     private tags;
     private reportTags;
-    private reportMetrics;
     private reportMeasures;
     private rawXPathTags;
     private gitRepositoryURL;

package/dist/commands/junit/upload.js

@@ -42,7 +42,7 @@ const path_1 = __importDefault(require("path"));
 const chalk_1 = __importDefault(require("chalk"));
 const clipanion_1 = require("clipanion");
 const fast_xml_parser_1 = require("fast-xml-parser");
-const glob_1 = __importDefault(require("glob"));
+const glob_1 = require("glob");
 const t = __importStar(require("typanion"));
 const constants_1 = require("../../constants");
 const ci_1 = require("../../helpers/ci");
@@ -50,6 +50,7 @@ const concurrency_1 = require("../../helpers/concurrency");
 const env_1 = require("../../helpers/env");
 const fips_1 = require("../../helpers/fips");
 const format_git_span_data_1 = require("../../helpers/git/format-git-span-data");
+const id_1 = __importDefault(require("../../helpers/id"));
 const logger_1 = require("../../helpers/logger");
 const retry_1 = require("../../helpers/retry");
 const tags_1 = require("../../helpers/tags");
@@ -60,7 +61,6 @@ const git_1 = require("../git-metadata/git");
 const gitdb_1 = require("../git-metadata/gitdb");
 const library_1 = require("../git-metadata/library");
 const api_1 = require("./api");
-const id_1 = __importDefault(require("./id"));
 const renderer_1 = require("./renderer");
 const utils_2 = require("./utils");
 const TRACE_ID_HTTP_HEADER = 'x-datadog-trace-id';
@@ -96,12 +96,10 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
             validator: t.isBoolean(),
         });
         this.maxConcurrency = clipanion_1.Option.String('--max-concurrency', '20', { validator: validation.isInteger() });
-        this.metrics = clipanion_1.Option.Array('--metrics', { hidden: true });
         this.measures = clipanion_1.Option.Array('--measures');
         this.service = clipanion_1.Option.String('--service', { env: 'DD_SERVICE' });
         this.tags = clipanion_1.Option.Array('--tags');
         this.reportTags = clipanion_1.Option.Array('--report-tags');
-        this.reportMetrics = clipanion_1.Option.Array('--report-metrics', { hidden: true });
         this.reportMeasures = clipanion_1.Option.Array('--report-measures');
         this.rawXPathTags = clipanion_1.Option.Array('--xpath-tag');
         this.gitRepositoryURL = clipanion_1.Option.String('--git-repository-url');
@@ -229,7 +227,7 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
                 }
                 let globPattern;
                 // It's either a folder (possibly including .xml extension) or a glob pattern
-                if (glob_1.default.hasMagic(basePath)) {
+                if (glob_1.glob.hasMagic(basePath)) {
                     // It's a glob pattern so we just use it as is
                     globPattern = basePath;
                 }
@@ -237,7 +235,9 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
                     // It's a folder
                     globPattern = (0, utils_1.buildPath)(basePath, '*.xml');
                 }
-                const filesToUpload = glob_1.default.sync(globPattern).filter((file) => path_1.default.extname(file) === '.xml');
+                const filesToUpload = glob_1.glob
+                    .sync(globPattern, { dotRelative: true })
+                    .filter((file) => path_1.default.extname(file) === '.xml');
                 return acc.concat(filesToUpload);
             }, [])
                 .filter(utils_2.isFile);
@@ -278,28 +278,15 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
     getCustomMeasures() {
         const envVarMetrics = this.config.envVarMetrics ? (0, tags_1.parseMetrics)(this.config.envVarMetrics.split(',')) : {};
         const envVarMeasures = this.config.envVarMeasures ? (0, tags_1.parseMetrics)(this.config.envVarMeasures.split(',')) : {};
-        const cliMetrics = this.metrics ? (0, tags_1.parseMetrics)(this.metrics) : {};
         const cliMeasures = this.measures ? (0, tags_1.parseMetrics)(this.measures) : {};
-        // We have renamed "metrics" to "measures", but we will still support the old names for now.
-        if (this.metrics) {
-            this.context.stdout.write((0, renderer_1.renderDeprecatedMention)('--metrics', '--measures', 'option'));
-        }
-        if (this.config.envVarMetrics) {
-            this.context.stdout.write((0, renderer_1.renderDeprecatedMention)('DD_METRICS', 'DD_MEASURES', 'environment variable'));
-        }
-        return Object.assign(Object.assign(Object.assign(Object.assign({}, cliMetrics), cliMeasures), envVarMetrics), envVarMeasures);
+        return Object.assign(Object.assign(Object.assign({}, cliMeasures), envVarMetrics), envVarMeasures);
     }
     getReportTags() {
         return this.reportTags ? (0, tags_1.parseTags)(this.reportTags) : {};
     }
     getReportMeasures() {
-        const cliMetrics = this.reportMetrics ? (0, tags_1.parseMetrics)(this.reportMetrics) : {};
         const cliMeasures = this.reportMeasures ? (0, tags_1.parseMetrics)(this.reportMeasures) : {};
-        // We have renamed "metrics" to "measures", but we will still support the old names for now.
-        if (this.reportMetrics) {
-            this.context.stdout.write((0, renderer_1.renderDeprecatedMention)('--report-metrics', '--report-measures', 'option'));
-        }
-        return Object.assign(Object.assign({}, cliMetrics), cliMeasures);
+        return Object.assign({}, cliMeasures);
     }
     uploadJUnitXML(api, jUnitXML) {
         return __awaiter(this, void 0, void 0, function* () {