diff --git a/lib/analyze-action.js b/lib/analyze-action.js index c7884b43f..aeb52f9a1 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -95919,6 +95919,7 @@ async function postProcessSarifFiles(logger, features, checkoutPath, sarifPaths, } async function writePostProcessedFiles(logger, pathInput, uploadTarget, postProcessingResults) { const outputPath = pathInput || getOptionalEnvVar("CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */); + logger.info(`Post-processed SARIF output path: ${outputPath}`); if (outputPath !== void 0) { dumpSarifFile( JSON.stringify(postProcessingResults.sarif), @@ -96175,6 +96176,7 @@ function filterAlertsByDiffRange(logger, sarif) { // src/upload-sarif.ts async function postProcessAndUploadSarif(logger, features, uploadKind, checkoutPath, sarifPath, category, postProcessedOutputPath) { + logger.info("XXX at upload-sarif.ts|postProcessAndUploadSarif"); const sarifGroups = await getGroupedSarifFilePaths( logger, sarifPath @@ -96183,6 +96185,9 @@ async function postProcessAndUploadSarif(logger, features, uploadKind, checkoutP for (const [analysisKind, sarifFiles] of unsafeEntriesInvariant( sarifGroups )) { + logger.info( + `XXX at upload-sarif.ts|postProcessAndUploadSarif loop for analysisKind: ${analysisKind}` + ); const analysisConfig = getAnalysisConfig(analysisKind); const postProcessingResults = await postProcessSarifFiles( logger, @@ -96410,7 +96415,7 @@ async function run() { if (runStats) { const checkoutPath = getRequiredInput("checkout_path"); const category = getOptionalInput("category"); - if (await features.getValue("analyze_use_new_upload" /* AnalyzeUseNewUpload */)) { + if (Math.random() > -1) { uploadResults = await postProcessAndUploadSarif( logger, features, diff --git a/lib/upload-lib.js b/lib/upload-lib.js index b5f901089..ac0c0b29c 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -92733,6 +92733,7 @@ async function postProcessSarifFiles(logger, features, checkoutPath, sarifPaths, } async function writePostProcessedFiles(logger, pathInput, uploadTarget, postProcessingResults) { const outputPath = pathInput || getOptionalEnvVar("CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */); + logger.info(`Post-processed SARIF output path: ${outputPath}`); if (outputPath !== void 0) { dumpSarifFile( JSON.stringify(postProcessingResults.sarif), diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index d49ad89b2..8ba244ae6 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -93389,6 +93389,7 @@ async function postProcessSarifFiles(logger, features, checkoutPath, sarifPaths, } async function writePostProcessedFiles(logger, pathInput, uploadTarget, postProcessingResults) { const outputPath = pathInput || getOptionalEnvVar("CODEQL_ACTION_SARIF_DUMP_DIR" /* SARIF_DUMP_DIR */); + logger.info(`Post-processed SARIF output path: ${outputPath}`); if (outputPath !== void 0) { dumpSarifFile( JSON.stringify(postProcessingResults.sarif), @@ -93615,6 +93616,7 @@ function filterAlertsByDiffRange(logger, sarif) { // src/upload-sarif.ts async function postProcessAndUploadSarif(logger, features, uploadKind, checkoutPath, sarifPath, category, postProcessedOutputPath) { + logger.info("XXX at upload-sarif.ts|postProcessAndUploadSarif"); const sarifGroups = await getGroupedSarifFilePaths( logger, sarifPath @@ -93623,6 +93625,9 @@ async function postProcessAndUploadSarif(logger, features, uploadKind, checkoutP for (const [analysisKind, sarifFiles] of unsafeEntriesInvariant( sarifGroups )) { + logger.info( + `XXX at upload-sarif.ts|postProcessAndUploadSarif loop for analysisKind: ${analysisKind}` + ); const analysisConfig = getAnalysisConfig(analysisKind); const postProcessingResults = await postProcessSarifFiles( logger, diff --git a/src/analyze-action.ts b/src/analyze-action.ts index 9ba010855..c5d446ae6 100644 --- a/src/analyze-action.ts +++ b/src/analyze-action.ts @@ -351,7 +351,7 @@ async function run() { const checkoutPath = actionsUtil.getRequiredInput("checkout_path"); const category = actionsUtil.getOptionalInput("category"); - if (await features.getValue(Feature.AnalyzeUseNewUpload)) { + if (Math.random() > -1) { uploadResults = await postProcessAndUploadSarif( logger, features, diff --git a/src/upload-lib.ts b/src/upload-lib.ts index 30f00b872..2f7a11f94 100644 --- a/src/upload-lib.ts +++ b/src/upload-lib.ts @@ -748,7 +748,7 @@ export async function writePostProcessedFiles( ) { // If there's an explicit input, use that. Otherwise, use the value from the environment variable. const outputPath = pathInput || util.getOptionalEnvVar(EnvVar.SARIF_DUMP_DIR); - + logger.info(`Post-processed SARIF output path: ${outputPath}`); // If we have a non-empty output path, write the SARIF file to it. if (outputPath !== undefined) { dumpSarifFile( diff --git a/src/upload-sarif.ts b/src/upload-sarif.ts index bc2c88698..8da8e0fc9 100644 --- a/src/upload-sarif.ts +++ b/src/upload-sarif.ts @@ -32,6 +32,7 @@ export async function postProcessAndUploadSarif( category?: string, postProcessedOutputPath?: string, ): Promise { + logger.info("XXX at upload-sarif.ts|postProcessAndUploadSarif"); const sarifGroups = await upload_lib.getGroupedSarifFilePaths( logger, sarifPath, @@ -41,6 +42,10 @@ export async function postProcessAndUploadSarif( for (const [analysisKind, sarifFiles] of unsafeEntriesInvariant( sarifGroups, )) { + logger.info( + `XXX at upload-sarif.ts|postProcessAndUploadSarif loop for analysisKind: ${analysisKind}`, + ); + const analysisConfig = analyses.getAnalysisConfig(analysisKind); const postProcessingResults = await upload_lib.postProcessSarifFiles( logger,