Implement SERVICE_ENDPOINT core metric

Author: dave-fn

.changes/next-release/bugfix-AWSSDKforJavav2-0a552ee.json

@@ -0,0 +1,6 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "contributor": "", 
+    "type": "bugfix", 
+    "description": "Implement SERVICE_ENDPOINT core metric"
+}

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/ApiCallAttemptMetricCollectionStage.java

@@ -16,6 +16,7 @@
 package software.amazon.awssdk.core.internal.http.pipeline.stages;
 
 import static software.amazon.awssdk.core.internal.util.MetricUtils.collectHttpMetrics;
+import static software.amazon.awssdk.core.internal.util.MetricUtils.collectHttpRequestMetrics;
 import static software.amazon.awssdk.core.internal.util.MetricUtils.createAttemptMetricsCollector;
 
 import java.time.Duration;
@@ -47,6 +48,8 @@ public Response<OutputT> execute(SdkHttpFullRequest input, RequestExecutionConte
         context.attemptMetricCollector(apiCallAttemptMetrics);
         reportBackoffDelay(context);
 
+        collectHttpRequestMetrics(apiCallAttemptMetrics, input);
+
         Response<OutputT> response = wrapped.execute(input, context);
 
         collectHttpMetrics(apiCallAttemptMetrics, response.httpResponse());

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/AsyncApiCallAttemptMetricCollectionStage.java

@@ -16,6 +16,7 @@
 package software.amazon.awssdk.core.internal.http.pipeline.stages;
 
 import static software.amazon.awssdk.core.internal.util.MetricUtils.collectHttpMetrics;
+import static software.amazon.awssdk.core.internal.util.MetricUtils.collectHttpRequestMetrics;
 import static software.amazon.awssdk.core.internal.util.MetricUtils.createAttemptMetricsCollector;
 
 import java.time.Duration;
@@ -52,6 +53,8 @@ public CompletableFuture<Response<OutputT>> execute(SdkHttpFullRequest input,
         context.attemptMetricCollector(apiCallAttemptMetrics);
         reportBackoffDelay(context);
 
+        collectHttpRequestMetrics(apiCallAttemptMetrics, input);
+
         CompletableFuture<Response<OutputT>> executeFuture = wrapped.execute(input, context);
         CompletableFuture<Response<OutputT>> metricsCollectedFuture = executeFuture.whenComplete((r, t) -> {
             if (t == null) {

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/util/MetricUtils.java

@@ -25,6 +25,7 @@
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.metrics.CoreMetric;
 import software.amazon.awssdk.http.HttpMetric;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
 import software.amazon.awssdk.metrics.MetricCollector;
 import software.amazon.awssdk.metrics.NoOpMetricCollector;
@@ -65,6 +66,12 @@ public static <T> Pair<T, Duration> measureDurationUnsafe(Callable<T> c) throws
         return Pair.of(result, d);
     }
 
+    public static void collectHttpRequestMetrics(MetricCollector metricCollector, SdkHttpFullRequest httpRequest) {
+        if (metricCollector != null && !(metricCollector instanceof NoOpMetricCollector) && httpRequest != null) {
+            metricCollector.reportMetric(CoreMetric.SERVICE_ENDPOINT, httpRequest.getUri());
+        }
+    }
+
     public static void collectHttpMetrics(MetricCollector metricCollector, SdkHttpFullResponse httpResponse) {
         if (metricCollector != null && !(metricCollector instanceof NoOpMetricCollector) && httpResponse != null) {
             metricCollector.reportMetric(HttpMetric.HTTP_STATUS_CODE, httpResponse.statusCode());

core/sdk-core/src/main/java/software/amazon/awssdk/core/metrics/CoreMetric.java

@@ -15,6 +15,7 @@
 
 package software.amazon.awssdk.core.metrics;
 
+import java.net.URI;
 import java.time.Duration;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.retry.RetryPolicy;
@@ -50,6 +51,12 @@ public final class CoreMetric {
     public static final SdkMetric<Integer> RETRY_COUNT =
         metric("RetryCount", Integer.class, MetricLevel.ERROR);
 
+    /**
+     * The endpoint for the service.
+     */
+    public static final SdkMetric<URI> SERVICE_ENDPOINT =
+        metric("ServiceEndpoint", URI.class, MetricLevel.ERROR);
+
     /**
      * The duration of the API call. This includes all call attempts made.
      *

test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/metrics/CoreMetricsTest.java

@@ -181,6 +181,8 @@ public void testApiCall_operationSuccessful_addsMetrics() {
         assertThat(capturedCollection.metricValues(CoreMetric.MARSHALLING_DURATION).get(0))
             .isGreaterThanOrEqualTo(Duration.ZERO);
         assertThat(capturedCollection.metricValues(CoreMetric.RETRY_COUNT)).containsExactly(0);
+        assertThat(capturedCollection.metricValues(CoreMetric.SERVICE_ENDPOINT).get(0)).isEqualTo(URI.create(
+            "https://customresponsemetadata.us-west-2.amazonaws.com"));
 
         assertThat(capturedCollection.children()).hasSize(1);
         MetricCollection attemptCollection = capturedCollection.children().get(0);

test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/metrics/async/BaseAsyncCoreMetricsTest.java

@@ -201,6 +201,8 @@ private void verifyApiCallCollection(MetricCollection capturedCollection) {
             .isGreaterThanOrEqualTo(Duration.ZERO);
         assertThat(capturedCollection.metricValues(CoreMetric.API_CALL_DURATION).get(0))
             .isGreaterThan(FIXED_DELAY);
+        assertThat(capturedCollection.metricValues(CoreMetric.SERVICE_ENDPOINT).get(0))
+            .isEqualTo(URI.create("http://localhost"));
     }
 
     void stubSuccessfulResponse() {