Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions oap-http/oap-http/src/main/java/oap/http/client/OapHttpClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.eclipse.jetty.client.WWWAuthenticationProtocolHandler;
import org.eclipse.jetty.http.HttpCookieStore;
import org.eclipse.jetty.io.ClientConnector;
import org.eclipse.jetty.util.SocketAddressResolver;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.VirtualThreadPool;
import org.xbill.DNS.Address;
Expand Down Expand Up @@ -57,6 +58,7 @@ public static class OapHttpClientBuilder {
private HttpCookieStore cookieStore;
private ConnectionPool.Factory connectionPoolFactory;
private ConnectionPoolFactoryType connectionPoolFactoryType;
private SocketAddressResolver socketAddressResolver;

public OapHttpClientBuilder transport( AbstractConnectorHttpClientTransport httpClientTransport ) {
this.httpClientTransport = httpClientTransport;
Expand Down Expand Up @@ -112,6 +114,12 @@ public OapHttpClientBuilder withConnectionPoolFactoryType( ConnectionPoolFactory
return this;
}

public OapHttpClientBuilder withSocketAddressResolver( SocketAddressResolver socketAddressResolver ) {
this.socketAddressResolver = socketAddressResolver;

return this;
}

@SneakyThrows
public HttpClient build() {
HttpClient httpClient = httpClientTransport != null ? new HttpClient( httpClientTransport ) : new HttpClient();
Expand Down Expand Up @@ -141,6 +149,8 @@ public HttpClient build() {
promise.failed( e );
}
} );
} else if( socketAddressResolver != null ) {
httpClient.setSocketAddressResolver( socketAddressResolver );
}

if( metrics != null ) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package oap.http.client;

import org.apache.commons.lang3.RandomUtils;
import org.eclipse.jetty.util.Promise;
import org.eclipse.jetty.util.SocketAddressResolver;

import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.util.List;
import java.util.Map;

public class RandomSocketAddressResolver implements SocketAddressResolver {
private static final RandomUtils RANDOM_UTILS = RandomUtils.insecure();

@Override
public void resolve( String host, int port, Map<String, Object> context, Promise<List<InetSocketAddress>> promise ) {
try {
InetAddress[] addresses = InetAddress.getAllByName( host );

int length = addresses.length;
if( length > 0 ) {
int i = length > 1 ? RANDOM_UTILS.randomInt( 0, length ) : 0;
promise.succeeded( List.of( new InetSocketAddress( addresses[i], port ) ) );
} else {
promise.failed( new UnknownHostException() );
}

} catch( Throwable ex ) {
promise.failed( ex );
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package oap.http.client;

import org.eclipse.jetty.util.Promise;
import org.eclipse.jetty.util.SocketAddressResolver;

import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;

public class RoundRobinSocketAddressResolver implements SocketAddressResolver {
private final AtomicInteger counter = new AtomicInteger();

@Override
public void resolve( String host, int port, Map<String, Object> context, Promise<List<InetSocketAddress>> promise ) {
try {
InetAddress[] addresses = InetAddress.getAllByName( host );

int length = addresses.length;
if( length > 0 ) {
int i = length > 1 ? counter.incrementAndGet() % length : 0;
promise.succeeded( List.of( new InetSocketAddress( addresses[i], port ) ) );
} else {
promise.failed( new UnknownHostException() );
}

} catch( Throwable ex ) {
promise.failed( ex );
}
}
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</distributionManagement>

<properties>
<oap.project.version>25.6.5</oap.project.version>
<oap.project.version>25.6.6</oap.project.version>

<oap.deps.config.version>25.0.1</oap.deps.config.version>
<oap.deps.oap-teamcity.version>25.0.0</oap.deps.oap-teamcity.version>
Expand Down
Loading