Skip to content

chore: Enhance HttpClient5 Retry-Strategy for 429 and 503 responses #1009

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

Open
newtork wants to merge 3 commits into
base: main
Choose a base branch
from
Open

chore: Enhance HttpClient5 Retry-Strategy for 429 and 503 responses #1009

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
148ce3f
Set default retry strategy to no-retries
newtork Nov 18, 2025
14be48f
Merge remote-tracking branch 'origin/main' into httpclient5/disable-r…
newtork Nov 18, 2025
7b6ff0d
Add retry log message
newtork Nov 20, 2025
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
43 changes: 43 additions & 0 deletions ...in/java/com/sap/cloud/sdk/cloudplatform/connectivity/DefaultApacheHttpClient5Factory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.apache.hc.client5.http.classic.HttpClient;
import org.apache.hc.client5.http.config.ConnectionConfig;
import org.apache.hc.client5.http.config.RequestConfig;
import org.apache.hc.client5.http.impl.DefaultHttpRequestRetryStrategy;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
import org.apache.hc.client5.http.impl.classic.HttpClients;
Expand All @@ -24,8 +25,11 @@
import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
import org.apache.hc.client5.http.ssl.TlsSocketStrategy;
import org.apache.hc.core5.http.HttpHost;
import org.apache.hc.core5.http.HttpRequest;
import org.apache.hc.core5.http.HttpRequestInterceptor;
import org.apache.hc.core5.http.HttpResponse;
import org.apache.hc.core5.http.io.SocketConfig;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.util.Timeout;

import com.sap.cloud.sdk.cloudplatform.connectivity.exception.DestinationAccessException;
Expand Down Expand Up @@ -92,6 +96,7 @@ private CloseableHttpClient buildHttpClient(
.custom()
.setConnectionManager(getConnectionManager(destination))
.setDefaultRequestConfig(requestConfig)
.setRetryStrategy(new LoggingHttpRequestRetryStrategy(destination))
.setProxy(getProxy(destination));

if( requestInterceptor != null ) {
Expand Down Expand Up @@ -233,4 +238,42 @@ private boolean isValidProxyConfigurationUriInDestination( @Nullable final HttpD
}
return true;
}

private static class LoggingHttpRequestRetryStrategy extends DefaultHttpRequestRetryStrategy
{
final @Nullable HttpDestinationProperties destination;

public LoggingHttpRequestRetryStrategy( final @Nullable HttpDestinationProperties destination )
{
super();
this.destination = destination;
}

@Override
public boolean retryRequest( final HttpResponse response, final int execCount, final HttpContext context )
{
final boolean retry = super.retryRequest(response, execCount, context);
if( retry ) {
final String msg = "Retrying request for destination {} due to response {}. Retry attempt #{}.";
log.debug(msg, destination, response.getCode(), execCount);
}
return retry;
}

@Override
public boolean retryRequest(
final HttpRequest req,
final IOException exception,
final int execCount,
final HttpContext context )
{
final boolean retry = super.retryRequest(req, exception, execCount, context);
if( retry ) {
final String msg =
"Retrying {} request for destination {} to {} due to exception \"{}\". Retry attempt #{}.";
Copy link
Member

@MatKuhr MatKuhr Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"Retrying {} request for destination {} to {} due to exception \"{}\". Retry attempt #{}.";
"Retrying {} request to {} due to exception \"{}\". Retry attempt #{}.";

since destination can be null and may not add much information if the URL is absolute (is it?). Alternatively, explicit null check to avoid strange looking log?

log.debug(msg, req.getMethod(), destination, req.getRequestUri(), exception.getMessage(), execCount);
Copy link
Member

@MatKuhr MatKuhr Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be at least warn, maybe even error

Suggested change
log.debug(msg, req.getMethod(), destination, req.getRequestUri(), exception.getMessage(), execCount);
log.warn(msg, req.getMethod(), destination, req.getRequestUri(), exception.getMessage(), execCount);

}
return retry;
}
}
}