Fixing failing tests

Author: S-Saranya1

codegen/src/main/java/software/amazon/awssdk/codegen/poet/auth/scheme/AuthSchemeInterceptorSpec.java

@@ -163,9 +163,13 @@ private MethodSpec generateBeforeExecution() {
             builder.beginControlFlow("if (selectedAuthScheme != null && "
                                      + "selectedAuthScheme.authSchemeOption().schemeId().equals($S))",
                                      "aws.auth#sigv4a")
-                   .addStatement("executionAttributes.getAttribute($T.BUSINESS_METRICS)"
-                                 + ".addMetric($T.SIGV4A_SIGNING.value())",
-                                 SdkInternalExecutionAttribute.class, BusinessMetricFeatureId.class)
+                   .addStatement("$T businessMetrics = executionAttributes.getAttribute($T.BUSINESS_METRICS)",
+                                 ClassName.get("software.amazon.awssdk.core.useragent", "BusinessMetricCollection"),
+                                 SdkInternalExecutionAttribute.class)
+                   .beginControlFlow("if (businessMetrics != null)")
+                   .addStatement("businessMetrics.addMetric($T.SIGV4A_SIGNING.value())",
+                                 BusinessMetricFeatureId.class)
+                   .endControlFlow()
                    .endControlFlow();
         }
         return builder.build();

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/ops-auth-sigv4a-value-auth-scheme-interceptor.java

@@ -20,6 +20,7 @@
 import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
 import software.amazon.awssdk.core.internal.util.MetricUtils;
 import software.amazon.awssdk.core.metrics.CoreMetric;
+import software.amazon.awssdk.core.useragent.BusinessMetricCollection;
 import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
 import software.amazon.awssdk.http.auth.aws.signer.RegionSet;
 import software.amazon.awssdk.http.auth.spi.scheme.AuthScheme;
@@ -51,8 +52,11 @@ public void beforeExecution(Context.BeforeExecution context, ExecutionAttributes
         SelectedAuthScheme<? extends Identity> selectedAuthScheme = selectAuthScheme(authOptions, executionAttributes);
         putSelectedAuthScheme(executionAttributes, selectedAuthScheme);
         if (selectedAuthScheme != null && selectedAuthScheme.authSchemeOption().schemeId().equals("aws.auth#sigv4a")) {
-            executionAttributes.getAttribute(SdkInternalExecutionAttribute.BUSINESS_METRICS).addMetric(
-                BusinessMetricFeatureId.SIGV4A_SIGNING.value());
+            BusinessMetricCollection businessMetrics = executionAttributes
+                .getAttribute(SdkInternalExecutionAttribute.BUSINESS_METRICS);
+            if (businessMetrics != null) {
+                businessMetrics.addMetric(BusinessMetricFeatureId.SIGV4A_SIGNING.value());
+            }
         }
     }
 

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/query-endpoint-auth-params-with-allowlist-auth-scheme-interceptor.java

@@ -20,6 +20,7 @@
 import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
 import software.amazon.awssdk.core.internal.util.MetricUtils;
 import software.amazon.awssdk.core.metrics.CoreMetric;
+import software.amazon.awssdk.core.useragent.BusinessMetricCollection;
 import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
 import software.amazon.awssdk.endpoints.EndpointProvider;
 import software.amazon.awssdk.http.auth.aws.signer.RegionSet;
@@ -54,8 +55,11 @@ public void beforeExecution(Context.BeforeExecution context, ExecutionAttributes
         SelectedAuthScheme<? extends Identity> selectedAuthScheme = selectAuthScheme(authOptions, executionAttributes);
         putSelectedAuthScheme(executionAttributes, selectedAuthScheme);
         if (selectedAuthScheme != null && selectedAuthScheme.authSchemeOption().schemeId().equals("aws.auth#sigv4a")) {
-            executionAttributes.getAttribute(SdkInternalExecutionAttribute.BUSINESS_METRICS).addMetric(
-                BusinessMetricFeatureId.SIGV4A_SIGNING.value());
+            BusinessMetricCollection businessMetrics = executionAttributes
+                .getAttribute(SdkInternalExecutionAttribute.BUSINESS_METRICS);
+            if (businessMetrics != null) {
+                businessMetrics.addMetric(BusinessMetricFeatureId.SIGV4A_SIGNING.value());
+            }
         }
     }
 

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/query-endpoint-auth-params-without-allowlist-auth-scheme-interceptor.java

@@ -20,6 +20,7 @@
 import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
 import software.amazon.awssdk.core.internal.util.MetricUtils;
 import software.amazon.awssdk.core.metrics.CoreMetric;
+import software.amazon.awssdk.core.useragent.BusinessMetricCollection;
 import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
 import software.amazon.awssdk.endpoints.EndpointProvider;
 import software.amazon.awssdk.http.auth.aws.signer.RegionSet;
@@ -54,8 +55,11 @@ public void beforeExecution(Context.BeforeExecution context, ExecutionAttributes
         SelectedAuthScheme<? extends Identity> selectedAuthScheme = selectAuthScheme(authOptions, executionAttributes);
         putSelectedAuthScheme(executionAttributes, selectedAuthScheme);
         if (selectedAuthScheme != null && selectedAuthScheme.authSchemeOption().schemeId().equals("aws.auth#sigv4a")) {
-            executionAttributes.getAttribute(SdkInternalExecutionAttribute.BUSINESS_METRICS).addMetric(
-                BusinessMetricFeatureId.SIGV4A_SIGNING.value());
+            BusinessMetricCollection businessMetrics = executionAttributes
+                .getAttribute(SdkInternalExecutionAttribute.BUSINESS_METRICS);
+            if (businessMetrics != null) {
+                businessMetrics.addMetric(BusinessMetricFeatureId.SIGV4A_SIGNING.value());
+            }
         }
     }