Skip to content

fix(sdk): improve http client shutdown and resource management #319

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
cshamrick wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix(sdk): improve http client shutdown and resource management #319

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0adaf5
fix(sdk): Share OkHttpClient instance to prevent resource leaks
cshamrick Dec 8, 2025
fc8a6ea
Merge branch 'main' into fix-builder
cshamrick Dec 8, 2025
88f7520
fix(sdk): kasclient no longer closes shared http client
cshamrick Dec 8, 2025
9cd5fa5
fix(sdk): improve http client shutdown and resource management
cshamrick Dec 9, 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
3 changes: 1 addition & 2 deletions sdk/src/main/java/io/opentdf/platform/sdk/KASClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ public KASKeyCache getKeyCache() {

@Override
public synchronized void close() {
this.httpClient.dispatcher().cancelAll();
this.httpClient.connectionPool().evictAll();
// KASClient is no longer responsible for closing the shared http client
}

static class RewrapRequestBody {
Expand Down
11 changes: 5 additions & 6 deletions sdk/src/main/java/io/opentdf/platform/sdk/SDKBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public SDKBuilder protocol(ProtocolType protocolType) {
return this;
}

private Interceptor getAuthInterceptor(RSAKey rsaKey) {
private Interceptor getAuthInterceptor(RSAKey rsaKey, OkHttpClient httpClient) {
if (platformEndpoint == null) {
throw new SDKException("cannot build an SDK without specifying the platform endpoint");
}
Expand All @@ -191,7 +191,6 @@ private Interceptor getAuthInterceptor(RSAKey rsaKey) {
// we don't add the auth listener to this channel since it is only used to call
// the well known endpoint
GetWellKnownConfigurationResponse config;
var httpClient = getHttpClient();
ProtocolClient bootstrapClient = getUnauthenticatedProtocolClient(platformEndpoint, httpClient) ;
var stub = new WellKnownServiceClient(bootstrapClient);
try {
Expand Down Expand Up @@ -266,9 +265,9 @@ ServicesAndInternals buildServices() {
}

this.platformEndpoint = AddressNormalizer.normalizeAddress(this.platformEndpoint, this.usePlainText);
var authInterceptor = getAuthInterceptor(dpopKey);
var kasClient = getKASClient(dpopKey, authInterceptor);
var httpClient = getHttpClient();
var authInterceptor = getAuthInterceptor(dpopKey, httpClient);
var kasClient = getKASClient(dpopKey, authInterceptor, httpClient);
var client = getProtocolClient(platformEndpoint, httpClient, authInterceptor);
var attributeService = new AttributesServiceClient(client);
var namespaceService = new NamespaceServiceClient(client);
Expand Down Expand Up @@ -341,9 +340,9 @@ public SDK.KAS kas() {
}

@Nonnull
private KASClient getKASClient(RSAKey dpopKey, Interceptor interceptor) {
private KASClient getKASClient(RSAKey dpopKey, Interceptor interceptor, OkHttpClient httpClient) {
BiFunction<OkHttpClient, String, ProtocolClient> protocolClientFactory = (OkHttpClient client, String address) -> getProtocolClient(address, client, interceptor);
return new KASClient(getHttpClient(), protocolClientFactory, dpopKey, usePlainText);
return new KASClient(httpClient, protocolClientFactory, dpopKey, usePlainText);
}

public SDK build() {
Expand Down
Loading