Fix streaming requests test failure

Author: Nicholas DeJaco

core/sdk-core/src/main/java/software/amazon/awssdk/core/RequestOverrideConfiguration.java

@@ -59,7 +59,7 @@ protected RequestOverrideConfiguration(Builder<?> builder) {
         this.apiCallAttemptTimeout = Validate.isPositiveOrNull(builder.apiCallAttemptTimeout(), "apiCallAttemptTimeout");
         this.signer = builder.signer();
         this.metricPublishers = Collections.unmodifiableList(new ArrayList<>(builder.metricPublishers()));
-        this.executionAttributes = new UnmodifiableExecutionAttributes(builder.executionAttributes().build());
+        this.executionAttributes = new UnmodifiableExecutionAttributes(builder.executionAttributes());
     }
 
     /**
@@ -402,7 +402,7 @@ default B putRawQueryParameter(String name, String value) {
          */
         <T> B putExecutionAttribute(ExecutionAttribute<T> attribute, T value);
 
-        ExecutionAttributes.Builder executionAttributes();
+        ExecutionAttributes executionAttributes();
 
         /**
          * Create a new {@code SdkRequestOverrideConfiguration} with the properties set on this builder.
@@ -575,8 +575,8 @@ public <T> B putExecutionAttribute(ExecutionAttribute<T> executionAttribute, T v
         }
 
         @Override
-        public ExecutionAttributes.Builder executionAttributes() {
-            return executionAttributes;
+        public ExecutionAttributes executionAttributes() {
+            return executionAttributes.build();
         }
 
         public void setExecutionAttributes(Map<ExecutionAttribute<?>, Object> executionAttributes) {

core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOverrideConfiguration.java

@@ -75,7 +75,7 @@ private ClientOverrideConfiguration(Builder builder) {
         this.defaultProfileFile = builder.defaultProfileFile();
         this.defaultProfileName = builder.defaultProfileName();
         this.metricPublishers = Collections.unmodifiableList(new ArrayList<>(builder.metricPublishers()));
-        this.executionAttributes = new UnmodifiableExecutionAttributes(builder.executionAttributes().build());
+        this.executionAttributes = new UnmodifiableExecutionAttributes(builder.executionAttributes());
     }
 
     @Override
@@ -87,7 +87,8 @@ public Builder toBuilder() {
                                                               .apiCallAttemptTimeout(apiCallAttemptTimeout)
                                                               .executionInterceptors(executionInterceptors)
                                                               .defaultProfileFile(defaultProfileFile)
-                                                              .defaultProfileName(defaultProfileName);
+                                                              .defaultProfileName(defaultProfileName)
+                                                              .executionAttributes(executionAttributes.getAttributes());
     }
 
     /**
@@ -468,7 +469,7 @@ default Builder retryPolicy(RetryMode retryMode) {
          */
         <T> Builder putExecutionAttribute(ExecutionAttribute<T> attribute, T value);
 
-        ExecutionAttributes.Builder executionAttributes();
+        ExecutionAttributes executionAttributes();
     }
 
     /**
@@ -663,8 +664,8 @@ public <T> Builder putExecutionAttribute(ExecutionAttribute<T> executionAttribut
         }
 
         @Override
-        public ExecutionAttributes.Builder executionAttributes() {
-            return executionAttributes;
+        public ExecutionAttributes executionAttributes() {
+            return executionAttributes.build();
         }
 
         @Override

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseAsyncClientHandler.java

@@ -113,19 +113,19 @@ public <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> Complet
             AsyncStreamingResponseHandler<OutputT, ReturnT> asyncStreamingResponseHandler =
                 new AsyncStreamingResponseHandler<>(asyncResponseTransformer);
 
+            ExecutionContext context = createExecutionContext(executionParams, executionAttributes);
+
             // For streaming requests, prepare() should be called as early as possible to avoid NPE in client
             // See https://github.com/aws/aws-sdk-java-v2/issues/1268. We do this with a wrapper that caches the prepare
             // result until the execution attempt number changes. This guarantees that prepare is only called once per
             // execution.
             TransformingAsyncResponseHandler<ReturnT> wrappedAsyncStreamingResponseHandler =
                 IdempotentAsyncResponseHandler.create(
                     asyncStreamingResponseHandler,
-                    () -> executionAttributes.getAttribute(InternalCoreExecutionAttribute.EXECUTION_ATTEMPT),
+                    () -> context.executionAttributes().getAttribute(InternalCoreExecutionAttribute.EXECUTION_ATTEMPT),
                     Integer::equals);
             wrappedAsyncStreamingResponseHandler.prepare();
 
-            ExecutionContext context = createExecutionContext(executionParams, executionAttributes);
-
             HttpResponseHandler<OutputT> decoratedResponseHandlers =
                 decorateResponseHandlers(executionParams.getResponseHandler(), context);