Address PR feedback

Author: S-Saranya1

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

@@ -32,12 +32,10 @@
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
-import software.amazon.awssdk.core.interceptor.SdkExecutionAttribute;
 import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
 import software.amazon.awssdk.core.internal.http.HttpClientDependencies;
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.MutableRequestToRequestPipeline;
-import software.amazon.awssdk.core.internal.useragent.BusinessMetricsUtils;
 import software.amazon.awssdk.core.useragent.AdditionalMetadata;
 import software.amazon.awssdk.core.useragent.BusinessMetricCollection;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
@@ -153,8 +151,6 @@ private static Optional<String> getBusinessMetricsString(ExecutionAttributes exe
         }
         businessMetrics.merge(metricsFromApiNames);
 
-        checksumBusinessMetrics(executionAttributes, businessMetrics);
-        
         credentialProviderBusinessMetrics(executionAttributes).ifPresent(businessMetrics::merge);
 
         if (businessMetrics.recordedMetrics().isEmpty()) {
@@ -164,20 +160,6 @@ private static Optional<String> getBusinessMetricsString(ExecutionAttributes exe
         return Optional.of(businessMetrics.asBoundedString());
     }
 
-    private static void checksumBusinessMetrics(ExecutionAttributes executionAttributes,
-                                                   BusinessMetricCollection businessMetrics) {
-        BusinessMetricsUtils.resolveRequestChecksumCalculationMetric(
-            executionAttributes.getAttribute(SdkInternalExecutionAttribute.REQUEST_CHECKSUM_CALCULATION))
-            .ifPresent(businessMetrics::addMetric);
-        
-        BusinessMetricsUtils.resolveResponseChecksumValidationMetric(
-            executionAttributes.getAttribute(SdkInternalExecutionAttribute.RESPONSE_CHECKSUM_VALIDATION))
-            .ifPresent(businessMetrics::addMetric);
-        
-        BusinessMetricsUtils.resolveChecksumSpecsMetric(
-            executionAttributes.getAttribute(SdkExecutionAttribute.RESOLVED_CHECKSUM_SPECS))
-            .ifPresent(businessMetrics::addMetric);
-    }
 
     private static Optional<Collection<String>> credentialProviderBusinessMetrics(
         ExecutionAttributes executionAttributes) {

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

@@ -49,7 +49,9 @@
 import software.amazon.awssdk.core.internal.http.RequestExecutionContext;
 import software.amazon.awssdk.core.internal.http.pipeline.MutableRequestToRequestPipeline;
 import software.amazon.awssdk.core.internal.io.AwsUnsignedChunkedEncodingInputStream;
+import software.amazon.awssdk.core.internal.useragent.BusinessMetricsUtils;
 import software.amazon.awssdk.core.internal.util.HttpChecksumUtils;
+import software.amazon.awssdk.core.useragent.BusinessMetricCollection;
 import software.amazon.awssdk.http.ContentStreamProvider;
 import software.amazon.awssdk.http.Header;
 import software.amazon.awssdk.http.SdkHttpFullRequest;
@@ -79,11 +81,16 @@ public SdkHttpFullRequest.Builder execute(SdkHttpFullRequest.Builder request, Re
 
         ensurePayloadChecksumStorePresent(context.executionAttributes());
 
+        SdkHttpFullRequest.Builder result;
         if (sraSigningEnabled(context)) {
-            return sraChecksum(request, context);
+            result = sraChecksum(request, context);
+        } else {
+            result = legacyChecksum(request, context);
         }
 
-        return legacyChecksum(request, context);
+        recordChecksumBusinessMetrics(context.executionAttributes());
+
+        return result;
     }
 
     private SdkHttpFullRequest.Builder legacyChecksum(SdkHttpFullRequest.Builder request, RequestExecutionContext context) {
@@ -351,6 +358,27 @@ private PayloadChecksumStore getPayloadChecksumStore(ExecutionAttributes executi
         return executionAttributes.getAttribute(CHECKSUM_STORE);
     }
 
+    private void recordChecksumBusinessMetrics(ExecutionAttributes executionAttributes) {
+        BusinessMetricCollection businessMetrics = 
+            executionAttributes.getAttribute(SdkInternalExecutionAttribute.BUSINESS_METRICS);
+        
+        if (businessMetrics == null) {
+            return;
+        }
+
+        BusinessMetricsUtils.resolveRequestChecksumCalculationMetric(
+            executionAttributes.getAttribute(SdkInternalExecutionAttribute.REQUEST_CHECKSUM_CALCULATION))
+            .ifPresent(businessMetrics::addMetric);
+
+        BusinessMetricsUtils.resolveResponseChecksumValidationMetric(
+            executionAttributes.getAttribute(SdkInternalExecutionAttribute.RESPONSE_CHECKSUM_VALIDATION))
+            .ifPresent(businessMetrics::addMetric);
+
+        BusinessMetricsUtils.resolveChecksumSpecsMetric(
+            executionAttributes.getAttribute(RESOLVED_CHECKSUM_SPECS))
+            .ifPresent(businessMetrics::addMetric);
+    }
+
     static final class ChecksumCalculatingStreamProvider implements ContentStreamProvider {
         private final ContentStreamProvider underlyingInputStreamProvider;
         private final String checksumHeaderForTrailer;