From 99576d59b9fc0a52007dd1903d940c4066d3d4ec Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Fri, 5 Jun 2026 12:53:01 +0100 Subject: [PATCH] Fix broken log grouping due to nested log group --- lib/entry-points.js | 19 +++++++++---------- src/diff-informed-analysis-utils.ts | 21 ++++++++++----------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/lib/entry-points.js b/lib/entry-points.js index 0b55a8109d..68ac7319b1 100644 --- a/lib/entry-points.js +++ b/lib/entry-points.js @@ -150962,16 +150962,14 @@ async function prepareDiffInformedAnalysis(codeql, features, logger) { if (!branches) { return false; } - return await withGroupAsync("Computing PR diff ranges", async () => { - try { - return await computeAndPersistDiffRanges(branches, logger); - } catch (e) { - logger.warning( - `Failed to compute diff-informed analysis ranges: ${getErrorMessage(e)}` - ); - return false; - } - }); + try { + return await computeAndPersistDiffRanges(branches, logger); + } catch (e) { + logger.warning( + `Failed to compute diff-informed analysis ranges: ${getErrorMessage(e)}` + ); + return false; + } } function writeDiffRangesJsonFile(logger, ranges) { const jsonContents = JSON.stringify(ranges, null, 2); @@ -151024,6 +151022,7 @@ async function getPullRequestEditedDiffRanges(branches, logger) { return results; } async function computeAndPersistDiffRanges(branches, logger) { + logger.info("Computing PR diff ranges..."); const ranges = await getPullRequestEditedDiffRanges(branches, logger); if (ranges === void 0) { return false; diff --git a/src/diff-informed-analysis-utils.ts b/src/diff-informed-analysis-utils.ts index a48c6dcfdf..b8e9c6915d 100644 --- a/src/diff-informed-analysis-utils.ts +++ b/src/diff-informed-analysis-utils.ts @@ -5,7 +5,7 @@ import type { PullRequestBranches } from "./actions-util"; import { getApiClient, getGitHubVersion } from "./api-client"; import type { CodeQL } from "./codeql"; import { Feature, FeatureEnablement } from "./feature-flags"; -import { Logger, withGroupAsync } from "./logging"; +import { Logger } from "./logging"; import { getRepositoryNwoFromEnv } from "./repository"; import { getErrorMessage, GitHubVariant, satisfiesGHESVersion } from "./util"; @@ -83,16 +83,14 @@ export async function prepareDiffInformedAnalysis( return false; } - return await withGroupAsync("Computing PR diff ranges", async () => { - try { - return await computeAndPersistDiffRanges(branches, logger); - } catch (e) { - logger.warning( - `Failed to compute diff-informed analysis ranges: ${getErrorMessage(e)}`, - ); - return false; - } - }); + try { + return await computeAndPersistDiffRanges(branches, logger); + } catch (e) { + logger.warning( + `Failed to compute diff-informed analysis ranges: ${getErrorMessage(e)}`, + ); + return false; + } } export interface DiffThunkRange { @@ -192,6 +190,7 @@ export async function computeAndPersistDiffRanges( branches: PullRequestBranches, logger: Logger, ): Promise { + logger.info("Computing PR diff ranges..."); const ranges = await getPullRequestEditedDiffRanges(branches, logger); if (ranges === undefined) { return false;