Review comments

Author: S-Saranya1

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

@@ -374,9 +374,11 @@ private void recordChecksumBusinessMetrics(ExecutionAttributes executionAttribut
             executionAttributes.getAttribute(SdkInternalExecutionAttribute.RESPONSE_CHECKSUM_VALIDATION))
             .ifPresent(businessMetrics::addMetric);
 
-        BusinessMetricsUtils.resolveChecksumSpecsMetric(
-            executionAttributes.getAttribute(RESOLVED_CHECKSUM_SPECS))
-            .ifPresent(businessMetrics::addMetric);
+        ChecksumSpecs checksumSpecs = executionAttributes.getAttribute(RESOLVED_CHECKSUM_SPECS);
+        if (checksumSpecs != null && checksumSpecs.algorithmV2() != null) {
+            BusinessMetricsUtils.resolveChecksumAlgorithmMetric(checksumSpecs.algorithmV2())
+                .ifPresent(businessMetrics::addMetric);
+        }
     }
 
     static final class ChecksumCalculatingStreamProvider implements ContentStreamProvider {

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/useragent/BusinessMetricsUtils.java

@@ -19,7 +19,6 @@
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.checksums.DefaultChecksumAlgorithm;
 import software.amazon.awssdk.checksums.spi.ChecksumAlgorithm;
-import software.amazon.awssdk.core.checksums.ChecksumSpecs;
 import software.amazon.awssdk.core.checksums.RequestChecksumCalculation;
 import software.amazon.awssdk.core.checksums.ResponseChecksumValidation;
 import software.amazon.awssdk.core.retry.RetryMode;
@@ -63,24 +62,26 @@ public static Optional<String> resolveRetryMode(RetryPolicy retryPolicy, RetrySt
 
     public static Optional<String> resolveRequestChecksumCalculationMetric(
         RequestChecksumCalculation requestChecksumCalculation) {
-        if (requestChecksumCalculation == RequestChecksumCalculation.WHEN_SUPPORTED) {
-            return Optional.of(BusinessMetricFeatureId.FLEXIBLE_CHECKSUMS_REQ_WHEN_SUPPORTED.value());
+        switch (requestChecksumCalculation) {
+            case WHEN_SUPPORTED:
+                return Optional.of(BusinessMetricFeatureId.FLEXIBLE_CHECKSUMS_REQ_WHEN_SUPPORTED.value());
+            case WHEN_REQUIRED:
+                return Optional.of(BusinessMetricFeatureId.FLEXIBLE_CHECKSUMS_REQ_WHEN_REQUIRED.value());
+            default:
+                return Optional.empty();
         }
-        if (requestChecksumCalculation == RequestChecksumCalculation.WHEN_REQUIRED) {
-            return Optional.of(BusinessMetricFeatureId.FLEXIBLE_CHECKSUMS_REQ_WHEN_REQUIRED.value());
-        }
-        return Optional.empty();
     }
 
     public static Optional<String> resolveResponseChecksumValidationMetric(
         ResponseChecksumValidation responseChecksumValidation) {
-        if (responseChecksumValidation == ResponseChecksumValidation.WHEN_SUPPORTED) {
-            return Optional.of(BusinessMetricFeatureId.FLEXIBLE_CHECKSUMS_RES_WHEN_SUPPORTED.value());
+        switch (responseChecksumValidation) {
+            case WHEN_SUPPORTED:
+                return Optional.of(BusinessMetricFeatureId.FLEXIBLE_CHECKSUMS_RES_WHEN_SUPPORTED.value());
+            case WHEN_REQUIRED:
+                return Optional.of(BusinessMetricFeatureId.FLEXIBLE_CHECKSUMS_RES_WHEN_REQUIRED.value());
+            default:
+                return Optional.empty();
         }
-        if (responseChecksumValidation == ResponseChecksumValidation.WHEN_REQUIRED) {
-            return Optional.of(BusinessMetricFeatureId.FLEXIBLE_CHECKSUMS_RES_WHEN_REQUIRED.value());
-        }
-        return Optional.empty();
     }
 
     public static Optional<String> resolveChecksumAlgorithmMetric(ChecksumAlgorithm algorithm) {
@@ -107,10 +108,4 @@ public static Optional<String> resolveChecksumAlgorithmMetric(ChecksumAlgorithm
         return Optional.empty();
     }
 
-    public static Optional<String> resolveChecksumSpecsMetric(ChecksumSpecs checksumSpecs) {
-        if (checksumSpecs != null && checksumSpecs.algorithmV2() != null) {
-            return resolveChecksumAlgorithmMetric(checksumSpecs.algorithmV2());
-        }
-        return Optional.empty();
-    }
 }

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

@@ -68,10 +68,11 @@ void when_noChecksumConfigurationIsSet_defaultConfigMetricsAreAdded() {
         client.allTypes(r -> {});
         String userAgent = getUserAgentFromLastRequest();
 
-        assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply("Z"));
-        assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply("b"));
-        assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply("a"));
-        assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply("c"));
+        assertThat(userAgent)
+            .matches(METRIC_SEARCH_PATTERN.apply("Z"))
+            .matches(METRIC_SEARCH_PATTERN.apply("b"))
+            .doesNotMatch(METRIC_SEARCH_PATTERN.apply("a"))
+            .doesNotMatch(METRIC_SEARCH_PATTERN.apply("c"));
     }
 
     @ParameterizedTest
@@ -117,8 +118,9 @@ void when_checksumConfigurationIsSet_correctMetricIsAdded(RequestChecksumCalcula
         client.allTypes(r -> {});
 
         String userAgent = getUserAgentFromLastRequest();
-        assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply(expectedRequestMetric));
-        assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply(expectedResponseMetric));
+        assertThat(userAgent)
+            .matches(METRIC_SEARCH_PATTERN.apply(expectedRequestMetric))
+            .matches(METRIC_SEARCH_PATTERN.apply(expectedResponseMetric));
     }
 
     static Stream<Arguments> checksumConfigurationTestCases() {
@@ -157,9 +159,10 @@ void when_checksumConfigurationAndAlgorithmAreSet_correctMetricsAreAdded(
 
         String userAgent = getUserAgentFromLastRequest();
 
-        assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply(expectedRequestMetric));
-        assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply(expectedResponseMetric));
-        assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply(expectedAlgorithmMetric));
+        assertThat(userAgent)
+            .matches(METRIC_SEARCH_PATTERN.apply(expectedRequestMetric))
+            .matches(METRIC_SEARCH_PATTERN.apply(expectedResponseMetric))
+            .matches(METRIC_SEARCH_PATTERN.apply(expectedAlgorithmMetric));
     }
 
     static Stream<Arguments> checksumConfigurationWithAlgorithmTestCases() {