forked from opensearch-project/data-prepper
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Gatling performance test enhancements - HTTPS, path configuration, AW…
…S SigV4 (opensearch-project#3312) Adds Gatling configurations for using HTTPS and for configuring the target path. Resolves opensearch-project#3308. Increase the maximum response time for the SingleRequestSimulation to 1 second. This is in line with other tests. Adds AWS SigV4 signing in the Gatling performance tests. Also moves the Gatling setup into constructors rather than static initializers. Resolves opensearch-project#3308. Signed-off-by: David Venable <[email protected]>
- Loading branch information
1 parent
6f7a19b
commit 96060aa
Showing
14 changed files
with
190 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
134 changes: 134 additions & 0 deletions
134
.../src/gatling/java/org/opensearch/dataprepper/test/performance/tools/AwsRequestSigner.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| package org.opensearch.dataprepper.test.performance.tools; | ||
|
|
||
| import io.gatling.http.client.Request; | ||
| import io.netty.handler.codec.http.HttpHeaders; | ||
| import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; | ||
| import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider; | ||
| import software.amazon.awssdk.auth.signer.Aws4Signer; | ||
| import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute; | ||
| import software.amazon.awssdk.core.interceptor.ExecutionAttributes; | ||
| import software.amazon.awssdk.http.SdkHttpFullRequest; | ||
| import software.amazon.awssdk.http.SdkHttpMethod; | ||
| import software.amazon.awssdk.regions.Region; | ||
|
|
||
| import java.io.ByteArrayInputStream; | ||
| import java.net.URI; | ||
| import java.net.URISyntaxException; | ||
| import java.util.Collections; | ||
| import java.util.LinkedList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.TreeMap; | ||
| import java.util.function.Consumer; | ||
| import java.util.function.Function; | ||
|
|
||
| public class AwsRequestSigner implements Consumer<Request> { | ||
| static final String SIGNER_NAME = "aws_sigv4"; | ||
|
|
||
| /** | ||
| * Constant to check content-length | ||
| */ | ||
| private static final String CONTENT_LENGTH = "content-length"; | ||
| /** | ||
| * Constant to check Zero content length | ||
| */ | ||
| private static final String ZERO_CONTENT_LENGTH = "0"; | ||
| /** | ||
| * Constant to check if host is the endpoint | ||
| */ | ||
| private static final String HOST = "host"; | ||
|
|
||
| private static final String REGION_PROPERTY = "aws_region"; | ||
| private static final String SERVICE_NAME_PROPERTY = "aws_service"; | ||
|
|
||
|
|
||
| private final Aws4Signer awsSigner; | ||
| private final AwsCredentialsProvider credentialsProvider; | ||
| private final Region region; | ||
| private final String service; | ||
|
|
||
| public AwsRequestSigner() { | ||
| region = getRequiredProperty(REGION_PROPERTY, Region::of); | ||
| service = getRequiredProperty(SERVICE_NAME_PROPERTY, Function.identity()); | ||
|
|
||
| awsSigner = Aws4Signer.create(); | ||
| credentialsProvider = DefaultCredentialsProvider.create(); | ||
| } | ||
|
|
||
| private static <T> T getRequiredProperty(String propertyName, Function<String, T> transform) { | ||
| String inputString = System.getProperty(propertyName); | ||
| if(inputString == null) { | ||
| throw new RuntimeException("Using " + SIGNER_NAME + " authentication requires providing the " + propertyName + " system property."); | ||
| } | ||
|
|
||
| try { | ||
| return transform.apply(inputString); | ||
| } catch (Exception ex) { | ||
| throw new RuntimeException("Unable to process property " + propertyName + " with error: " + ex.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void accept(Request request) { | ||
| ExecutionAttributes attributes = new ExecutionAttributes(); | ||
| attributes.putAttribute(AwsSignerExecutionAttribute.AWS_CREDENTIALS, credentialsProvider.resolveCredentials()); | ||
| attributes.putAttribute(AwsSignerExecutionAttribute.SERVICE_SIGNING_NAME, service); | ||
| attributes.putAttribute(AwsSignerExecutionAttribute.SIGNING_REGION, region); | ||
|
|
||
| SdkHttpFullRequest incomingSdkRequest = convertIncomingRequest(request); | ||
|
|
||
| SdkHttpFullRequest signedRequest = awsSigner.sign(incomingSdkRequest, attributes); | ||
|
|
||
| modifyOutgoingRequest(request, signedRequest); | ||
| } | ||
|
|
||
| private SdkHttpFullRequest convertIncomingRequest(Request request) { | ||
| URI uri; | ||
| try { | ||
| uri = request.getUri().toJavaNetURI(); | ||
| } catch (URISyntaxException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
|
|
||
| SdkHttpFullRequest.Builder requestBuilder = SdkHttpFullRequest.builder() | ||
| .method(SdkHttpMethod.fromValue(request.getMethod().name())) | ||
| .uri(uri); | ||
|
|
||
| requestBuilder.contentStreamProvider(() -> new ByteArrayInputStream(request.getBody().getBytes())); | ||
| requestBuilder.headers(headerArrayToMap(request.getHeaders())); | ||
|
|
||
| return requestBuilder.build(); | ||
| } | ||
|
|
||
| private static Map<String, List<String>> headerArrayToMap(final HttpHeaders headers) { | ||
| Map<String, List<String>> headersMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); | ||
| for (Map.Entry<String, String> header : headers) { | ||
| if (!skipHeader(header)) { | ||
| headersMap.put(header.getKey(), headersMap | ||
| .getOrDefault(header.getKey(), | ||
| new LinkedList<>(Collections.singletonList(header.getValue())))); | ||
| } | ||
| } | ||
| return headersMap; | ||
| } | ||
|
|
||
| private static boolean skipHeader(final Map.Entry<String, String> header) { | ||
| return (CONTENT_LENGTH.equalsIgnoreCase(header.getKey()) | ||
| && ZERO_CONTENT_LENGTH.equals(header.getValue())) // Strip Content-Length: 0 | ||
| || HOST.equalsIgnoreCase(header.getKey()); // Host comes from endpoint | ||
| } | ||
|
|
||
| private void modifyOutgoingRequest(Request request, SdkHttpFullRequest signedRequest) { | ||
| resetHeaders(request, signedRequest); | ||
| } | ||
|
|
||
| private void resetHeaders(Request request, SdkHttpFullRequest signedRequest) { | ||
| request.getHeaders().clear(); | ||
|
|
||
| for (Map.Entry<String, List<String>> headerEntry : signedRequest.headers().entrySet()) { | ||
| for (String value : headerEntry.getValue()) { | ||
| request.getHeaders().add(headerEntry.getKey(), value); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
...e-test/src/gatling/java/org/opensearch/dataprepper/test/performance/tools/PathTarget.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package org.opensearch.dataprepper.test.performance.tools; | ||
|
|
||
| public class PathTarget { | ||
| private static final String PATH_PROPERTY_NAME = "path"; | ||
| private static final String DEFAULT_PATH = "/log/ingest"; | ||
|
|
||
| public static String getPath() { | ||
| return System.getProperty(PATH_PROPERTY_NAME, DEFAULT_PATH); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
...st/src/gatling/java/org/opensearch/dataprepper/test/performance/tools/SignerProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package org.opensearch.dataprepper.test.performance.tools; | ||
|
|
||
| import io.gatling.http.client.Request; | ||
|
|
||
| import java.util.function.Consumer; | ||
|
|
||
| public class SignerProvider { | ||
| private static final Consumer<Request> NO_OP_SIGNER = r -> { }; | ||
|
|
||
| public static Consumer<Request> getSigner() { | ||
| String authentication = System.getProperty("authentication"); | ||
|
|
||
| if(AwsRequestSigner.SIGNER_NAME.equals(authentication)) { | ||
| return new AwsRequestSigner(); | ||
| } | ||
|
|
||
| return NO_OP_SIGNER; | ||
| } | ||
| } |