Skip to content

ScatterGatherApi gracefully handling OperationCanceledException for improved logging #3759

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
ramonsmits merged 2 commits into from
Oct 18, 2023
Merged

ScatterGatherApi gracefully handling OperationCanceledException for improved logging #3759

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e829c3
#3758
ramonsmits Oct 18, 2023
16f4ec8
error CS0168: The variable 'oce' is declared but never used
ramonsmits Oct 18, 2023
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
13 changes: 10 additions & 3 deletions src/ServiceControl/CompositeViews/Messages/ScatterGatherApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ protected ScatterGatherApi(TDataStore store, Settings settings, Func<HttpClient>
DataStore = store;
Settings = settings;
HttpClientFactory = httpClientFactory;
Logger = LogManager.GetLogger(GetType());
}

protected TDataStore DataStore { get; }
Expand Down Expand Up @@ -124,12 +125,18 @@ async Task<QueryResult<TOut>> FetchAndParse(HttpRequestMessage currentRequest, U
catch (HttpRequestException httpRequestException)
{
DisableRemoteInstance(remoteUri);
logger.Warn($"An HttpRequestException occurred when quering remote instance at {remoteUri}. The instance at uri: {remoteUri} will be temporarily disabled.", httpRequestException);
Logger.Warn($"An HttpRequestException occurred when quering remote instance at {remoteUri}. The instance at uri: {remoteUri} will be temporarily disabled.",
httpRequestException);
return QueryResult<TOut>.Empty();
}
catch (OperationCanceledException)
{
Logger.Warn($"Failed to query remote instance at {remoteUri} due to a timeout");
return QueryResult<TOut>.Empty();
}
catch (Exception exception)
{
logger.Warn($"Failed to query remote instance at {remoteUri}.", exception);
Logger.Warn($"Failed to query remote instance at {remoteUri}.", exception);
return QueryResult<TOut>.Empty();
}
}
Expand Down Expand Up @@ -167,7 +174,7 @@ static async Task<QueryResult<TOut>> ParseResult(HttpResponseMessage responseMes
}
}

static readonly ILog logger = LogManager.GetLogger(typeof(ScatterGatherApi<TDataStore, TIn, TOut>));
readonly ILog Logger;
}

abstract class ScatterGatherApiNoInput<TStore, TOut> : ScatterGatherApi<TStore, NoInput, TOut>
Expand Down