Bump CRT version to 0.29.25 and pass operation name to CRT in CRT based S3 client as it will be changed to required soon (#5325)

Author: zoewangg

pom.xml

@@ -121,7 +121,7 @@
         <rxjava.version>2.2.21</rxjava.version>
         <commons-codec.verion>1.15</commons-codec.verion>
         <jmh.version>1.37</jmh.version>
-        <awscrt.version>0.29.23</awscrt.version>
+        <awscrt.version>0.29.25</awscrt.version>
 
         <!--Test dependencies -->
         <junit5.version>5.10.0</junit5.version>

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtAsyncHttpClient.java

@@ -137,7 +137,8 @@ public CompletableFuture<Void> execute(AsyncExecuteRequest asyncRequest) {
                                             httpExecutionAttributes.getAttribute(CRT_PROGRESS_LISTENER),
                                             s3MetaRequestFuture);
 
-        S3MetaRequestOptions.MetaRequestType requestType = requestType(asyncRequest);
+        String operationName = asyncRequest.httpExecutionAttributes().getAttribute(OPERATION_NAME);
+        S3MetaRequestOptions.MetaRequestType requestType = requestType(operationName);
 
         HttpChecksum httpChecksum = httpExecutionAttributes.getAttribute(HTTP_CHECKSUM);
         ResumeToken resumeToken = httpExecutionAttributes.getAttribute(CRT_PAUSE_RESUME_TOKEN);
@@ -156,6 +157,7 @@ public CompletableFuture<Void> execute(AsyncExecuteRequest asyncRequest) {
             .withEndpoint(endpoint)
             .withResponseHandler(responseHandler)
             .withResumeToken(resumeToken)
+            .withOperationName(operationName)
             .withRequestFilePath(requestFilePath)
             .withSigningConfig(signingConfig);
 
@@ -202,8 +204,7 @@ public String clientName() {
         return "s3crt";
     }
 
-    private static S3MetaRequestOptions.MetaRequestType requestType(AsyncExecuteRequest asyncRequest) {
-        String operationName = asyncRequest.httpExecutionAttributes().getAttribute(OPERATION_NAME);
+    private static S3MetaRequestOptions.MetaRequestType requestType(String operationName) {
         if (operationName != null) {
             switch (operationName) {
                 case "GetObject":

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtAsyncHttpClientTest.java

@@ -131,6 +131,7 @@ public void getObject_shouldSetMetaRequestTypeCorrectly() {
 
         S3MetaRequestOptions actual = makeRequest(asyncExecuteRequest);
         assertThat(actual.getMetaRequestType()).isEqualTo(S3MetaRequestOptions.MetaRequestType.GET_OBJECT);
+        assertThat(actual.getOperationName()).isEqualTo("GetObject");
     }
 
     @Test
@@ -140,8 +141,20 @@ public void putObject_shouldSetMetaRequestTypeCorrectly() {
 
         S3MetaRequestOptions actual = makeRequest(asyncExecuteRequest);
         assertThat(actual.getMetaRequestType()).isEqualTo(S3MetaRequestOptions.MetaRequestType.PUT_OBJECT);
+        assertThat(actual.getOperationName()).isEqualTo("PutObject");
     }
 
+    @Test
+    public void NonStreamingOperation_shouldSetMetaRequestTypeCorrectly() {
+        AsyncExecuteRequest asyncExecuteRequest = getExecuteRequestBuilder().putHttpExecutionAttribute(OPERATION_NAME,
+                                                                                                       "CreateBucket").build();
+
+        S3MetaRequestOptions actual = makeRequest(asyncExecuteRequest);
+        assertThat(actual.getMetaRequestType()).isEqualTo(S3MetaRequestOptions.MetaRequestType.DEFAULT);
+        assertThat(actual.getOperationName()).isEqualTo("CreateBucket");
+    }
+
+
     @Test
     public void cancelRequest_shouldForwardCancellation() {
         AsyncExecuteRequest asyncExecuteRequest = getExecuteRequestBuilder().build();