Skip to content

Support core metrics for sync clients #1882

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

Merged
merged 1 commit into from
Jun 8, 2020
Merged

Support core metrics for sync clients #1882

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
20 changes: 12 additions & 8 deletions codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import javax.lang.model.element.Modifier;
import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
import software.amazon.awssdk.awscore.metrics.AwsCoreMetric;
import software.amazon.awssdk.codegen.docs.SimpleMethodOverload;
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
import software.amazon.awssdk.codegen.model.config.customization.UtilitiesMethod;
Expand All @@ -53,6 +53,8 @@
import software.amazon.awssdk.core.client.handler.SyncClientHandler;
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRefreshCache;
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
import software.amazon.awssdk.core.internal.util.MetricUtils;
import software.amazon.awssdk.core.metrics.CoreMetric;
import software.amazon.awssdk.metrics.MetricCollector;
import software.amazon.awssdk.metrics.MetricPublisher;

Expand Down Expand Up @@ -194,9 +196,9 @@ private List<MethodSpec> operationMethodSpecs(OperationModel opModel) {
method.addStatement("$1T $2N = $1T.create($3S)",
MetricCollector.class, metricCollectorName, "ApiCall");

method.addStatement("$N.reportMetric($T.$L, $S)", metricCollectorName, AwsCoreMetric.class, "SERVICE_ID",
method.addStatement("$N.reportMetric($T.$L, $S)", metricCollectorName, CoreMetric.class, "SERVICE_ID",
model.getMetadata().getServiceId());
method.addStatement("$N.reportMetric($T.$L, $S)", metricCollectorName, AwsCoreMetric.class, "OPERATION_NAME",
method.addStatement("$N.reportMetric($T.$L, $S)", metricCollectorName, CoreMetric.class, "OPERATION_NAME",
opModel.getOperationName());

String publisherName = "metricPublisher";
Expand All @@ -205,11 +207,13 @@ private List<MethodSpec> operationMethodSpecs(OperationModel opModel) {
.addCode(protocolSpec.executionHandler(opModel))
.endControlFlow()
.beginControlFlow("finally")
.addStatement("$T $N = clientConfiguration.option($T.$L)",
MetricPublisher.class, publisherName, SdkClientOption.class, "METRIC_PUBLISHER")
.beginControlFlow("if ($N != null)", publisherName)
.addStatement("$N.publish($N.collect())", publisherName, metricCollectorName)
.endControlFlow()
.addStatement("$T<$T> $N = $T.resolvePublisher(clientConfiguration, $N)",
Optional.class,
MetricPublisher.class,
publisherName,
MetricUtils.class,
opModel.getInput().getVariableName())
.addStatement("$N.ifPresent(p -> p.publish($N.collect()))", publisherName, metricCollectorName)
.endControlFlow();

methods.add(method.build());
Expand Down
49 changes: 24 additions & 25 deletions ...st/resources/software/amazon/awssdk/codegen/poet/client/test-endpoint-discovery-sync.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package software.amazon.awssdk.services.endpointdiscoverytest;

import java.net.URI;
import java.util.Optional;
import software.amazon.awssdk.annotations.Generated;
import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
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;
Expand All @@ -15,6 +15,8 @@
import software.amazon.awssdk.core.endpointdiscovery.EndpointDiscoveryRequest;
import software.amazon.awssdk.core.exception.SdkClientException;
import software.amazon.awssdk.core.http.HttpResponseHandler;
import software.amazon.awssdk.core.internal.util.MetricUtils;
import software.amazon.awssdk.core.metrics.CoreMetric;
import software.amazon.awssdk.metrics.MetricCollector;
import software.amazon.awssdk.metrics.MetricPublisher;
import software.amazon.awssdk.protocols.json.AwsJsonProtocol;
Expand Down Expand Up @@ -92,8 +94,8 @@ public DescribeEndpointsResponse describeEndpoints(DescribeEndpointsRequest desc
HttpResponseHandler<AwsServiceException> errorResponseHandler = createErrorResponseHandler(protocolFactory,
operationMetadata);
MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
apiCallMetricCollector.reportMetric(AwsCoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
apiCallMetricCollector.reportMetric(AwsCoreMetric.OPERATION_NAME, "DescribeEndpoints");
apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "DescribeEndpoints");
try {

return clientHandler.execute(new ClientExecutionParams<DescribeEndpointsRequest, DescribeEndpointsResponse>()
Expand All @@ -102,10 +104,9 @@ public DescribeEndpointsResponse describeEndpoints(DescribeEndpointsRequest desc
.withMetricCollector(apiCallMetricCollector)
.withMarshaller(new DescribeEndpointsRequestMarshaller(protocolFactory)));
} finally {
MetricPublisher metricPublisher = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHER);
if (metricPublisher != null) {
metricPublisher.publish(apiCallMetricCollector.collect());
}
Optional<MetricPublisher> metricPublisher = MetricUtils.resolvePublisher(clientConfiguration,
describeEndpointsRequest);
metricPublisher.ifPresent(p -> p.publish(apiCallMetricCollector.collect()));
}
}

Expand Down Expand Up @@ -144,8 +145,8 @@ public TestDiscoveryIdentifiersRequiredResponse testDiscoveryIdentifiersRequired
cachedEndpoint = endpointDiscoveryCache.get(key, endpointDiscoveryRequest);
}
MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
apiCallMetricCollector.reportMetric(AwsCoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
apiCallMetricCollector.reportMetric(AwsCoreMetric.OPERATION_NAME, "TestDiscoveryIdentifiersRequired");
apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "TestDiscoveryIdentifiersRequired");
try {

return clientHandler
Expand All @@ -155,10 +156,9 @@ public TestDiscoveryIdentifiersRequiredResponse testDiscoveryIdentifiersRequired
.withInput(testDiscoveryIdentifiersRequiredRequest).withMetricCollector(apiCallMetricCollector)
.withMarshaller(new TestDiscoveryIdentifiersRequiredRequestMarshaller(protocolFactory)));
} finally {
MetricPublisher metricPublisher = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHER);
if (metricPublisher != null) {
metricPublisher.publish(apiCallMetricCollector.collect());
}
Optional<MetricPublisher> metricPublisher = MetricUtils.resolvePublisher(clientConfiguration,
testDiscoveryIdentifiersRequiredRequest);
metricPublisher.ifPresent(p -> p.publish(apiCallMetricCollector.collect()));
}
}

Expand Down Expand Up @@ -196,8 +196,8 @@ public TestDiscoveryOptionalResponse testDiscoveryOptional(TestDiscoveryOptional
cachedEndpoint = endpointDiscoveryCache.get(key, endpointDiscoveryRequest);
}
MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
apiCallMetricCollector.reportMetric(AwsCoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
apiCallMetricCollector.reportMetric(AwsCoreMetric.OPERATION_NAME, "TestDiscoveryOptional");
apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "TestDiscoveryOptional");
try {

return clientHandler.execute(new ClientExecutionParams<TestDiscoveryOptionalRequest, TestDiscoveryOptionalResponse>()
Expand All @@ -206,10 +206,9 @@ public TestDiscoveryOptionalResponse testDiscoveryOptional(TestDiscoveryOptional
.withInput(testDiscoveryOptionalRequest).withMetricCollector(apiCallMetricCollector)
.withMarshaller(new TestDiscoveryOptionalRequestMarshaller(protocolFactory)));
} finally {
MetricPublisher metricPublisher = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHER);
if (metricPublisher != null) {
metricPublisher.publish(apiCallMetricCollector.collect());
}
Optional<MetricPublisher> metricPublisher = MetricUtils.resolvePublisher(clientConfiguration,
testDiscoveryOptionalRequest);
metricPublisher.ifPresent(p -> p.publish(apiCallMetricCollector.collect()));
}
}

Expand Down Expand Up @@ -247,8 +246,8 @@ public TestDiscoveryRequiredResponse testDiscoveryRequired(TestDiscoveryRequired
cachedEndpoint = endpointDiscoveryCache.get(key, endpointDiscoveryRequest);
}
MetricCollector apiCallMetricCollector = MetricCollector.create("ApiCall");
apiCallMetricCollector.reportMetric(AwsCoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
apiCallMetricCollector.reportMetric(AwsCoreMetric.OPERATION_NAME, "TestDiscoveryRequired");
apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "AwsEndpointDiscoveryTest");
apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "TestDiscoveryRequired");
try {

return clientHandler.execute(new ClientExecutionParams<TestDiscoveryRequiredRequest, TestDiscoveryRequiredResponse>()
Expand All @@ -257,10 +256,9 @@ public TestDiscoveryRequiredResponse testDiscoveryRequired(TestDiscoveryRequired
.withInput(testDiscoveryRequiredRequest).withMetricCollector(apiCallMetricCollector)
.withMarshaller(new TestDiscoveryRequiredRequestMarshaller(protocolFactory)));
} finally {
MetricPublisher metricPublisher = clientConfiguration.option(SdkClientOption.METRIC_PUBLISHER);
if (metricPublisher != null) {
metricPublisher.publish(apiCallMetricCollector.collect());
}
Optional<MetricPublisher> metricPublisher = MetricUtils.resolvePublisher(clientConfiguration,
testDiscoveryRequiredRequest);
metricPublisher.ifPresent(p -> p.publish(apiCallMetricCollector.collect()));
}
}

Expand All @@ -280,3 +278,4 @@ public void close() {
clientHandler.close();
}
}

Loading