* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyPublisher publisher = client.paginatedOperationWithResultKeyPaginator(request);
@@ -565,19 +571,19 @@ public CompletableFuture paginatedOpera
*
*
* 2) Using a custom subscriber
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyPublisher publisher = client.paginatedOperationWithResultKeyPaginator(request);
* publisher.subscribe(new Subscriber() {
- *
+ *
* public void onSubscribe(org.reactivestreams.Subscriber subscription) { //... };
- *
- *
+ *
+ *
* public void onNext(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyResponse response) { //... };
* });}
*
- *
+ *
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
*
* Please notice that the configuration of MaxResults won't limit the number of results you get with the
@@ -633,6 +639,7 @@ public PaginatedOperationWithResultKeyPublisher paginatedOperationWithResultKeyP
@Override
public CompletableFuture
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyPublisher publisher = client.paginatedOperationWithoutResultKeyPaginator(request);
@@ -687,19 +694,19 @@ public CompletableFuture paginatedOp
*
*
* 2) Using a custom subscriber
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyPublisher publisher = client.paginatedOperationWithoutResultKeyPaginator(request);
* publisher.subscribe(new Subscriber() {
- *
+ *
* public void onSubscribe(org.reactivestreams.Subscriber subscription) { //... };
- *
- *
+ *
+ *
* public void onNext(software.amazon.awssdk.services.json.model.PaginatedOperationWithoutResultKeyResponse response) { //... };
* });}
*
- *
+ *
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
*
* Please notice that the configuration of MaxResults won't limit the number of results you get with the
@@ -760,6 +767,7 @@ public PaginatedOperationWithoutResultKeyPublisher paginatedOperationWithoutResu
@Override
public CompletableFuture
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyPublisher publisher = client.paginatedOperationWithResultKeyPaginator(request);
@@ -537,19 +545,19 @@ default CompletableFuture paginatedOper
*
*
* 2) Using a custom subscriber
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyPublisher publisher = client.paginatedOperationWithResultKeyPaginator(request);
* publisher.subscribe(new Subscriber() {
- *
+ *
* public void onSubscribe(org.reactivestreams.Subscriber subscription) { //... };
- *
- *
+ *
+ *
* public void onNext(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyResponse response) { //... };
* });}
*
- *
+ *
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
* * Please notice that the configuration of MaxResults won't limit the number of results you get with the @@ -602,7 +610,7 @@ default PaginatedOperationWithResultKeyPublisher paginatedOperationWithResultKey * The following are few ways to use the response class: *
* 1) Using the subscribe helper method - * + * *
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyPublisher publisher = client.paginatedOperationWithResultKeyPaginator(request);
@@ -612,19 +620,19 @@ default PaginatedOperationWithResultKeyPublisher paginatedOperationWithResultKey
*
*
* 2) Using a custom subscriber
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyPublisher publisher = client.paginatedOperationWithResultKeyPaginator(request);
* publisher.subscribe(new Subscriber() {
- *
+ *
* public void onSubscribe(org.reactivestreams.Subscriber subscription) { //... };
- *
- *
+ *
+ *
* public void onNext(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyResponse response) { //... };
* });}
*
- *
+ *
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
* * Please notice that the configuration of MaxResults won't limit the number of results you get with the @@ -679,7 +687,7 @@ default PaginatedOperationWithResultKeyPublisher paginatedOperationWithResultKey * The following are few ways to use the response class: *
* 1) Using the subscribe helper method - * + * *
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyPublisher publisher = client.paginatedOperationWithResultKeyPaginator(request);
@@ -689,19 +697,19 @@ default PaginatedOperationWithResultKeyPublisher paginatedOperationWithResultKey
*
*
* 2) Using a custom subscriber
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyPublisher publisher = client.paginatedOperationWithResultKeyPaginator(request);
* publisher.subscribe(new Subscriber() {
- *
+ *
* public void onSubscribe(org.reactivestreams.Subscriber subscription) { //... };
- *
- *
+ *
+ *
* public void onNext(software.amazon.awssdk.services.json.model.PaginatedOperationWithResultKeyResponse response) { //... };
* });}
*
- *
+ *
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
*
* Please notice that the configuration of MaxResults won't limit the number of results you get with the
@@ -738,7 +746,7 @@ default PaginatedOperationWithResultKeyPublisher paginatedOperationWithResultKey
default PaginatedOperationWithResultKeyPublisher paginatedOperationWithResultKeyPaginator(
Consumer
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyPublisher publisher = client.paginatedOperationWithoutResultKeyPaginator(request);
@@ -830,19 +839,19 @@ default CompletableFuture paginatedO
*
*
* 2) Using a custom subscriber
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyPublisher publisher = client.paginatedOperationWithoutResultKeyPaginator(request);
* publisher.subscribe(new Subscriber() {
- *
+ *
* public void onSubscribe(org.reactivestreams.Subscriber subscription) { //... };
- *
- *
+ *
+ *
* public void onNext(software.amazon.awssdk.services.json.model.PaginatedOperationWithoutResultKeyResponse response) { //... };
* });}
*
- *
+ *
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
* * Please notice that the configuration of MaxResults won't limit the number of results you get with the @@ -897,7 +906,7 @@ default PaginatedOperationWithoutResultKeyPublisher paginatedOperationWithoutRes * The following are few ways to use the response class: *
* 1) Using the subscribe helper method - * + * *
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyPublisher publisher = client.paginatedOperationWithoutResultKeyPaginator(request);
@@ -907,19 +916,19 @@ default PaginatedOperationWithoutResultKeyPublisher paginatedOperationWithoutRes
*
*
* 2) Using a custom subscriber
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyPublisher publisher = client.paginatedOperationWithoutResultKeyPaginator(request);
* publisher.subscribe(new Subscriber() {
- *
+ *
* public void onSubscribe(org.reactivestreams.Subscriber subscription) { //... };
- *
- *
+ *
+ *
* public void onNext(software.amazon.awssdk.services.json.model.PaginatedOperationWithoutResultKeyResponse response) { //... };
* });}
*
- *
+ *
* As the response is a publisher, it can work well with third party reactive streams implementations like RxJava2.
*
* Please notice that the configuration of MaxResults won't limit the number of results you get with the
@@ -956,7 +965,7 @@ default PaginatedOperationWithoutResultKeyPublisher paginatedOperationWithoutRes
default PaginatedOperationWithoutResultKeyPublisher paginatedOperationWithoutResultKeyPaginator(
Consumer
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyIterable responses = client.paginatedOperationWithResultKeyPaginator(request);
@@ -268,7 +312,7 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey(
*
*
* 2) Using For loop
- *
+ *
*
* {
* @code
@@ -281,7 +325,7 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey(
*
*
* 3) Use iterator directly
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithResultKeyIterable responses = client.paginatedOperationWithResultKeyPaginator(request);
@@ -313,8 +357,8 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey(
*/
@Override
public PaginatedOperationWithResultKeyIterable paginatedOperationWithResultKeyPaginator(
- PaginatedOperationWithResultKeyRequest paginatedOperationWithResultKeyRequest) throws AwsServiceException,
- SdkClientException, JsonException {
+ PaginatedOperationWithResultKeyRequest paginatedOperationWithResultKeyRequest) throws AwsServiceException,
+ SdkClientException, JsonException {
return new PaginatedOperationWithResultKeyIterable(this, applyPaginatorUserAgent(paginatedOperationWithResultKeyRequest));
}
@@ -336,23 +380,33 @@ public PaginatedOperationWithResultKeyIterable paginatedOperationWithResultKeyPa
*/
@Override
public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResultKey(
- PaginatedOperationWithoutResultKeyRequest paginatedOperationWithoutResultKeyRequest) throws AwsServiceException,
- SdkClientException, JsonException {
+ PaginatedOperationWithoutResultKeyRequest paginatedOperationWithoutResultKeyRequest) throws AwsServiceException,
+ SdkClientException, JsonException {
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
- .isPayloadJson(true).build();
+ .isPayloadJson(true).build();
HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(
- operationMetadata, PaginatedOperationWithoutResultKeyResponse::builder);
+ operationMetadata, PaginatedOperationWithoutResultKeyResponse::builder);
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
- operationMetadata);
-
- return clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("PaginatedOperationWithoutResultKey")
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(paginatedOperationWithoutResultKeyRequest)
- .withMarshaller(new PaginatedOperationWithoutResultKeyRequestMarshaller(protocolFactory)));
+ operationMetadata);
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.OPERATION_NAME, "PaginatedOperationWithoutResultKey");
+ try {
+
+ return clientHandler
+ .execute(new ClientExecutionParams()
+ .withOperationName("PaginatedOperationWithoutResultKey").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withInput(paginatedOperationWithoutResultKeyRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new PaginatedOperationWithoutResultKeyRequestMarshaller(protocolFactory)));
+ } finally {
+ MetricPublisher metricPublisher = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHER);
+ if (metricPublisher != null) {
+ metricPublisher.publish(apiCallMetricCollector.collect());
+ }
+ }
}
/**
@@ -374,7 +428,7 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul
* The following are few ways to iterate through the response pages:
*
* 1) Using a Stream
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyIterable responses = client.paginatedOperationWithoutResultKeyPaginator(request);
@@ -383,7 +437,7 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul
*
*
* 2) Using For loop
- *
+ *
*
* {
* @code
@@ -396,7 +450,7 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul
*
*
* 3) Use iterator directly
- *
+ *
*
* {@code
* software.amazon.awssdk.services.json.paginators.PaginatedOperationWithoutResultKeyIterable responses = client.paginatedOperationWithoutResultKeyPaginator(request);
@@ -428,10 +482,10 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul
*/
@Override
public PaginatedOperationWithoutResultKeyIterable paginatedOperationWithoutResultKeyPaginator(
- PaginatedOperationWithoutResultKeyRequest paginatedOperationWithoutResultKeyRequest) throws AwsServiceException,
- SdkClientException, JsonException {
+ PaginatedOperationWithoutResultKeyRequest paginatedOperationWithoutResultKeyRequest) throws AwsServiceException,
+ SdkClientException, JsonException {
return new PaginatedOperationWithoutResultKeyIterable(this,
- applyPaginatorUserAgent(paginatedOperationWithoutResultKeyRequest));
+ applyPaginatorUserAgent(paginatedOperationWithoutResultKeyRequest));
}
/**
@@ -442,11 +496,11 @@ public PaginatedOperationWithoutResultKeyIterable paginatedOperationWithoutResul
* The content to send to the service. A {@link RequestBody} can be created using one of several factory
* methods for various sources of data. For example, to create a request body from a file you can do the
* following.
- *
+ *
*
* {@code RequestBody.fromFile(new File("myfile.txt"))}
*
- *
+ *
* See documentation in {@link RequestBody} for additional details and which sources of data are supported.
* The service documentation for the request content is as follows 'This be a stream'
* @return Result of the StreamingInputOperation operation returned by the service.
@@ -463,26 +517,38 @@ public PaginatedOperationWithoutResultKeyIterable paginatedOperationWithoutResul
*/
@Override
public StreamingInputOperationResponse streamingInputOperation(StreamingInputOperationRequest streamingInputOperationRequest,
- RequestBody requestBody) throws AwsServiceException, SdkClientException, JsonException {
+ RequestBody requestBody) throws AwsServiceException, SdkClientException, JsonException {
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
- .isPayloadJson(true).build();
+ .isPayloadJson(true).build();
HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(
- operationMetadata, StreamingInputOperationResponse::builder);
+ operationMetadata, StreamingInputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
- operationMetadata);
-
- return clientHandler.execute(new ClientExecutionParams()
- .withOperationName("StreamingInputOperation")
- .withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler)
- .withInput(streamingInputOperationRequest)
- .withRequestBody(requestBody)
- .withMarshaller(
- StreamingRequestMarshaller.builder()
- .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
- .requestBody(requestBody).build()));
+ operationMetadata);
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.OPERATION_NAME, "StreamingInputOperation");
+ try {
+
+ return clientHandler
+ .execute(new ClientExecutionParams()
+ .withOperationName("StreamingInputOperation")
+ .withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler)
+ .withInput(streamingInputOperationRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withRequestBody(requestBody)
+ .withMarshaller(
+ StreamingRequestMarshaller.builder()
+ .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
+ .requestBody(requestBody).build()));
+ } finally {
+ MetricPublisher metricPublisher = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHER);
+ if (metricPublisher != null) {
+ metricPublisher.publish(apiCallMetricCollector.collect());
+ }
+ }
}
/**
@@ -493,20 +559,20 @@ public StreamingInputOperationResponse streamingInputOperation(StreamingInputOpe
* The content to send to the service. A {@link RequestBody} can be created using one of several factory
* methods for various sources of data. For example, to create a request body from a file you can do the
* following.
- *
+ *
*
* {@code RequestBody.fromFile(new File("myfile.txt"))}
*
- *
+ *
* See documentation in {@link RequestBody} for additional details and which sources of data are supported.
* The service documentation for the request content is as follows 'This be a stream'
* @param responseTransformer
* Functional interface for processing the streamed response content. The unmarshalled
- * StreamingInputOutputOperationResponse and an InputStream to the response content are provided as parameters
- * to the callback. The callback may return a transformed type which will be the return value of this method.
- * See {@link software.amazon.awssdk.core.sync.ResponseTransformer} for details on implementing this
- * interface and for links to pre-canned implementations for common scenarios like downloading to a file. The
- * service documentation for the response content is as follows 'This be a stream'.
+ * StreamingInputOutputOperationResponse and an InputStream to the response content are provided as
+ * parameters to the callback. The callback may return a transformed type which will be the return value of
+ * this method. See {@link software.amazon.awssdk.core.sync.ResponseTransformer} for details on implementing
+ * this interface and for links to pre-canned implementations for common scenarios like downloading to a
+ * file. The service documentation for the response content is as follows 'This be a stream'.
* @return The transformed result of the ResponseTransformer.
* @throws SdkException
* Base class for all exceptions that can be thrown by the SDK (both service and client). Can be used for
@@ -521,31 +587,44 @@ public StreamingInputOperationResponse streamingInputOperation(StreamingInputOpe
*/
@Override
public ReturnT streamingInputOutputOperation(
- StreamingInputOutputOperationRequest streamingInputOutputOperationRequest, RequestBody requestBody,
- ResponseTransformer responseTransformer) throws AwsServiceException,
- SdkClientException, JsonException {
+ StreamingInputOutputOperationRequest streamingInputOutputOperationRequest, RequestBody requestBody,
+ ResponseTransformer responseTransformer) throws AwsServiceException,
+ SdkClientException, JsonException {
streamingInputOutputOperationRequest = applySignerOverride(streamingInputOutputOperationRequest,
- Aws4UnsignedPayloadSigner.create());
+ Aws4UnsignedPayloadSigner.create());
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(true)
- .isPayloadJson(false).build();
+ .isPayloadJson(false).build();
HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(
- operationMetadata, StreamingInputOutputOperationResponse::builder);
+ operationMetadata, StreamingInputOutputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
- operationMetadata);
-
- return clientHandler.execute(
- new ClientExecutionParams()
- .withOperationName("StreamingInputOutputOperation")
- .withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler)
- .withInput(streamingInputOutputOperationRequest)
- .withRequestBody(requestBody)
- .withMarshaller(
- StreamingRequestMarshaller.builder()
- .delegateMarshaller(new StreamingInputOutputOperationRequestMarshaller(protocolFactory))
- .requestBody(requestBody).transferEncoding(true).build()), responseTransformer);
+ operationMetadata);
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.OPERATION_NAME, "StreamingInputOutputOperation");
+ try {
+
+ return clientHandler.execute(
+ new ClientExecutionParams()
+ .withOperationName("StreamingInputOutputOperation")
+ .withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler)
+ .withInput(streamingInputOutputOperationRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withRequestBody(requestBody)
+ .withMarshaller(
+ StreamingRequestMarshaller
+ .builder()
+ .delegateMarshaller(
+ new StreamingInputOutputOperationRequestMarshaller(protocolFactory))
+ .requestBody(requestBody).transferEncoding(true).build()), responseTransformer);
+ } finally {
+ MetricPublisher metricPublisher = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHER);
+ if (metricPublisher != null) {
+ metricPublisher.publish(apiCallMetricCollector.collect());
+ }
+ }
}
/**
@@ -554,8 +633,8 @@ public ReturnT streamingInputOutputOperation(
* @param streamingOutputOperationRequest
* @param responseTransformer
* Functional interface for processing the streamed response content. The unmarshalled
- * StreamingOutputOperationResponse and an InputStream to the response content are provided as parameters
- * to the callback. The callback may return a transformed type which will be the return value of this method.
+ * StreamingOutputOperationResponse and an InputStream to the response content are provided as parameters to
+ * the callback. The callback may return a transformed type which will be the return value of this method.
* See {@link software.amazon.awssdk.core.sync.ResponseTransformer} for details on implementing this
* interface and for links to pre-canned implementations for common scenarios like downloading to a file. The
* service documentation for the response content is as follows 'This be a stream'.
@@ -573,39 +652,49 @@ public ReturnT streamingInputOutputOperation(
*/
@Override
public ReturnT streamingOutputOperation(StreamingOutputOperationRequest streamingOutputOperationRequest,
- ResponseTransformer responseTransformer) throws AwsServiceException,
- SdkClientException, JsonException {
+ ResponseTransformer responseTransformer) throws AwsServiceException,
+ SdkClientException, JsonException {
JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(true)
- .isPayloadJson(false).build();
+ .isPayloadJson(false).build();
HttpResponseHandler responseHandler = protocolFactory.createResponseHandler(
- operationMetadata, StreamingOutputOperationResponse::builder);
+ operationMetadata, StreamingOutputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = createErrorResponseHandler(protocolFactory,
- operationMetadata);
-
- return clientHandler.execute(
- new ClientExecutionParams()
- .withOperationName("StreamingOutputOperation")
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(streamingOutputOperationRequest)
- .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)), responseTransformer);
+ operationMetadata);
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.SERVICE_ID, "Json Service");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.OPERATION_NAME, "StreamingOutputOperation");
+ try {
+
+ return clientHandler.execute(
+ new ClientExecutionParams()
+ .withOperationName("StreamingOutputOperation").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withInput(streamingOutputOperationRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)), responseTransformer);
+ } finally {
+ MetricPublisher metricPublisher = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHER);
+ if (metricPublisher != null) {
+ metricPublisher.publish(apiCallMetricCollector.collect());
+ }
+ }
}
private HttpResponseHandler createErrorResponseHandler(BaseAwsJsonProtocolFactory protocolFactory,
- JsonOperationMetadata operationMetadata) {
+ JsonOperationMetadata operationMetadata) {
return protocolFactory.createErrorResponseHandler(operationMetadata);
}
private > T init(T builder) {
return builder
- .clientConfiguration(clientConfiguration)
- .defaultServiceExceptionSupplier(JsonException::builder)
- .protocol(AwsJsonProtocol.REST_JSON)
- .protocolVersion("1.1")
- .registerModeledException(
- ExceptionMetadata.builder().errorCode("InvalidInput")
- .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build());
+ .clientConfiguration(clientConfiguration)
+ .defaultServiceExceptionSupplier(JsonException::builder)
+ .protocol(AwsJsonProtocol.REST_JSON)
+ .protocolVersion("1.1")
+ .registerModeledException(
+ ExceptionMetadata.builder().errorCode("InvalidInput")
+ .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build());
}
@Override
@@ -615,10 +704,10 @@ public void close() {
private T applyPaginatorUserAgent(T request) {
Consumer userAgentApplier = b -> b.addApiName(ApiName.builder()
- .version(VersionInfo.SDK_VERSION).name("PAGINATED").build());
+ .version(VersionInfo.SDK_VERSION).name("PAGINATED").build());
AwsRequestOverrideConfiguration overrideConfiguration = request.overrideConfiguration()
- .map(c -> c.toBuilder().applyMutation(userAgentApplier).build())
- .orElse((AwsRequestOverrideConfiguration.builder().applyMutation(userAgentApplier).build()));
+ .map(c -> c.toBuilder().applyMutation(userAgentApplier).build())
+ .orElse((AwsRequestOverrideConfiguration.builder().applyMutation(userAgentApplier).build()));
return (T) request.toBuilder().overrideConfiguration(overrideConfiguration).build();
}
@@ -628,8 +717,8 @@ private T applySignerOverride(T request, Signer signer)
}
Consumer signerOverride = b -> b.signer(signer).build();
AwsRequestOverrideConfiguration overrideConfiguration = request.overrideConfiguration()
- .map(c -> c.toBuilder().applyMutation(signerOverride).build())
- .orElse((AwsRequestOverrideConfiguration.builder().applyMutation(signerOverride).build()));
+ .map(c -> c.toBuilder().applyMutation(signerOverride).build())
+ .orElse((AwsRequestOverrideConfiguration.builder().applyMutation(signerOverride).build()));
return (T) request.toBuilder().overrideConfiguration(overrideConfiguration).build();
}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java
index e6ddff92b7f4..e96ac5147355 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-async-client-class.java
@@ -16,6 +16,7 @@
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
import software.amazon.awssdk.core.http.HttpResponseHandler;
import software.amazon.awssdk.core.runtime.transform.AsyncStreamingRequestMarshaller;
+import software.amazon.awssdk.metrics.MetricCollector;
import software.amazon.awssdk.protocols.core.ExceptionMetadata;
import software.amazon.awssdk.protocols.query.AwsQueryProtocolFactory;
import software.amazon.awssdk.services.query.model.APostOperationRequest;
@@ -86,21 +87,22 @@ public final String serviceName() {
*/
@Override
public CompletableFuture aPostOperation(APostOperationRequest aPostOperationRequest) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
String hostPrefix = "foo-";
String resolvedHostExpression = "foo-";
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(APostOperationResponse::builder);
+ .createResponseHandler(APostOperationResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
CompletableFuture executeFuture = clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("APostOperation")
- .withMarshaller(new APostOperationRequestMarshaller(protocolFactory))
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .hostPrefixExpression(resolvedHostExpression).withInput(aPostOperationRequest));
+ .execute(new ClientExecutionParams()
+ .withOperationName("APostOperation")
+ .withMarshaller(new APostOperationRequestMarshaller(protocolFactory))
+ .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
+ .hostPrefixExpression(resolvedHostExpression).withInput(aPostOperationRequest));
return executeFuture;
} catch (Throwable t) {
return CompletableFutureUtils.failedFuture(t);
@@ -132,20 +134,21 @@ public CompletableFuture aPostOperation(APostOperationRe
*/
@Override
public CompletableFuture aPostOperationWithOutput(
- APostOperationWithOutputRequest aPostOperationWithOutputRequest) {
+ APostOperationWithOutputRequest aPostOperationWithOutputRequest) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(APostOperationWithOutputResponse::builder);
+ .createResponseHandler(APostOperationWithOutputResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
CompletableFuture executeFuture = clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("APostOperationWithOutput")
- .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory))
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(aPostOperationWithOutputRequest));
+ .execute(new ClientExecutionParams()
+ .withOperationName("APostOperationWithOutput")
+ .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory))
+ .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
+ .withInput(aPostOperationWithOutputRequest));
return executeFuture;
} catch (Throwable t) {
return CompletableFutureUtils.failedFuture(t);
@@ -178,23 +181,24 @@ public CompletableFuture aPostOperationWithOut
*/
@Override
public CompletableFuture streamingInputOperation(
- StreamingInputOperationRequest streamingInputOperationRequest, AsyncRequestBody requestBody) {
+ StreamingInputOperationRequest streamingInputOperationRequest, AsyncRequestBody requestBody) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(StreamingInputOperationResponse::builder);
+ .createResponseHandler(StreamingInputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
CompletableFuture executeFuture = clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("StreamingInputOperation")
- .withMarshaller(
- AsyncStreamingRequestMarshaller.builder()
- .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
- .asyncRequestBody(requestBody).build()).withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).withAsyncRequestBody(requestBody)
- .withInput(streamingInputOperationRequest));
+ .execute(new ClientExecutionParams()
+ .withOperationName("StreamingInputOperation")
+ .withMarshaller(
+ AsyncStreamingRequestMarshaller.builder()
+ .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
+ .asyncRequestBody(requestBody).build()).withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withAsyncRequestBody(requestBody)
+ .withInput(streamingInputOperationRequest));
return executeFuture;
} catch (Throwable t) {
return CompletableFutureUtils.failedFuture(t);
@@ -227,31 +231,32 @@ public CompletableFuture streamingInputOperatio
*/
@Override
public CompletableFuture streamingOutputOperation(
- StreamingOutputOperationRequest streamingOutputOperationRequest,
- AsyncResponseTransformer asyncResponseTransformer) {
+ StreamingOutputOperationRequest streamingOutputOperationRequest,
+ AsyncResponseTransformer asyncResponseTransformer) {
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
try {
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(StreamingOutputOperationResponse::builder);
+ .createResponseHandler(StreamingOutputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
CompletableFuture executeFuture = clientHandler.execute(
- new ClientExecutionParams()
- .withOperationName("StreamingOutputOperation")
- .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory))
- .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
- .withInput(streamingOutputOperationRequest), asyncResponseTransformer);
+ new ClientExecutionParams()
+ .withOperationName("StreamingOutputOperation")
+ .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory))
+ .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
+ .withInput(streamingOutputOperationRequest), asyncResponseTransformer);
executeFuture.whenComplete((r, e) -> {
if (e != null) {
runAndLogError(log, "Exception thrown in exceptionOccurred callback, ignoring",
- () -> asyncResponseTransformer.exceptionOccurred(e));
+ () -> asyncResponseTransformer.exceptionOccurred(e));
}
});
return executeFuture;
} catch (Throwable t) {
runAndLogError(log, "Exception thrown in exceptionOccurred callback, ignoring",
- () -> asyncResponseTransformer.exceptionOccurred(t));
+ () -> asyncResponseTransformer.exceptionOccurred(t));
return CompletableFutureUtils.failedFuture(t);
}
}
@@ -263,10 +268,10 @@ public void close() {
private AwsQueryProtocolFactory init() {
return AwsQueryProtocolFactory
- .builder()
- .registerModeledException(
- ExceptionMetadata.builder().errorCode("InvalidInput")
- .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build())
- .clientConfiguration(clientConfiguration).defaultServiceExceptionSupplier(QueryException::builder).build();
+ .builder()
+ .registerModeledException(
+ ExceptionMetadata.builder().errorCode("InvalidInput")
+ .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build())
+ .clientConfiguration(clientConfiguration).defaultServiceExceptionSupplier(QueryException::builder).build();
}
}
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java
index c99dfe5cf930..c4c82282dd3c 100644
--- a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java
+++ b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java
@@ -4,7 +4,9 @@
import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.awscore.client.handler.AwsSyncClientHandler;
import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.awscore.metrics.AwsCoreMetric;
import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
+import software.amazon.awssdk.core.client.config.SdkClientOption;
import software.amazon.awssdk.core.client.handler.ClientExecutionParams;
import software.amazon.awssdk.core.client.handler.SyncClientHandler;
import software.amazon.awssdk.core.exception.SdkClientException;
@@ -12,6 +14,8 @@
import software.amazon.awssdk.core.runtime.transform.StreamingRequestMarshaller;
import software.amazon.awssdk.core.sync.RequestBody;
import software.amazon.awssdk.core.sync.ResponseTransformer;
+import software.amazon.awssdk.metrics.MetricCollector;
+import software.amazon.awssdk.metrics.MetricPublisher;
import software.amazon.awssdk.protocols.core.ExceptionMetadata;
import software.amazon.awssdk.protocols.query.AwsQueryProtocolFactory;
import software.amazon.awssdk.services.query.model.APostOperationRequest;
@@ -76,19 +80,30 @@ public final String serviceName() {
*/
@Override
public APostOperationResponse aPostOperation(APostOperationRequest aPostOperationRequest) throws InvalidInputException,
- AwsServiceException, SdkClientException, QueryException {
+ AwsServiceException, SdkClientException, QueryException {
String hostPrefix = "foo-";
String resolvedHostExpression = "foo-";
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(APostOperationResponse::builder);
+ .createResponseHandler(APostOperationResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.SERVICE_ID, "Query Service");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.OPERATION_NAME, "APostOperation");
+ try {
- return clientHandler.execute(new ClientExecutionParams()
- .withOperationName("APostOperation").withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).hostPrefixExpression(resolvedHostExpression)
- .withInput(aPostOperationRequest).withMarshaller(new APostOperationRequestMarshaller(protocolFactory)));
+ return clientHandler.execute(new ClientExecutionParams()
+ .withOperationName("APostOperation").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).hostPrefixExpression(resolvedHostExpression)
+ .withInput(aPostOperationRequest).withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new APostOperationRequestMarshaller(protocolFactory)));
+ } finally {
+ MetricPublisher metricPublisher = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHER);
+ if (metricPublisher != null) {
+ metricPublisher.publish(apiCallMetricCollector.collect());
+ }
+ }
}
/**
@@ -113,19 +128,30 @@ public APostOperationResponse aPostOperation(APostOperationRequest aPostOperatio
*/
@Override
public APostOperationWithOutputResponse aPostOperationWithOutput(
- APostOperationWithOutputRequest aPostOperationWithOutputRequest) throws InvalidInputException, AwsServiceException,
- SdkClientException, QueryException {
+ APostOperationWithOutputRequest aPostOperationWithOutputRequest) throws InvalidInputException, AwsServiceException,
+ SdkClientException, QueryException {
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(APostOperationWithOutputResponse::builder);
+ .createResponseHandler(APostOperationWithOutputResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.SERVICE_ID, "Query Service");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.OPERATION_NAME, "APostOperationWithOutput");
+ try {
- return clientHandler
- .execute(new ClientExecutionParams()
- .withOperationName("APostOperationWithOutput").withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).withInput(aPostOperationWithOutputRequest)
- .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory)));
+ return clientHandler
+ .execute(new ClientExecutionParams()
+ .withOperationName("APostOperationWithOutput").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withInput(aPostOperationWithOutputRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory)));
+ } finally {
+ MetricPublisher metricPublisher = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHER);
+ if (metricPublisher != null) {
+ metricPublisher.publish(apiCallMetricCollector.collect());
+ }
+ }
}
/**
@@ -136,11 +162,11 @@ public APostOperationWithOutputResponse aPostOperationWithOutput(
* The content to send to the service. A {@link RequestBody} can be created using one of several factory
* methods for various sources of data. For example, to create a request body from a file you can do the
* following.
- *
+ *
*
* {@code RequestBody.fromFile(new File("myfile.txt"))}
*
- *
+ *
* See documentation in {@link RequestBody} for additional details and which sources of data are supported.
* The service documentation for the request content is as follows 'This be a stream'
* @return Result of the StreamingInputOperation operation returned by the service.
@@ -157,23 +183,35 @@ public APostOperationWithOutputResponse aPostOperationWithOutput(
*/
@Override
public StreamingInputOperationResponse streamingInputOperation(StreamingInputOperationRequest streamingInputOperationRequest,
- RequestBody requestBody) throws AwsServiceException, SdkClientException, QueryException {
+ RequestBody requestBody) throws AwsServiceException, SdkClientException, QueryException {
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(StreamingInputOperationResponse::builder);
+ .createResponseHandler(StreamingInputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.SERVICE_ID, "Query Service");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.OPERATION_NAME, "StreamingInputOperation");
+ try {
- return clientHandler.execute(new ClientExecutionParams()
- .withOperationName("StreamingInputOperation")
- .withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler)
- .withInput(streamingInputOperationRequest)
- .withRequestBody(requestBody)
- .withMarshaller(
- StreamingRequestMarshaller.builder()
- .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
- .requestBody(requestBody).build()));
+ return clientHandler
+ .execute(new ClientExecutionParams()
+ .withOperationName("StreamingInputOperation")
+ .withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler)
+ .withInput(streamingInputOperationRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withRequestBody(requestBody)
+ .withMarshaller(
+ StreamingRequestMarshaller.builder()
+ .delegateMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
+ .requestBody(requestBody).build()));
+ } finally {
+ MetricPublisher metricPublisher = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHER);
+ if (metricPublisher != null) {
+ metricPublisher.publish(apiCallMetricCollector.collect());
+ }
+ }
}
/**
@@ -201,28 +239,39 @@ public StreamingInputOperationResponse streamingInputOperation(StreamingInputOpe
*/
@Override
public ReturnT streamingOutputOperation(StreamingOutputOperationRequest streamingOutputOperationRequest,
- ResponseTransformer responseTransformer) throws AwsServiceException,
- SdkClientException, QueryException {
+ ResponseTransformer responseTransformer) throws AwsServiceException,
+ SdkClientException, QueryException {
HttpResponseHandler responseHandler = protocolFactory
- .createResponseHandler(StreamingOutputOperationResponse::builder);
+ .createResponseHandler(StreamingOutputOperationResponse::builder);
HttpResponseHandler errorResponseHandler = protocolFactory.createErrorResponseHandler();
+ MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.SERVICE_ID, "Query Service");
+ apiCallMetricCollector.reportMetric(AwsCoreMetric.OPERATION_NAME, "StreamingOutputOperation");
+ try {
- return clientHandler.execute(
- new ClientExecutionParams()
- .withOperationName("StreamingOutputOperation").withResponseHandler(responseHandler)
- .withErrorResponseHandler(errorResponseHandler).withInput(streamingOutputOperationRequest)
- .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)), responseTransformer);
+ return clientHandler.execute(
+ new ClientExecutionParams()
+ .withOperationName("StreamingOutputOperation").withResponseHandler(responseHandler)
+ .withErrorResponseHandler(errorResponseHandler).withInput(streamingOutputOperationRequest)
+ .withMetricCollector(apiCallMetricCollector)
+ .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)), responseTransformer);
+ } finally {
+ MetricPublisher metricPublisher = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHER);
+ if (metricPublisher != null) {
+ metricPublisher.publish(apiCallMetricCollector.collect());
+ }
+ }
}
private AwsQueryProtocolFactory init() {
return AwsQueryProtocolFactory
- .builder()
- .registerModeledException(
- ExceptionMetadata.builder().errorCode("InvalidInput")
- .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build())
- .clientConfiguration(clientConfiguration).defaultServiceExceptionSupplier(QueryException::builder).build();
+ .builder()
+ .registerModeledException(
+ ExceptionMetadata.builder().errorCode("InvalidInput")
+ .exceptionBuilderSupplier(InvalidInputException::builder).httpStatusCode(400).build())
+ .clientConfiguration(clientConfiguration).defaultServiceExceptionSupplier(QueryException::builder).build();
}
@Override
diff --git a/core/aws-core/pom.xml b/core/aws-core/pom.xml
index 45a68fe355c5..0f289fa045ad 100644
--- a/core/aws-core/pom.xml
+++ b/core/aws-core/pom.xml
@@ -63,6 +63,11 @@
http-client-spi
${awsjavasdk.version}