Skip to content

Make apache5.x as default client if in class path #6190

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
joviegas wants to merge 34 commits into
base: feature/master/apache5x
Choose a base branch
from
Open

Make apache5.x as default client if in class path #6190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
9e8fc15
Fix architecture test failures for apache5.x
joviegas May 29, 2025
70a120e
Merge branch 'feature/master/apache5x' into joviegas/apache-5-achitec…
joviegas May 29, 2025
c7b09a2
Merge issues resolved
joviegas May 29, 2025
068cada
Checkstyle issues
joviegas May 29, 2025
4766e74
Update to use PoolingHttpClientConnectionManager class reference that…
joviegas May 30, 2025
c81efdc
Merge branch 'master' into joviegas/apache-5-achitecture-test-fix
joviegas May 30, 2025
6b64589
Merge branch 'feature/master/apache5x' into joviegas/apache-5-achitec…
joviegas May 30, 2025
89debeb
Merge branch 'feature/master/apache5x' into joviegas/apache-5-achitec…
joviegas Jun 2, 2025
7f9e77f
Fix stream reset failure in RepeatableInputStreamRequestEntity by sto…
joviegas Jun 3, 2025
5fb2d35
writeTo_ConcurrentWrites_HandlesCorrectly no longer needed since even…
joviegas Jun 3, 2025
52fedbd
Merge branch 'feature/master/apache5x' into joviegas/apache-5-achitec…
joviegas Jun 9, 2025
8b83790
Fix connectionPoolingWorks by setting skipping setConnectionTimeToLi…
joviegas Jun 9, 2025
d257454
Make apache5.x as default client if in class path
joviegas Jun 17, 2025
14a2ead
disableAutomaticRetries in Apache 5.x since SDK handles retries , als…
joviegas Jun 17, 2025
9431959
Merge branch 'feature/master/apache5x' into joviegas/apache-5-achitec…
joviegas Jun 17, 2025
5f33ad9
Added Test case for Async , handled review ocmments
joviegas Jun 19, 2025
270c0f7
Donot do buffer the response using BufferedHttpEntity since it might …
joviegas Jun 21, 2025
1a18785
merge from master
joviegas Jun 21, 2025
e2d16ad
Fix compilation issues
joviegas Jun 21, 2025
85efdaf
Fix checkstyle issues
joviegas Jun 21, 2025
bb70f7d
Remove test which are specific to apache http
joviegas Jun 21, 2025
c982c6e
merge response stream fix
joviegas Jun 21, 2025
1e693e2
Add the benchmark
joviegas Jun 24, 2025
a31c5a7
Merge baseline
joviegas Jun 26, 2025
10e71a5
Update Apache to 5.5
joviegas Jun 26, 2025
c0d52cc
Update name space prefix
joviegas Jun 26, 2025
4b2d752
Merge branch 'feature/master/apache5x' into feature/master/apache5-as…
joviegas Jun 30, 2025
1b1caa0
Handled Surface API review comments
joviegas Jul 1, 2025
d04b8d7
Merge branch 'joviegas/post-surface-api-review' into feature/master/a…
joviegas Jul 1, 2025
2efc926
Added a single test for localaddress
joviegas Jul 2, 2025
a037aac
Added configs for Proxy settings
joviegas Jul 10, 2025
382b896
Merge branch 'feature/master/apache5x' into feature/master/apache5-as…
joviegas Jul 14, 2025
38b6b3d
flaky test cases disabled
joviegas Jul 14, 2025
fdf0cd0
Merge branch 'feature/master/apache5x' into feature/master/apache5-as…
joviegas Aug 1, 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
6 changes: 6 additions & 0 deletions core/aws-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,12 @@
<version>${awsjavasdk.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache5-client</artifactId>
<version>${awsjavasdk.version}-PREVIEW</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions core/sdk-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@
<version>${awsjavasdk.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache5-client</artifactId>
<version>${awsjavasdk.version}-PREVIEW</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
Expand Down
7 changes: 4 additions & 3 deletions ...ava/software/amazon/awssdk/core/internal/http/loader/ClasspathSdkHttpServiceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@ final class ClasspathSdkHttpServiceProvider<T> implements SdkHttpServiceProvider

static final Map<String, Integer> SYNC_HTTP_SERVICES_PRIORITY =
ImmutableMap.<String, Integer>builder()
.put("software.amazon.awssdk.http.apache.ApacheSdkHttpService", 1)
.put("software.amazon.awssdk.http.urlconnection.UrlConnectionSdkHttpService", 2)
.put("software.amazon.awssdk.http.crt.AwsCrtSdkHttpService", 3)
.put("software.amazon.awssdk.http.apache5.Apache5SdkHttpService", 1)
.put("software.amazon.awssdk.http.apache.ApacheSdkHttpService", 2)
.put("software.amazon.awssdk.http.urlconnection.UrlConnectionSdkHttpService", 3)
.put("software.amazon.awssdk.http.crt.AwsCrtSdkHttpService", 4)
.build();

static final Map<String, Integer> ASYNC_HTTP_SERVICES_PRIORITY =
Expand Down
2 changes: 0 additions & 2 deletions ...ftware/amazon/awssdk/transfer/s3/S3TransferManagerDownloadPauseResumeIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,6 @@ void pauseAndResume_ObjectEtagChange_shouldRestartDownload(S3TransferManager tm)
}
}

@ParameterizedTest
@MethodSource("transferManagers")
void pauseAndResume_ObjectNotChanged_shouldResumeDownload(S3TransferManager tm) {
Path path = RandomTempFile.randomUncreatedFile().toPath();
TestDownloadListener testDownloadListener = new TestDownloadListener();
Expand Down
6 changes: 6 additions & 0 deletions services/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,12 @@
<version>${awsjavasdk.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<artifactId>apache5-client</artifactId>
<groupId>software.amazon.awssdk</groupId>
<version>${awsjavasdk.version}-PREVIEW</version>
<scope>runtime</scope>
</dependency>
<dependency>
<artifactId>netty-nio-client</artifactId>
<groupId>software.amazon.awssdk</groupId>
Expand Down
6 changes: 6 additions & 0 deletions test/codegen-generated-classes-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,12 @@
<version>${awsjavasdk.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache5-client</artifactId>
<version>${awsjavasdk.version}-PREVIEW</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions test/module-path-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
<artifactId>apache-client</artifactId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache5-client</artifactId>
<version>${awsjavasdk.version}-PREVIEW</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>netty-nio-client</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions test/protocol-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@
<version>${awsjavasdk.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache5-client</artifactId>
<version>${awsjavasdk.version}-PREVIEW</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>http-client-spi</artifactId>
Expand Down
34 changes: 32 additions & 2 deletions ...hmarks/src/main/java/software/amazon/awssdk/s3benchmarks/s3express/S3BenchmarkRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.core.metrics.CoreMetric;
import software.amazon.awssdk.http.HttpMetric;
import software.amazon.awssdk.http.apache.ApacheHttpClient;
import software.amazon.awssdk.http.apache5.Apache5HttpClient;
import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
import software.amazon.awssdk.metrics.MetricLevel;
import software.amazon.awssdk.metrics.MetricPublisher;
Expand Down Expand Up @@ -67,12 +69,13 @@ public static void runBenchmarks(boolean useS3Express) {

S3Client s3Client = S3BenchmarkTestUtils.s3ClientBuilder(region)
.credentialsProvider(credentialsProvider)
.httpClient(ApacheHttpClient.create())
.overrideConfiguration(o -> o.addMetricPublisher(
metricPublisher(cloudwatchClient,
namespacePrefix + "/SmallObject/Apache")))
.build();

LOGGER.info(() -> "Running small objects benchmark, 64Kb data, 5 buckets, 200 iterations");
LOGGER.info(() -> "Running small objects benchmark with Apache4 Http Client, 64Kb data, 5 buckets, 200 iterations");
BenchmarkConfig smallObjectSyncConfig = BenchmarkConfig.builder()
.region(region)
.credentialsProvider(credentialsProvider)
Expand All @@ -93,7 +96,7 @@ public static void runBenchmarks(boolean useS3Express) {
namespacePrefix + "/MediumObject/Apache")))
.build();

LOGGER.info(() -> "Running medium objects benchmark, 1024Kb data, 5 buckets, 200 iterations");
LOGGER.info(() -> "Running medium objects benchmark with Apache4 Http Client, 1024Kb data, 5 buckets, 200 iterations");
BenchmarkConfig largeObjectSyncConfig = BenchmarkConfig.builder()
.region(region)
.credentialsProvider(credentialsProvider)
Expand All @@ -108,6 +111,33 @@ public static void runBenchmarks(boolean useS3Express) {

s3Client.close();

s3Client = S3BenchmarkTestUtils.s3ClientBuilder(region)
.credentialsProvider(credentialsProvider)
.httpClient(Apache5HttpClient.create())
.overrideConfiguration(o -> o.addMetricPublisher(
metricPublisher(cloudwatchClient,
namespacePrefix + "/SmallObject/Apache5")))
.build();

LOGGER.info(() -> "Running small objects benchmark with Apache5 Http Client, 64Kb data, 5 buckets, 200 iterations");
syncBenchmark = new S3PutGetDeleteSyncBenchmark(smallObjectSyncConfig, s3Client);
syncBenchmark.run();
s3Client.close();

s3Client = S3BenchmarkTestUtils.s3ClientBuilder(region)
.credentialsProvider(credentialsProvider)
.httpClient(Apache5HttpClient.create())
.overrideConfiguration(o -> o.addMetricPublisher(
metricPublisher(cloudwatchClient,
namespacePrefix + "/MediumObject/Apache5")))
.build();

LOGGER.info(() -> "Running medium objects benchmark with Apache5 Http Client, 1024Kb data, 5 buckets, 200 iterations");
syncBenchmark = new S3PutGetDeleteSyncBenchmark(largeObjectSyncConfig, s3Client);
syncBenchmark.run();
s3Client.close();


S3AsyncClient s3AsyncClient = S3BenchmarkTestUtils.s3AsyncClientBuilder(region)
.credentialsProvider(credentialsProvider)
.overrideConfiguration(o -> o.addMetricPublisher(
Expand Down
5 changes: 5 additions & 0 deletions test/sdk-native-image-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
<version>${awsjavasdk.version}</version>
</dependency>

<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache5-client</artifactId>
<version>${awsjavasdk.version}-PREVIEW</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
Expand Down
6 changes: 6 additions & 0 deletions test/stability-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@
<version>${awsjavasdk.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>apache5-client</artifactId>
<version>${awsjavasdk.version}-PREVIEW</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>netty-nio-client</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions test/tests-coverage-reporting/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,11 @@
<groupId>software.amazon.awssdk</groupId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<artifactId>apache-client</artifactId>
<groupId>software.amazon.awssdk</groupId>
<version>${awsjavasdk.version}</version>
</dependency>
<dependency>
<artifactId>aws-crt-client</artifactId>
<groupId>software.amazon.awssdk</groupId>
Expand Down
Loading