@datadog/datadog-ci-plugin-synthetics 5.20.0 → 5.21.0

package/dist/bundle.js

@@ -5761,7 +5761,7 @@ var require_glob = /* @__PURE__ */ __commonJSMin(((exports) => {
 var require_package$2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = {
 		"name": "@datadog/datadog-ci-base",
-		"version": "5.20.0",
+		"version": "5.21.0",
 		"description": "Base package for Datadog CI",
 		"license": "Apache-2.0",
 		"keywords": ["datadog", "datadog-ci"],
@@ -5889,13 +5889,14 @@ var require_package$2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#region ../base/dist/constants.js
 var require_constants$12 = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.METHOD_POST = exports.CONTENT_TYPE_VALUE_JSON = exports.CONTENT_TYPE_VALUE_PROTOBUF = exports.CONTENT_TYPE_HEADER = exports.SKIP_VERSION_BANNER_ENV_VAR = exports.LOG_FORMAT_ENV_VAR = exports.FIPS_IGNORE_ERROR_ENV_VAR = exports.FIPS_ENV_VAR = exports.DATADOG_SITES = exports.DATADOG_SITE_US2_GOV = exports.DATADOG_SITE_GOV = exports.DATADOG_SITE_AP2 = exports.DATADOG_SITE_AP1 = exports.DATADOG_SITE_US5 = exports.DATADOG_SITE_US3 = exports.DATADOG_SITE_EU1 = exports.DATADOG_SITE_US1 = void 0;
+	exports.METHOD_POST = exports.CONTENT_TYPE_VALUE_JSON = exports.CONTENT_TYPE_VALUE_PROTOBUF = exports.CONTENT_TYPE_HEADER = exports.SKIP_VERSION_BANNER_ENV_VAR = exports.LOG_FORMAT_ENV_VAR = exports.FIPS_IGNORE_ERROR_ENV_VAR = exports.FIPS_ENV_VAR = exports.DATADOG_SITES = exports.DATADOG_SITE_US2_GOV = exports.DATADOG_SITE_GOV = exports.DATADOG_SITE_UK1 = exports.DATADOG_SITE_AP2 = exports.DATADOG_SITE_AP1 = exports.DATADOG_SITE_US5 = exports.DATADOG_SITE_US3 = exports.DATADOG_SITE_EU1 = exports.DATADOG_SITE_US1 = void 0;
 	exports.DATADOG_SITE_US1 = "datadoghq.com";
 	exports.DATADOG_SITE_EU1 = "datadoghq.eu";
 	exports.DATADOG_SITE_US3 = "us3.datadoghq.com";
 	exports.DATADOG_SITE_US5 = "us5.datadoghq.com";
 	exports.DATADOG_SITE_AP1 = "ap1.datadoghq.com";
 	exports.DATADOG_SITE_AP2 = "ap2.datadoghq.com";
+	exports.DATADOG_SITE_UK1 = "uk1.datadoghq.com";
 	exports.DATADOG_SITE_GOV = "ddog-gov.com";
 	exports.DATADOG_SITE_US2_GOV = "us2.ddog-gov.com";
 	exports.DATADOG_SITES = [
@@ -5905,6 +5906,7 @@ var require_constants$12 = /* @__PURE__ */ __commonJSMin(((exports) => {
 		exports.DATADOG_SITE_US5,
 		exports.DATADOG_SITE_AP1,
 		exports.DATADOG_SITE_AP2,
+		exports.DATADOG_SITE_UK1,
 		exports.DATADOG_SITE_GOV,
 		exports.DATADOG_SITE_US2_GOV
 	];
@@ -64723,11 +64725,38 @@ var require_tags = /* @__PURE__ */ __commonJSMin(((exports) => {
 //#endregion
 //#region ../base/dist/helpers/ci.js
 var require_ci = /* @__PURE__ */ __commonJSMin(((exports) => {
+	var __awaiter = exports && exports.__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 = exports && exports.__importDefault || function(mod) {
 		return mod && mod.__esModule ? mod : { "default": mod };
 	};
 	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.getGithubJobIDFromLogs = exports.getGithubStepInfoFromLogs = exports.enrichCIEnvFromGithubLogs = exports.getGithubJobNameFromLogs = exports.isGithubWindowsRunner = exports.shouldGetGithubJobID = exports.shouldGetGithubJobDisplayName = exports.isInteractive = exports.getCIProvider = exports.isCI = exports.getCIEnv = exports.getCIMetadata = exports.getCISpanTags = exports.githubWellKnownDiagnosticDirPatternsWin = exports.githubWellKnownDiagnosticDirPatternsUnix = exports.githubWellKnownDiagnosticDirsWin = exports.githubWellKnownDiagnosticDirsUnix = exports.validateLevel = exports.LEVEL_TO_NUMBER = exports.VALID_LEVELS = exports.CI_LEVELS = exports.envDDGithubStepIndex = exports.envDDGithubJobName = exports.CI_ENGINES = void 0;
+	exports.getGithubJobIDFromLogs = exports.getGithubStepInfoFromLogs = exports.processLevels = exports.enrichCIEnvFromGithubLogs = exports.getGithubJobNameFromLogs = exports.createGithubLogCache = exports.isGithubWindowsRunner = exports.shouldGetGithubJobID = exports.shouldGetGithubJobDisplayName = exports.isInteractive = exports.getCIProvider = exports.isCI = exports.getCIEnv = exports.getCIMetadata = exports.getCISpanTags = exports.githubWellKnownDiagnosticDirPatternsWin = exports.githubWellKnownDiagnosticDirPatternsUnix = exports.githubWellKnownDiagnosticDirsWin = exports.githubWellKnownDiagnosticDirsUnix = exports.parseLevels = exports.validateLevel = exports.LEVEL_TO_NUMBER = exports.VALID_LEVELS = exports.CI_LEVELS = exports.envDDGithubStepIndex = exports.envDDGithubJobName = exports.CI_ENGINES = void 0;
 	const fs_1$2 = __importDefault(require("fs"));
 	const chalk_1 = __importDefault(require_source$3());
 	const upath_1 = __importDefault(require_upath());
@@ -64785,6 +64814,26 @@ var require_ci = /* @__PURE__ */ __commonJSMin(((exports) => {
 		if (level === exports.CI_LEVELS.STEP && provider !== exports.CI_ENGINES.GITHUB) return `Level '${exports.CI_LEVELS.STEP}' is only supported for provider [${exports.CI_ENGINES.GITHUB}]`;
 	};
 	exports.validateLevel = validateLevel;
+	/**
+	* Parses an additive, comma-separated `--level` value (e.g. "pipeline,stage").
+	* Trims each member, drops empties, dedupes, sorts by span depth, and validates
+	* every member (known value + provider support). Returns the parsed levels or,
+	* if anything is invalid or empty, a single aggregated error message.
+	*/
+	const parseLevels = (input) => {
+		const unique = uniq((input !== null && input !== void 0 ? input : "").split(",").map((p) => p.trim()).filter((p) => p.length > 0));
+		if (unique.length === 0) return {
+			levels: [],
+			error: `Level must be one of [${exports.VALID_LEVELS.join(", ")}]`
+		};
+		const errors = uniq(unique.map((p) => (0, exports.validateLevel)(p)).filter((e) => Boolean(e)));
+		if (errors.length > 0) return {
+			levels: [],
+			error: errors.join("; ")
+		};
+		return { levels: unique.sort((a, b) => exports.LEVEL_TO_NUMBER[a] - exports.LEVEL_TO_NUMBER[b]) };
+	};
+	exports.parseLevels = parseLevels;
 	exports.githubWellKnownDiagnosticDirsUnix = ["/home/runner/actions-runner/_diag", "/opt/actions-runner/_diag"];
 	exports.githubWellKnownDiagnosticDirsWin = ["C:/actions-runner/_diag"];
 	exports.githubWellKnownDiagnosticDirPatternsUnix = ["/home/runner/actions-runner/*/_diag", "/home/runner/actions-runner/*/*/_diag"];
@@ -65102,7 +65151,7 @@ var require_ci = /* @__PURE__ */ __commonJSMin(((exports) => {
 			}
 		}
 		if (env.BITBUCKET_COMMIT) {
-			const { BITBUCKET_REPO_FULL_NAME, BITBUCKET_BUILD_NUMBER, BITBUCKET_BRANCH, BITBUCKET_COMMIT, BITBUCKET_GIT_SSH_ORIGIN, BITBUCKET_GIT_HTTP_ORIGIN, BITBUCKET_TAG, BITBUCKET_PIPELINE_UUID, BITBUCKET_PR_ID, BITBUCKET_PR_DESTINATION_BRANCH, BITBUCKET_CLONE_DIR } = env;
+			const { BITBUCKET_REPO_FULL_NAME, BITBUCKET_BUILD_NUMBER, BITBUCKET_BRANCH, BITBUCKET_COMMIT, BITBUCKET_GIT_SSH_ORIGIN, BITBUCKET_GIT_HTTP_ORIGIN, BITBUCKET_TAG, BITBUCKET_PIPELINE_UUID, BITBUCKET_PR_ID, BITBUCKET_PR_DESTINATION_BRANCH, BITBUCKET_PR_DESTINATION_COMMIT, BITBUCKET_CLONE_DIR } = env;
 			const url = `https://bitbucket.org/${BITBUCKET_REPO_FULL_NAME}/addon/pipelines/home#!/results/${BITBUCKET_BUILD_NUMBER}`;
 			tags = {
 				[tags_1.CI_PROVIDER_NAME]: exports.CI_ENGINES.BITBUCKET,
@@ -65120,6 +65169,7 @@ var require_ci = /* @__PURE__ */ __commonJSMin(((exports) => {
 			if (BITBUCKET_PR_ID) {
 				tags[tags_1.PR_NUMBER] = BITBUCKET_PR_ID;
 				tags[tags_1.GIT_PULL_REQUEST_BASE_BRANCH] = BITBUCKET_PR_DESTINATION_BRANCH;
+				if (BITBUCKET_PR_DESTINATION_COMMIT) tags[tags_1.GIT_PULL_REQUEST_BASE_BRANCH_SHA] = BITBUCKET_PR_DESTINATION_COMMIT;
 			}
 		}
 		if (env.CF_BUILD_ID) {
@@ -65429,7 +65479,32 @@ var require_ci = /* @__PURE__ */ __commonJSMin(((exports) => {
 		return os.toLowerCase() === "windows";
 	};
 	exports.isGithubWindowsRunner = isGithubWindowsRunner;
-	const getGithubWorkerLogFiles = (context) => {
+	const createGithubLogCache = () => ({
+		workerLogFilesResolved: false,
+		workerLogFiles: void 0,
+		targetLogFilesResolved: false,
+		targetLogFiles: [],
+		fileContents: /* @__PURE__ */ new Map()
+	});
+	exports.createGithubLogCache = createGithubLogCache;
+	/** Reads a diagnostic log file, serving from (and populating) `cache` when provided. */
+	const readLogFile = (filePath, cache) => {
+		const cached = cache === null || cache === void 0 ? void 0 : cache.fileContents.get(filePath);
+		if (cached !== void 0) return cached;
+		const content = fs_1$2.default.readFileSync(filePath, "utf-8");
+		cache === null || cache === void 0 || cache.fileContents.set(filePath, content);
+		return content;
+	};
+	const getGithubWorkerLogFiles = (context, cache) => {
+		if (cache === null || cache === void 0 ? void 0 : cache.workerLogFilesResolved) return cache.workerLogFiles;
+		const result = computeGithubWorkerLogFiles(context);
+		if (cache) {
+			cache.workerLogFilesResolved = true;
+			cache.workerLogFiles = result;
+		}
+		return result;
+	};
+	const computeGithubWorkerLogFiles = (context) => {
 		let foundDiagDir = "";
 		let workerLogFiles = [];
 		let wellKnownDirs = expandDiagnosticDirCandidates([
@@ -65486,13 +65561,21 @@ var require_ci = /* @__PURE__ */ __commonJSMin(((exports) => {
 	*   which on a single-job runner is immediate, and on a multi-runner is the current
 	*   job's (most recent) log.
 	*/
-	const getTargetWorkerLogFiles = (context, foundDiagDir, workerLogFiles) => {
+	const getTargetWorkerLogFiles = (context, foundDiagDir, workerLogFiles, cache) => {
+		if (cache === null || cache === void 0 ? void 0 : cache.targetLogFilesResolved) return cache.targetLogFiles;
+		const result = computeTargetWorkerLogFiles(context, foundDiagDir, workerLogFiles, cache);
+		if (cache) {
+			cache.targetLogFilesResolved = true;
+			cache.targetLogFiles = result;
+		}
+		return result;
+	};
+	const computeTargetWorkerLogFiles = (context, foundDiagDir, workerLogFiles, cache) => {
 		const sortedNewestFirst = [...workerLogFiles].sort().reverse();
 		const orchestrationId = process.env.ACTIONS_ORCHESTRATION_ID;
 		if (orchestrationId) {
 			for (const logFile of sortedNewestFirst) {
-				const filePath = upath_1.default.join(foundDiagDir, logFile);
-				const content = fs_1$2.default.readFileSync(filePath, "utf-8");
+				const content = readLogFile(upath_1.default.join(foundDiagDir, logFile), cache);
 				if (content.includes("\"system.orchestrationId\":") && content.includes(`"${orchestrationId}"`)) {
 					context.stdout.write(`Found Worker log via system.orchestrationId for ${orchestrationId}: ${logFile}\n`);
 					return [logFile];
@@ -65502,11 +65585,10 @@ var require_ci = /* @__PURE__ */ __commonJSMin(((exports) => {
 		}
 		return sortedNewestFirst;
 	};
-	const getGithubJobAttributeFromLogFiles = (context, foundDiagDir, workerLogFiles, jobAttributeRegex) => {
-		const logsToCheck = getTargetWorkerLogFiles(context, foundDiagDir, workerLogFiles);
+	const getGithubJobAttributeFromLogFiles = (context, foundDiagDir, workerLogFiles, jobAttributeRegex, cache) => {
+		const logsToCheck = getTargetWorkerLogFiles(context, foundDiagDir, workerLogFiles, cache);
 		for (const logFile of logsToCheck) {
-			const filePath = upath_1.default.join(foundDiagDir, logFile);
-			const match = fs_1$2.default.readFileSync(filePath, "utf-8").match(jobAttributeRegex);
+			const match = readLogFile(upath_1.default.join(foundDiagDir, logFile), cache).match(jobAttributeRegex);
 			if (match && match[1]) return unescapeJsonString(match[1]);
 		}
 	};
@@ -65526,13 +65608,13 @@ var require_ci = /* @__PURE__ */ __commonJSMin(((exports) => {
 	*
 	* @returns The job display name, or undefined if not found
 	*/
-	const getGithubJobNameFromLogs = (context) => {
+	const getGithubJobNameFromLogs = (context, cache) => {
 		if (!(0, exports.shouldGetGithubJobDisplayName)()) return;
 		context.stdout.write("Determining GitHub job name\n");
-		const result = getGithubWorkerLogFiles(context);
+		const result = getGithubWorkerLogFiles(context, cache);
 		if (!result) return;
 		const [foundDiagDir, workerLogFiles] = result;
-		const jobDisplayName = getGithubJobAttributeFromLogFiles(context, foundDiagDir, workerLogFiles, githubJobDisplayNameRegex);
+		const jobDisplayName = getGithubJobAttributeFromLogFiles(context, foundDiagDir, workerLogFiles, githubJobDisplayNameRegex, cache);
 		if (!jobDisplayName) context.stderr.write(`${chalk_1.default.yellow.bold("[WARNING]")} could not find "jobDisplayName" attribute in GitHub diagnostic logs`);
 		else {
 			context.stdout.write(`Successfully extracted job name: ${jobDisplayName}\n`);
@@ -65546,16 +65628,16 @@ var require_ci = /* @__PURE__ */ __commonJSMin(((exports) => {
 	* - job: extracts job display name
 	* - pipeline/stage: no-op
 	*/
-	const enrichCIEnvFromGithubLogs = (context, level, ciEnv) => {
+	const enrichCIEnvFromGithubLogs = (context, level, ciEnv, cache) => {
 		switch (level) {
 			case exports.CI_LEVELS.STEP: {
-				const stepInfo = (0, exports.getGithubStepInfoFromLogs)(context);
+				const stepInfo = (0, exports.getGithubStepInfoFromLogs)(context, cache);
 				if (!ciEnv[exports.envDDGithubJobName]) ciEnv[exports.envDDGithubJobName] = stepInfo.jobDisplayName;
 				ciEnv[exports.envDDGithubStepIndex] = String(stepInfo.stepIndex);
 				break;
 			}
 			case exports.CI_LEVELS.JOB: {
-				const jobName = (0, exports.getGithubJobNameFromLogs)(context);
+				const jobName = (0, exports.getGithubJobNameFromLogs)(context, cache);
 				if (jobName) ciEnv[exports.envDDGithubJobName] = jobName;
 				break;
 			}
@@ -65564,6 +65646,48 @@ var require_ci = /* @__PURE__ */ __commonJSMin(((exports) => {
 	};
 	exports.enrichCIEnvFromGithubLogs = enrichCIEnvFromGithubLogs;
 	/**
+	* Sends the same payload to each requested CI level, one request per level.
+	*
+	* Shared by the `tag` and `measure` commands. Each level is enriched on its own
+	* copy of `ciEnv` (so e.g. the step index never leaks into the job request).
+	*
+	* Failure handling mirrors the original single-level behavior:
+	* - A setup/config error — a missing API key, or GitHub diagnostic logs that
+	*   cannot be located — is thrown and propagates to the caller's outer catch,
+	*   making it fatal regardless of `--no-fail`. The thrown error is annotated
+	*   with the failing level so the report says which one broke.
+	* - A request that completes but reports a non-zero status sets the returned
+	*   flag and the loop continues; the caller decides whether `--no-fail` turns
+	*   it into a success.
+	*
+	* A single `GithubLogCache` lives for the duration of the loop so the GitHub
+	* diagnostic logs are located and read at most once even when several levels
+	* need them (e.g. `--level job,step`).
+	*
+	* Returns `true` if any level reported a non-zero status. Callers own the
+	* `--no-fail`/success messaging and exit code based on this flag.
+	*/
+	const processLevels = (context, levels, ciEnv, sendForLevel) => __awaiter(void 0, void 0, void 0, function* () {
+		const cache = (0, exports.createGithubLogCache)();
+		let anyFailed = false;
+		for (const level of levels) {
+			let exitStatus;
+			try {
+				const levelEnv = Object.assign({}, ciEnv);
+				(0, exports.enrichCIEnvFromGithubLogs)(context, level, levelEnv, cache);
+				exitStatus = yield sendForLevel(levelEnv, exports.LEVEL_TO_NUMBER[level]);
+			} catch (error) {
+				throw new Error(`level '${level}': ${error.message}`);
+			}
+			if (exitStatus !== 0) {
+				anyFailed = true;
+				context.stderr.write(`${chalk_1.default.red.bold("[ERROR]")} failed to send for level '${level}'\n`);
+			}
+		}
+		return anyFailed;
+	});
+	exports.processLevels = processLevels;
+	/**
 	* Extracts the job display name and step index from GitHub Actions diagnostic logs.
 	*
 	* To avoid parsing the full Job message JSON (~26KB), we:
@@ -65571,18 +65695,17 @@ var require_ci = /* @__PURE__ */ __commonJSMin(((exports) => {
 	* 2. Extract only the `"steps": [...]` array from the Job message via bracket-depth tracking
 	* 3. Parse just that array and match `contextName` against `GITHUB_ACTION`
 	*/
-	const getGithubStepInfoFromLogs = (context) => {
+	const getGithubStepInfoFromLogs = (context, cache) => {
 		if ((0, exports.getCIProvider)() !== exports.CI_ENGINES.GITHUB) throw new Error("Step level is only supported for GitHub Actions");
 		const githubAction = process.env.GITHUB_ACTION;
 		if (!githubAction) throw new Error("GITHUB_ACTION environment variable is not set, cannot determine step index");
 		context.stdout.write("Determining GitHub step info from diagnostic logs\n");
-		const result = getGithubWorkerLogFiles(context);
+		const result = getGithubWorkerLogFiles(context, cache);
 		if (!result) throw new Error("Could not find GitHub diagnostic log files, cannot determine step index");
 		const [foundDiagDir, workerLogFiles] = result;
-		const logsToCheck = getTargetWorkerLogFiles(context, foundDiagDir, workerLogFiles);
+		const logsToCheck = getTargetWorkerLogFiles(context, foundDiagDir, workerLogFiles, cache);
 		for (const logFile of logsToCheck) {
-			const filePath = upath_1.default.join(foundDiagDir, logFile);
-			const content = fs_1$2.default.readFileSync(filePath, "utf-8");
+			const content = readLogFile(upath_1.default.join(foundDiagDir, logFile), cache);
 			const displayNameMatch = content.match(githubJobDisplayNameRegex);
 			if (!displayNameMatch || !displayNameMatch[1]) continue;
 			const jobDisplayName = unescapeJsonString(displayNameMatch[1]);