Skip to content

Bump mvn cli detector timeout to 9 min #1771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grvillic merged 2 commits into from
Apr 8, 2026
Merged

Bump mvn cli detector timeout to 9 min #1771

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e07521f
Make mvn cli component respect cancellation token
zhenghao104 Apr 8, 2026
35b7f9d
chore: retrigger CI
zhenghao104 Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions src/Microsoft.ComponentDetection.Detectors/maven/MvnCliComponentDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,6 @@ public class MvnCliComponentDetector : FileComponentDetector
@"https?://[^\s\]\)>]+",
RegexOptions.Compiled | RegexOptions.IgnoreCase);

/// <summary>
/// Maximum time allowed for the OnPrepareDetectionAsync phase.
/// This is a safety guardrail to prevent hangs.
/// Most repos should complete the full Maven CLI scan within this window.
/// </summary>
private static readonly TimeSpan PrepareDetectionTimeout = TimeSpan.FromMinutes(5);

private readonly IMavenCommandService mavenCommandService;
private readonly IEnvironmentVariableService envVarService;
private readonly IFileUtilityService fileUtilityService;
Expand Down Expand Up @@ -298,20 +291,13 @@ protected override async Task<IObservable<ProcessRequest>> OnPrepareDetectionAsy
// This is critical because detectors are registered as singletons
this.ResetScanState();

// Wrap the entire method in a try-catch with timeout to protect against hangs.
// OnPrepareDetectionAsync doesn't have the same guardrails as OnFileFoundAsync,
// so we need to be extra careful here.
try
{
using var timeoutCts = new CancellationTokenSource(PrepareDetectionTimeout);
using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);

return await this.OnPrepareDetectionCoreAsync(processRequests, linkedCts.Token);
return await this.OnPrepareDetectionCoreAsync(processRequests, cancellationToken);
}
catch (OperationCanceledException) when (!cancellationToken.IsCancellationRequested)
catch (OperationCanceledException)
{
// Timeout occurred (not user cancellation)
this.LogWarning($"OnPrepareDetectionAsync timed out after {PrepareDetectionTimeout.TotalMinutes} minutes. Falling back to static pom.xml parsing.");
this.LogWarning("OnPrepareDetectionAsync was cancelled. Falling back to static pom.xml parsing.");
this.Telemetry["TimedOut"] = "true";
this.fallbackReason = MavenFallbackReason.OtherMvnCliFailure;
this.usedDetectionMethod = MavenDetectionMethod.Mixed;
Expand Down
Loading