Merge branch 'master' into alexwoo/eventstream-shared-customization

Author: alextwoods

.changes/next-release/documentation-AWSSDKforJavav2-6b16da2.json

@@ -0,0 +1,6 @@
+{
+    "type": "documentation",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Improve EventStreamResponseHandler.Builder.onError method to mention the callback may be called multiple time, similarly to the exceptionOccurred method"
+}

.github/workflows/s3-regression-tests.yml

@@ -22,8 +22,10 @@ jobs:
       - name: Check for changes related to s3
         id: check-changes
         run: |
-          git fetch origin ${{ github.base_ref || github.event.merge_group.base_ref || github.ref }} --depth 1
-          CHANGED_FILES=$(git diff remotes/origin/${{ github.base_ref || github.event.merge_group.base_ref || github.ref }} --name-only)
+          BASE_REF=${{ github.base_ref || github.event.merge_group.base_ref || github.ref }}
+          BASE_REF=${BASE_REF#refs/heads/}
+          git fetch origin "$BASE_REF" --depth 1
+          CHANGED_FILES=$(git diff origin/"$BASE_REF" --name-only)
           if echo "$CHANGED_FILES" | grep -q -E '^core/|^services/s3/|^services-custom/s3-transfer-manager/|^http-client-spi/|^http-clients/'; then
             echo "Detected changes in S3, HTTP client, or core modules"
             echo "has_s3_related_changes=true" >> $GITHUB_OUTPUT

core/aws-core/src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamResponseHandler.java

@@ -94,7 +94,8 @@ interface Builder<ResponseT, EventT, SubBuilderT> {
         SubBuilderT onResponse(Consumer<ResponseT> responseConsumer);
 
         /**
-         * Callback to invoke in the event on an error.
+         * Callback to invoke in the event on an error. The {@link Consumer#accept(Object)} method may be called multiple times
+         * during the lifecycle of a request if automatic retries are enabled.
          *
          * @param consumer Callback that will process any error that occurs.
          * @return This builder for method chaining.

services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3IntegrationTestBase.java

@@ -74,6 +74,7 @@ public static void setUpForAllIntegTests() throws Exception {
         s3CrtAsync = S3CrtAsyncClient.builder()
                                      .credentialsProvider(CREDENTIALS_PROVIDER_CHAIN)
                                      .region(DEFAULT_REGION)
+                                     .maxConcurrency(1)
                                      .build();
         tmCrt = S3TransferManager.builder()
                                  .s3Client(s3CrtAsync)

services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3TransferManagerDownloadPauseResumeIntegrationTest.java

@@ -56,8 +56,8 @@ public class S3TransferManagerDownloadPauseResumeIntegrationTest extends S3Integ
     private static final Logger log = Logger.loggerFor(S3TransferManagerDownloadPauseResumeIntegrationTest.class);
     private static final String BUCKET = temporaryBucketName(S3TransferManagerDownloadPauseResumeIntegrationTest.class);
     private static final String KEY = "key";
-    // 24 * MB is chosen to make sure we have data written in the file already upon pausing.
-    private static final long OBJ_SIZE = 24 * MB;
+    // 50 * MB is chosen to make sure we have data written in the file already upon pausing.
+    private static final long OBJ_SIZE = 50 * MB;
     private static File sourceFile;
 
     @BeforeAll
@@ -152,8 +152,7 @@ void pauseAndResume_ObjectNotChanged_shouldResumeDownload(S3TransferManager tm)
         assertThat(resumableFileDownload.s3ObjectLastModified()).hasValue(testDownloadListener.getObjectResponse.lastModified());
         assertThat(bytesTransferred).isEqualTo(path.toFile().length());
         assertThat(resumableFileDownload.totalSizeInBytes()).hasValue(sourceFile.length());
-
-        assertThat(bytesTransferred).isLessThan(sourceFile.length());
+        assertThat(bytesTransferred).isLessThanOrEqualTo(sourceFile.length());
         assertThat(download.completionFuture()).isCancelled();
 
         log.debug(() -> "Resuming download ");
@@ -242,7 +241,7 @@ private static void waitUntilFirstByteBufferDelivered(FileDownload download) {
                                                         .addAcceptor(WaiterAcceptor.retryOnResponseAcceptor(r -> true))
                                                         .overrideConfiguration(o -> o.waitTimeout(Duration.ofMinutes(1))
                                                                                      .maxAttempts(Integer.MAX_VALUE)
-                                                                                     .backoffStrategy(FixedDelayBackoffStrategy.create(Duration.ofMillis(100))))
+                                                                                     .backoffStrategy(FixedDelayBackoffStrategy.create(Duration.ofMillis(10))))
                                                         .build();
         waiter.run(() -> download.progress().snapshot());
     }

services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/UploadDirectoryHelperTest.java

@@ -561,7 +561,7 @@ void uploadDirectory_customMaxConcurrency_shouldLimitConcurrentOperations() thro
         assertThat(observedPeak)
             .as("Implementation allowed %d concurrent operations but was configured for %d", 
                 observedPeak, configuredMaxConcurrency)
-            .isEqualTo(configuredMaxConcurrency);
+            .isLessThanOrEqualTo(configuredMaxConcurrency);
 
         // Release the phase to let operations complete
         phaser.arriveAndDeregister();