Fixed an issue where the clientName was not overridden for unmanaged async client (#2974)

Author: zoewangg

.changes/next-release/bugfix-AWSSDKforJavav2-92ee7cb.json

@@ -0,0 +1,6 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "contributor": "", 
+    "type": "bugfix", 
+    "description": "Fixed an issue where the clientName was not overridden if an SdkAsyncHttpClient instance was provided"
+}

core/aws-core/src/test/java/software/amazon/awssdk/awscore/client/builder/DefaultAwsClientBuilderTest.java

@@ -160,23 +160,39 @@ public void asyncHttpClientFactoryProvided_ClientIsManagedBySdk() {
 
     @Test
     public void explicitClientProvided_ClientIsNotManagedBySdk() {
+        String clientName = "foobarsync";
+        SdkHttpClient sdkHttpClient = mock(SdkHttpClient.class);
         TestClient client = testClientBuilder()
             .region(Region.US_WEST_2)
-            .httpClient(mock(SdkHttpClient.class))
+            .httpClient(sdkHttpClient)
             .build();
+        when(sdkHttpClient.clientName()).thenReturn(clientName);
         assertThat(client.clientConfiguration.option(SdkClientOption.SYNC_HTTP_CLIENT))
             .isInstanceOf(AwsDefaultClientBuilder.NonManagedSdkHttpClient.class);
+
+        assertThat(client.clientConfiguration.option(SdkClientOption.SYNC_HTTP_CLIENT).clientName())
+            .isEqualTo(clientName);
         verify(defaultHttpClientBuilder, never()).buildWithDefaults(any());
     }
 
     @Test
     public void explicitAsyncHttpClientProvided_ClientIsNotManagedBySdk() {
+        String clientName = "foobarasync";
+        SdkAsyncHttpClient sdkAsyncHttpClient = mock(SdkAsyncHttpClient.class);
         TestAsyncClient client = testAsyncClientBuilder()
             .region(Region.US_WEST_2)
-            .httpClient(mock(SdkAsyncHttpClient.class))
+            .httpClient(sdkAsyncHttpClient)
             .build();
         assertThat(client.clientConfiguration.option(SdkClientOption.ASYNC_HTTP_CLIENT))
             .isInstanceOf(AwsDefaultClientBuilder.NonManagedSdkAsyncHttpClient.class);
+
+        when(sdkAsyncHttpClient.clientName()).thenReturn(clientName);
+
+        assertThat(client.clientConfiguration.option(SdkClientOption.ASYNC_HTTP_CLIENT))
+            .isInstanceOf(AwsDefaultClientBuilder.NonManagedSdkAsyncHttpClient.class);
+
+        assertThat(client.clientConfiguration.option(SdkClientOption.ASYNC_HTTP_CLIENT).clientName())
+            .isEqualTo(clientName);
         verify(defaultAsyncHttpClientFactory, never()).buildWithDefaults(any());
     }
 

core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java

@@ -493,6 +493,11 @@ public CompletableFuture<Void> execute(AsyncExecuteRequest request) {
             return delegate.execute(request);
         }
 
+        @Override
+        public String clientName() {
+            return delegate.clientName();
+        }
+
         @Override
         public void close() {
             // Do nothing, this client is managed by the customer.