Add diff logic and parallel logger support for audit #642

eyalk007 · 2026-01-13T10:42:28Z

The pull request is targeting the dev branch.
The code has been validated to compile successfully by running go vet ./....
The code has been formatted properly using go fmt ./....
All static analysis checks passed.
All tests have passed. If this feature is not already covered by the tests, new tests have been added.
Updated the Contributing page / ReadMe page / CI Workflow files if needed.
All changes are detailed at the description. if not already covered at JFrog Documentation, new documentation have been added.

Depends on:

Add goroutine-local logger and BufferedLogger for parallel operations jfrog-client-go#1297

…Results) - based on v1.24.2

- Add branchdiff.go with RunBranchDiffAudit function - Scans target branch first, then source branch (sequential) - SCA diff handled internally by CLI - JAS diff handled by CompareJasResults - Add MergeStatusCodes for partial results filtering - Status codes merged (worst of target + source) for frogbot filtering

- Add logger field to AuditBasicParams with getter/setter - RunAudit swaps global logger if custom logger provided - Enables frogbot to capture logs per-scan for ordered output

- Add LogCollector that captures logs in isolated buffer per audit - Enables parallel audits without log interleaving - Uses goroutine-local logger from jfrog-client-go - Propagate logger to child goroutines in JAS runner and SCA scan - Remove unused diff completion log message

eyalk007 · 2026-01-13T10:59:48Z

utils/results/diff.go

+)
+
+// UnifyScaAndJasResults merges SCA and JAS diff results into a single SecurityCommandResults.
+func UnifyScaAndJasResults(scaResults, jasDiffResults *SecurityCommandResults) *SecurityCommandResults {


myabe needs to be moved to frogbot considering the specific use
and selected parallel audit implementation, your call @attiasas

eyalk007 · 2026-01-13T11:00:54Z

utils/results/diff.go

+}
+
+// MergeStatusCodes merges two ResultsStatus, taking the worst (non-zero) status for each scanner.
+func MergeStatusCodes(target, source ResultsStatus) ResultsStatus {


because am already did this,
need to discuss with @orto17 and @attiasas if partial results logic should be moved here

…eIncludedBuilds)

eyalk007 · 2026-01-15T12:36:02Z

utils/results/diff.go

+		}
+	}
+
+	log.Debug("[DIFF] Built target fingerprint set with", len(targetKeys), "unique keys")


honestly is it relevant?

eyalk007 added 6 commits January 5, 2026 15:07

Add parallel PR scanning functions (CompareJasResults, UnifyScaAndJas…

18c22a1

…Results) - based on v1.24.2

Add Logger field to AuditBasicParams for parallel scan log separation

caf59eb

- Add logger field to AuditBasicParams with getter/setter - RunAudit swaps global logger if custom logger provided - Enables frogbot to capture logs per-scan for ordered output

Update go.mod/go.sum

96ae51a

Update LogCollector with ReplayTo for proper log formatting

b22d7c4

eyalk007 self-assigned this Jan 13, 2026

eyalk007 requested a deployment to frogbot January 13, 2026 10:42 — with GitHub Actions Waiting

eyalk007 added the improvement Automatically generated release notes label Jan 13, 2026

Simplify comments to match repo style

16f7f21

eyalk007 requested a deployment to frogbot January 13, 2026 10:44 — with GitHub Actions Waiting

Remove accidentally added test file

c38b6c3

eyalk007 requested a deployment to frogbot January 13, 2026 10:45 — with GitHub Actions Waiting

eyalk007 added 2 commits January 13, 2026 12:52

Remove unused branchdiff.go

5e4a231

Clean up diff functions: remove AM references, simplify comments

86e70fd

eyalk007 requested a deployment to frogbot January 13, 2026 10:54 — with GitHub Actions Waiting

Move diff functions to separate file: utils/results/diff.go

37f3743

eyalk007 requested a deployment to frogbot January 13, 2026 10:58 — with GitHub Actions Waiting

eyalk007 commented Jan 13, 2026

View reviewed changes

Remove extra comments from logCollector field

b0eb167

eyalk007 requested a deployment to frogbot January 13, 2026 11:03 — with GitHub Actions Waiting

Add diff function tests adapted from analyzer-manager

957b363

eyalk007 requested a deployment to frogbot January 13, 2026 11:14 — with GitHub Actions Waiting

Merge upstream/dev - resolve conflicts (keep both logCollector and us…

809a52f

…eIncludedBuilds)

eyalk007 requested a deployment to frogbot January 13, 2026 11:17 — with GitHub Actions Waiting

eyalk007 added the safe to test Approve running integration tests on a pull request label Jan 13, 2026

github-actions bot removed the safe to test Approve running integration tests on a pull request label Jan 13, 2026

Remove unused MergeStatusCodes function and tests

a5897a9

eyalk007 requested a deployment to frogbot January 14, 2026 08:17 — with GitHub Actions Waiting

Fix UnifyScaAndJasResults to preserve Applicability from SCA scan

22f7713

eyalk007 requested a deployment to frogbot January 14, 2026 08:39 — with GitHub Actions Waiting

Fix: Copy GitContext in UnifyScaAndJasResults for proper upload paths

56609db

eyalk007 requested a deployment to frogbot January 14, 2026 10:30 — with GitHub Actions Waiting

CR fixes - update go.mod replace directive to use git commit

816605d

eyalk007 commented Jan 15, 2026

View reviewed changes

eyalk007 requested a deployment to frogbot January 15, 2026 15:26 — with GitHub Actions Waiting

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add diff logic and parallel logger support for audit #642

Add diff logic and parallel logger support for audit #642

Uh oh!

eyalk007 commented Jan 13, 2026 •

edited by attiasas

Loading

Uh oh!

eyalk007 Jan 13, 2026 •

edited

Loading

Uh oh!

eyalk007 Jan 13, 2026

Uh oh!

eyalk007 Jan 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Add diff logic and parallel logger support for audit #642

Are you sure you want to change the base?

Add diff logic and parallel logger support for audit #642

Uh oh!

Conversation

eyalk007 commented Jan 13, 2026 • edited by attiasas Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eyalk007 Jan 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eyalk007 Jan 13, 2026

Choose a reason for hiding this comment

Uh oh!

eyalk007 Jan 15, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

eyalk007 commented Jan 13, 2026 •

edited by attiasas

Loading

eyalk007 Jan 13, 2026 •

edited

Loading