Skip to content

Add the option to timeout per host and not per ip #977

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
merged 7 commits into from
Jul 11, 2025
Merged

Add the option to timeout per host and not per ip #977

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6606f03
Add the option to tiemout per url and not per ip
tomas-sexenian Jun 23, 2025
58b96e6
Switch propety - env order
tomas-sexenian Jun 23, 2025
bd04970
Revert "Switch propety - env order"
tomas-sexenian Jul 2, 2025
668d7df
Revert "Add the option to tiemout per url and not per ip"
tomas-sexenian Jul 2, 2025
86f4deb
Apply ip resolver logic to pool also
tomas-sexenian Jul 2, 2025
69b007a
Merge branch 'master' into one-ip-timeout
tomas-sexenian Jul 10, 2025
1926f58
Switch if-else for ternay operator
tomas-sexenian Jul 10, 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
46 changes: 44 additions & 2 deletions java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@
import org.apache.http.*;
import org.apache.http.HttpResponse;
import org.apache.http.client.config.CookieSpecs;
import org.apache.http.conn.DnsResolver;
import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.conn.ssl.NoopHostnameVerifier;
import org.apache.http.entity.ContentType;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.impl.conn.SystemDefaultDnsResolver;
import org.apache.http.protocol.HttpContext;
import org.apache.http.auth.AuthSchemeProvider;
import org.apache.http.auth.AuthScope;
Expand Down Expand Up @@ -64,10 +66,44 @@

public class HttpClientJavaLib extends GXHttpClient {

private static class FirstIpDnsResolver implements DnsResolver {
private final DnsResolver defaultDnsResolver = new SystemDefaultDnsResolver();

@Override
public InetAddress[] resolve(final String host) throws UnknownHostException {
InetAddress[] allIps = defaultDnsResolver.resolve(host);
if (allIps != null && allIps.length > 0) {
return new InetAddress[]{allIps[0]};
}
return allIps;
}
}

private static String getGxIpResolverConfig() {
String name = "GX_USE_FIRST_IP_DNS";
String gxDns = System.getProperty(name);
if (gxDns == null || gxDns.trim().isEmpty()) {
gxDns = System.getenv(name);
}
if (gxDns != null && gxDns.trim().equalsIgnoreCase("true")) {
return gxDns.trim();
} else {
return null;
}
}


public HttpClientJavaLib() {
getPoolInstance();
ConnectionKeepAliveStrategy myStrategy = generateKeepAliveStrategy();
httpClientBuilder = HttpClients.custom().setConnectionManager(connManager).setConnectionManagerShared(true).setKeepAliveStrategy(myStrategy);
HttpClientBuilder builder = HttpClients.custom()
.setConnectionManager(connManager)
.setConnectionManagerShared(true)
.setKeepAliveStrategy(myStrategy);
if (getGxIpResolverConfig() != null) {
builder.setDnsResolver(new FirstIpDnsResolver());
}
httpClientBuilder = builder;
cookies = new BasicCookieStore();
streamsToClose = new Vector<>();
}
Expand All @@ -78,7 +114,13 @@ private static void getPoolInstance() {
RegistryBuilder.<ConnectionSocketFactory>create()
.register("http", PlainConnectionSocketFactory.INSTANCE).register("https", getSSLSecureInstance())
.build();
connManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
String useFirstIpDnsResolver = getGxIpResolverConfig();
if (useFirstIpDnsResolver != null) {
DnsResolver dnsResolver = new FirstIpDnsResolver();
connManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry, dnsResolver);
} else {
connManager = new PoolingHttpClientConnectionManager(socketFactoryRegistry);
}
Copy link
Collaborator

@iroqueta iroqueta Jul 10, 2025

Choose a reason for hiding this comment

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

Maybe it better to use
boolean useCustomDnsResolver = getGxIpResolverConfig() != null;

PoolingHttpClientConnectionManager connManager = useCustomDnsResolver
? new PoolingHttpClientConnectionManager(socketFactoryRegistry, new FirstIpDnsResolver())
: new PoolingHttpClientConnectionManager(socketFactoryRegistry);

connManager.setMaxTotal((int) CommonUtil.val(clientCfg.getProperty("Client", "HTTPCLIENT_MAX_SIZE", "1000")));
connManager.setDefaultMaxPerRoute((int) CommonUtil.val(clientCfg.getProperty("Client", "HTTPCLIENT_MAX_PER_ROUTE", "1000")));

Expand Down
Loading