Update s3 crt client tests to verify resources are closed properly

Author: zoewangg

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

@@ -83,6 +83,7 @@ public static void teardown() throws IOException {
         S3IntegrationTestBase.deleteBucketAndAllContents(TEST_BUCKET);
         Files.delete(testFile.toPath());
         executorService.shutdown();
+        S3IntegrationTestBase.cleanUp();
     }
 
     @Test

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

@@ -64,8 +64,10 @@ public static void setup() throws IOException {
 
     @AfterClass
     public static void cleanup() {
+        crtClient.close();
         S3IntegrationTestBase.deleteBucketAndAllContents(BUCKET);
         executorService.shutdown();
+        S3IntegrationTestBase.cleanUp();
     }
 
     @Test

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

@@ -15,7 +15,9 @@
 
 package software.amazon.awssdk.transfer.s3;
 
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import software.amazon.awssdk.crt.CrtResource;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 import software.amazon.awssdk.services.s3.S3AsyncClientBuilder;
@@ -55,10 +57,16 @@ public class S3IntegrationTestBase extends AwsTestBase {
      */
     @BeforeClass
     public static void setUp() throws Exception {
+        System.setProperty("aws.crt.debugnative", "true");
         s3 = s3ClientBuilder().build();
         s3Async = s3AsyncClientBuilder().build();
     }
 
+    @AfterClass
+    public static void cleanUp() {
+        CrtResource.waitForNoResources();
+    }
+
     protected static S3ClientBuilder s3ClientBuilder() {
         return S3Client.builder()
                        .region(DEFAULT_REGION)

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

@@ -52,6 +52,7 @@ public static void setup() throws IOException {
     public static void cleanup() {
         deleteBucketAndAllContents(BUCKET);
         transferManager.close();
+        S3IntegrationTestBase.cleanUp();
     }
 
     @Test

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

@@ -56,6 +56,7 @@ public static void teardown() throws IOException {
         tm.close();
         Files.delete(testFile.toPath());
         deleteBucketAndAllContents(TEST_BUCKET);
+        S3IntegrationTestBase.cleanUp();
     }
 
     @Test

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/internal/S3NativeClientConfiguration.java

@@ -33,7 +33,6 @@
 import software.amazon.awssdk.crt.io.ClientBootstrap;
 import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
 import software.amazon.awssdk.transfer.s3.SizeConstant;
-import software.amazon.awssdk.utils.Logger;
 import software.amazon.awssdk.utils.SdkAutoCloseable;
 import software.amazon.awssdk.utils.ThreadFactoryBuilder;
 
@@ -42,7 +41,6 @@
  */
 @SdkInternalApi
 public class S3NativeClientConfiguration implements SdkAutoCloseable {
-    private static final Logger log = Logger.loggerFor(S3NativeClientConfiguration.class);
     private static final long DEFAULT_PART_SIZE_IN_BYTES = 8L * SizeConstant.MB;
     private static final long DEFAULT_TARGET_THROUGHPUT_IN_GBPS = 5;
     private final String signingRegion;

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

@@ -19,13 +19,15 @@
 import static software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR;
 
 import java.util.concurrent.ExecutorService;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.runners.MockitoJUnitRunner;
 import software.amazon.awssdk.core.client.config.ClientAsyncConfiguration;
+import software.amazon.awssdk.crt.CrtResource;
 
 @RunWith(MockitoJUnitRunner.class)
 public class S3NativeClientConfigurationTest {
@@ -38,7 +40,10 @@ public static void setup() {
         System.setProperty("aws.crt.debugnative", "true");
     }
 
-    // TODO: verify CRT resources are closed appropriately
+    @AfterClass
+    public static void tearDown() {
+        CrtResource.waitForNoResources();
+    }
 
     @Test
     public void defaultConfiguration_close_shouldShutdownDefaultExecutor() {

test/stability-tests/pom.xml

@@ -117,6 +117,12 @@
             <version>${awsjavasdk.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk.crt</groupId>
+            <artifactId>aws-crt</artifactId>
+            <version>${awscrt.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3-transfer-manager</artifactId>

test/stability-tests/src/it/java/software/amazon/awssdk/stability/tests/s3/S3CrtAsyncClientStabilityTest.java

@@ -17,6 +17,7 @@
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import software.amazon.awssdk.crt.CrtResource;
 import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
@@ -42,6 +43,7 @@ public S3CrtAsyncClientStabilityTest() {
 
     @BeforeAll
     public static void setup() {
+        System.setProperty("aws.crt.debugnative", "true");
         s3ApacheClient.createBucket(b -> b.bucket(BUCKET_NAME));
     }
 
@@ -56,6 +58,7 @@ public static void cleanup() {
         }
         s3CrtAsyncClient.close();
         s3ApacheClient.close();
+        CrtResource.waitForNoResources();
     }
 
     @Override