Skip to content
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

fix: propagate TCCL with aws-crt http based client #1124

Merged
merged 1 commit into from
Feb 14, 2024
Merged

fix: propagate TCCL with aws-crt http based client #1124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 0 deletions ...rc/main/java/io/quarkus/amazon/cognitouserpools/deployment/CognitoUserPoolsProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import io.quarkus.deployment.builditem.ExecutorBuildItem;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.LaunchModeBuildItem;
import software.amazon.awssdk.services.cognitoidentityprovider.CognitoIdentityProviderAsyncClient;
import software.amazon.awssdk.services.cognitoidentityprovider.CognitoIdentityProviderAsyncClientBuilder;
import software.amazon.awssdk.services.cognitoidentityprovider.CognitoIdentityProviderClient;
Expand Down Expand Up @@ -179,6 +180,7 @@ void createClientBuilders(CognitoUserPoolsRecorder recorder,
BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
BuildProducer<AmazonClientSyncResultBuildItem> clientSync,
BuildProducer<AmazonClientAsyncResultBuildItem> clientAsync,
LaunchModeBuildItem launchModeBuildItem,
ExecutorBuildItem executorBuildItem) {

createClientBuilders(capabilities,
Expand All @@ -194,6 +196,7 @@ void createClientBuilders(CognitoUserPoolsRecorder recorder,
syntheticBeans,
clientSync,
clientAsync,
launchModeBuildItem,
executorBuildItem);
}
}
7 changes: 6 additions & 1 deletion ...ent/src/main/java/io/quarkus/amazon/common/deployment/AbstractAmazonServiceProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import io.quarkus.deployment.builditem.ExecutorBuildItem;
import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.LaunchModeBuildItem;
import io.quarkus.runtime.RuntimeValue;
import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder;
import software.amazon.awssdk.awscore.presigner.SdkPresigner;
Expand Down Expand Up @@ -261,6 +262,7 @@ protected void createClientBuilders(
BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
BuildProducer<AmazonClientSyncResultBuildItem> clientSync,
BuildProducer<AmazonClientAsyncResultBuildItem> clientAsync,
LaunchModeBuildItem launchModeBuildItem,
ExecutorBuildItem executorBuildItem) {

RuntimeValue<SdkPresigner.Builder> presignerBuilder = null;
Expand All @@ -279,12 +281,14 @@ protected void createClientBuilders(
syncClientBuilderClass,
(syncTransport) -> recorder.createSyncBuilder(syncTransport),
asyncClientBuilderClass,
(asyncTransport) -> recorder.createAsyncBuilder(asyncTransport, executorBuildItem.getExecutorProxy()),
(asyncTransport) -> recorder.createAsyncBuilder(asyncTransport, launchModeBuildItem.getLaunchMode(),
executorBuildItem.getExecutorProxy()),
presignerBuilderClass,
presignerBuilder,
syntheticBeans,
clientSync,
clientAsync,
launchModeBuildItem,
executorBuildItem);
}

Expand All @@ -306,6 +310,7 @@ private void createClientBuilders(
BuildProducer<SyntheticBeanBuildItem> syntheticBeans,
BuildProducer<AmazonClientSyncResultBuildItem> clientSync,
BuildProducer<AmazonClientAsyncResultBuildItem> clientAsync,
LaunchModeBuildItem launchModeBuildItem,
ExecutorBuildItem executorBuildItem) {
String configName = configName();

Expand Down
46 changes: 42 additions & 4 deletions common/runtime/src/main/java/io/quarkus/amazon/common/runtime/AmazonClientRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.util.concurrent.Executor;

import io.quarkus.runtime.LaunchMode;
import io.quarkus.runtime.RuntimeValue;
import software.amazon.awssdk.awscore.client.builder.AwsAsyncClientBuilder;
import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder;
Expand Down Expand Up @@ -43,24 +44,61 @@ public RuntimeValue<AwsClientBuilder> createSyncBuilder(RuntimeValue<Builder> tr
}

public RuntimeValue<AwsClientBuilder> createAsyncBuilder(RuntimeValue<SdkAsyncHttpClient.Builder> transport,
LaunchMode launchMode,
Executor executor) {
AwsAsyncClientBuilder<?, ?> builder = getAsyncClientBuilder();
AsyncHttpClientConfig config = getAsyncClientConfig();

if (transport != null) {
builder.httpClientBuilder(transport.getValue());
}

Executor configExecutor;

if (!config.advanced().useFutureCompletionThreadPool()) {
builder.asyncConfiguration(asyncConfigBuilder -> asyncConfigBuilder
.advancedOption(SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR, Runnable::run));
configExecutor = Runnable::run;
} else {
builder.asyncConfiguration(asyncConfigBuilder -> asyncConfigBuilder
.advancedOption(SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR, executor));
configExecutor = executor;
}

if (launchMode != LaunchMode.NORMAL) {
configExecutor = new ClassLoaderExecutorWrapper(executor);
}

final Executor futureCompletionExecutor = configExecutor;

builder.asyncConfiguration(asyncConfigBuilder -> asyncConfigBuilder
.advancedOption(SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR, futureCompletionExecutor));

return new RuntimeValue<>((AwsClientBuilder) builder);
}

public RuntimeValue<SdkPresigner.Builder> createPresignerBuilder() {
throw new UnsupportedOperationException();
}

/**
* Capture the current ClassLoader and restore it to support dev and test mode
*/
private static final class ClassLoaderExecutorWrapper implements Executor {

private Executor executor;
private ClassLoader contextClassLoader;

private ClassLoaderExecutorWrapper(Executor executor) {
this.executor = executor;
this.contextClassLoader = Thread.currentThread().getContextClassLoader();
}

@Override
public void execute(Runnable command) {
final ClassLoader old = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(contextClassLoader);
executor.execute(command);
} finally {
Thread.currentThread().setContextClassLoader(old);
}
}
}
}
Loading