Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ public void requestFailed_connectionTimeout_shouldWrapException() {
SdkHttpRequest request = createRequest(uri);
RecordingResponseHandler recorder = new RecordingResponseHandler();
client.execute(AsyncExecuteRequest.builder().request(request).requestContentPublisher(createProvider("")).responseHandler(recorder).build());
assertThatThrownBy(() -> recorder.completeFuture().get(5, TimeUnit.SECONDS)).hasCauseInstanceOf(ConnectException.class);
assertThatThrownBy(() -> recorder.completeFuture().get(5, TimeUnit.SECONDS)).hasCauseInstanceOf(IOException.class)
.hasMessageContaining("socket");
Comment on lines +130 to +131
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated this test because it's a bit flaky, when I run it locally, it fails of socket timeout but when the CI runs it, it sometimes fails of operation timeout

}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ public void requestFailed_connectionTimeout_shouldWrapException() {
HttpExecuteRequest.Builder executeRequestBuilder = HttpExecuteRequest.builder();
executeRequestBuilder.request(request);
ExecutableHttpRequest executableRequest = client.prepareRequest(executeRequestBuilder.build());

assertThatThrownBy(() -> executableRequest.call()).isInstanceOf(IOException.class)
.hasMessageContaining("operation timed out");
.hasMessageContaining("socket");
Comment on lines -99 to +98
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same here. Updated this test because it's a bit flaky, when I run it locally, it fails of socket timeout but when the CI runs it, it sometimes fails of operation timeout

Copy link
Contributor

Choose a reason for hiding this comment

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

if it's flaky wouldn't we want to assert that it has either one of those strings?

}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@
import org.openjdk.jmh.runner.options.OptionsBuilder;
import software.amazon.awssdk.benchmark.apicall.MetricsEnabledBenchmark;
import software.amazon.awssdk.benchmark.apicall.httpclient.async.AwsCrtClientBenchmark;
import software.amazon.awssdk.benchmark.apicall.httpclient.async.AwsCrtH2ClientBenchmark;
import software.amazon.awssdk.benchmark.apicall.httpclient.async.NettyHttpClientH1Benchmark;
import software.amazon.awssdk.benchmark.apicall.httpclient.async.NettyHttpClientH2Benchmark;
import software.amazon.awssdk.benchmark.apicall.httpclient.async.NettyHttpClientH2PriorKnowledgeBenchmark;
import software.amazon.awssdk.benchmark.apicall.httpclient.sync.ApacheHttpClientBenchmark;
import software.amazon.awssdk.benchmark.apicall.httpclient.sync.CrtHttpClientBenchmark;
import software.amazon.awssdk.benchmark.apicall.httpclient.sync.UrlConnectionHttpClientBenchmark;
Expand Down Expand Up @@ -73,9 +74,10 @@ public class BenchmarkRunner {
QueryProtocolBenchmark.class.getSimpleName(), XmlProtocolBenchmark.class.getSimpleName());

private static final List<String> ASYNC_BENCHMARKS = Arrays.asList(
NettyHttpClientH2Benchmark.class.getSimpleName(),
NettyHttpClientH2PriorKnowledgeBenchmark.class.getSimpleName(),
NettyHttpClientH1Benchmark.class.getSimpleName(),
AwsCrtClientBenchmark.class.getSimpleName());
AwsCrtClientBenchmark.class.getSimpleName(),
AwsCrtH2ClientBenchmark.class.getSimpleName());

private static final List<String> SYNC_BENCHMARKS = Arrays.asList(
ApacheHttpClientBenchmark.class.getSimpleName(),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
* A copy of the License is located at
*
* http://aws.amazon.com/apache2.0
*
* or in the "license" file accompanying this file. This file is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
* express or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/

package software.amazon.awssdk.benchmark.apicall.httpclient.async;

import static software.amazon.awssdk.benchmark.utils.BenchmarkConstant.CONCURRENT_CALLS;
import static software.amazon.awssdk.benchmark.utils.BenchmarkUtils.awaitCountdownLatchUninterruptibly;
import static software.amazon.awssdk.benchmark.utils.BenchmarkUtils.countDownUponCompletion;

import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Fork;
import org.openjdk.jmh.annotations.Level;
import org.openjdk.jmh.annotations.Measurement;
import org.openjdk.jmh.annotations.Mode;
import org.openjdk.jmh.annotations.OperationsPerInvocation;
import org.openjdk.jmh.annotations.Scope;
import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.TearDown;
import org.openjdk.jmh.annotations.Warmup;
import org.openjdk.jmh.infra.Blackhole;
import org.openjdk.jmh.profile.StackProfiler;
import org.openjdk.jmh.runner.Runner;
import org.openjdk.jmh.runner.options.Options;
import org.openjdk.jmh.runner.options.OptionsBuilder;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.benchmark.apicall.httpclient.SdkHttpClientBenchmark;
import software.amazon.awssdk.benchmark.utils.MockH2Server;
import software.amazon.awssdk.crt.Log;
import software.amazon.awssdk.http.Protocol;
import software.amazon.awssdk.http.SdkHttpConfigurationOption;
import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
import software.amazon.awssdk.http.crt.AwsCrtAsyncHttpClient;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonAsyncClient;
import software.amazon.awssdk.utils.AttributeMap;

/**
* Benchmark for CRT HTTP client with HTTP/2 over TLS.
*/
@State(Scope.Benchmark)
@Warmup(iterations = 3, time = 15, timeUnit = TimeUnit.SECONDS)
@Measurement(iterations = 5, time = 10, timeUnit = TimeUnit.SECONDS)
@Fork(2)
@BenchmarkMode(Mode.Throughput)
public class AwsCrtH2ClientBenchmark implements SdkHttpClientBenchmark {

private MockH2Server mockServer;
private SdkAsyncHttpClient sdkHttpClient;
private ProtocolRestJsonAsyncClient client;

static {
//System.setProperty("aws.crt.debugnative", "true");
Log.initLoggingToStdout(Log.LogLevel.Error);
}

@Setup(Level.Trial)
public void setup() throws Exception {
mockServer = new MockH2Server(true);
mockServer.start();

sdkHttpClient = AwsCrtAsyncHttpClient.builder()
.buildWithDefaults(
AttributeMap.builder()
.put(SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES, true)
.put(SdkHttpConfigurationOption.PROTOCOL,
Protocol.HTTP2)
.build());

client = ProtocolRestJsonAsyncClient.builder()
.credentialsProvider(() -> AwsBasicCredentials.create("foo", "bar"))
.endpointOverride(mockServer.getHttpsUri())
.httpClient(sdkHttpClient)
.region(Region.US_EAST_1)
.build();

client.allTypes().join();
}

@TearDown(Level.Trial)
public void tearDown() throws Exception {
mockServer.stop();
client.close();
sdkHttpClient.close();
}

@Override
@Benchmark
@OperationsPerInvocation(CONCURRENT_CALLS)
public void concurrentApiCall(Blackhole blackhole) {
CountDownLatch countDownLatch = new CountDownLatch(CONCURRENT_CALLS);
for (int i = 0; i < CONCURRENT_CALLS; i++) {
countDownUponCompletion(blackhole, client.allTypes(), countDownLatch);
}
awaitCountdownLatchUninterruptibly(countDownLatch, 10, TimeUnit.SECONDS);
}

@Override
@Benchmark
public void sequentialApiCall(Blackhole blackhole) {
CountDownLatch countDownLatch = new CountDownLatch(1);
countDownUponCompletion(blackhole, client.allTypes(), countDownLatch);
awaitCountdownLatchUninterruptibly(countDownLatch, 1, TimeUnit.SECONDS);
}

public static void main(String... args) throws Exception {
Options opt = new OptionsBuilder()
.include(AwsCrtH2ClientBenchmark.class.getSimpleName())
.addProfiler(StackProfiler.class)
.build();
new Runner(opt).run();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.openjdk.jmh.runner.Runner;
import org.openjdk.jmh.runner.options.Options;
import org.openjdk.jmh.runner.options.OptionsBuilder;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.benchmark.utils.MockH2Server;
import software.amazon.awssdk.http.Protocol;
import software.amazon.awssdk.http.ProtocolNegotiation;
Expand All @@ -54,7 +55,7 @@
@Measurement(iterations = 5, time = 10, timeUnit = TimeUnit.SECONDS)
@Fork(2) // To reduce difference between each run
@BenchmarkMode(Mode.Throughput)
public class NettyHttpClientAlpnBenchmark extends BaseNettyBenchmark {
public class NettyHttpClientH2AlpnBenchmark extends BaseNettyBenchmark {

private MockH2Server mockServer;
private SdkAsyncHttpClient sdkHttpClient;
Expand All @@ -76,6 +77,7 @@ public void setup() throws Exception {
.protocolNegotiation(ProtocolNegotiation.ALPN)
.buildWithDefaults(trustAllTlsAttributeMapBuilder().build());
client = ProtocolRestJsonAsyncClient.builder()
.credentialsProvider(() -> AwsBasicCredentials.create("foo", "bar"))
.endpointOverride(mockServer.getHttpsUri())
.httpClient(sdkHttpClient)
.region(Region.US_EAST_1)
Expand All @@ -94,7 +96,7 @@ public void tearDown() throws Exception {

public static void main(String... args) throws Exception {
Options opt = new OptionsBuilder()
.include(NettyHttpClientH2Benchmark.class.getSimpleName())
.include(NettyHttpClientH2PriorKnowledgeBenchmark.class.getSimpleName())
.build();
Collection<RunResult> run = new Runner(opt).run();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.openjdk.jmh.runner.Runner;
import org.openjdk.jmh.runner.options.Options;
import org.openjdk.jmh.runner.options.OptionsBuilder;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.benchmark.utils.MockH2Server;
import software.amazon.awssdk.http.Protocol;
import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
Expand All @@ -53,7 +54,7 @@
@Measurement(iterations = 5, time = 10, timeUnit = TimeUnit.SECONDS)
@Fork(2) // To reduce difference between each run
@BenchmarkMode(Mode.Throughput)
public class NettyHttpClientH2Benchmark extends BaseNettyBenchmark {
public class NettyHttpClientH2PriorKnowledgeBenchmark extends BaseNettyBenchmark {

private MockH2Server mockServer;
private SdkAsyncHttpClient sdkHttpClient;
Expand All @@ -74,6 +75,7 @@ public void setup() throws Exception {
.protocol(Protocol.HTTP2)
.buildWithDefaults(trustAllTlsAttributeMapBuilder().build());
client = ProtocolRestJsonAsyncClient.builder()
.credentialsProvider(() -> AwsBasicCredentials.create("foo", "bar"))
.endpointOverride(mockServer.getHttpsUri())
.httpClient(sdkHttpClient)
.region(Region.US_EAST_1)
Expand All @@ -92,7 +94,7 @@ public void tearDown() throws Exception {

public static void main(String... args) throws Exception {
Options opt = new OptionsBuilder()
.include(NettyHttpClientH2Benchmark.class.getSimpleName())
.include(NettyHttpClientH2PriorKnowledgeBenchmark.class.getSimpleName())
.build();
Collection<RunResult> run = new Runner(opt).run();
}
Expand Down
Loading
Loading