feat(core): Adds OperationName to the ExecutionContext class.

Author: chrisradek

.changes/next-release/feature-AWSSDKforJavav2-20b9756.json

@@ -0,0 +1,5 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "type": "feature", 
+    "description": "Adds the operation name of the calling API to the ExecutionContext class. This exposes a way to get the API name from within an ExecutionInterceptor."
+}

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/JsonProtocolSpec.java

@@ -163,13 +163,15 @@ public CodeBlock executionHandler(OperationModel opModel) {
         CodeBlock.Builder codeBlock = CodeBlock
             .builder()
             .add("\n\nreturn clientHandler.execute(new $T<$T, $T>()\n" +
+                 ".withOperationName(\"$N\")\n" +
                  ".withResponseHandler($N)\n" +
                  ".withErrorResponseHandler($N)\n" +
                  hostPrefixExpression(opModel) +
                  ".withInput($L)\n",
                  ClientExecutionParams.class,
                  requestType,
                  responseType,
+                 opModel.getOperationName(),
                  "responseHandler",
                  "errorResponseHandler",
                  opModel.getInput().getVariableName());
@@ -228,6 +230,7 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
         String protocolFactory = protocolFactoryLiteral(opModel);
         String customerResponseHandler = opModel.hasEventStreamOutput() ? "asyncResponseHandler" : "asyncResponseTransformer";
         builder.add("\n\n$L clientHandler.execute(new $T<$T, $T>()\n" +
+                    ".withOperationName(\"$N\")\n" +
                     ".withMarshaller(new $T($L))\n" +
                     "$L" +
                     "$L" +
@@ -242,6 +245,7 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
                     ClientExecutionParams.class,
                     requestType,
                     opModel.hasEventStreamOutput() && !isRestJson ? SdkResponse.class : pojoResponseType,
+                    opModel.getOperationName(),
                     marshaller,
                     protocolFactory,
                     opModel.hasEventStreamInput() ? CodeBlock.builder()

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/QueryProtocolSpec.java

@@ -96,13 +96,15 @@ public CodeBlock executionHandler(OperationModel opModel) {
         CodeBlock.Builder codeBlock = CodeBlock
             .builder()
             .add("\n\nreturn clientHandler.execute(new $T<$T, $T>()" +
+                 ".withOperationName(\"$N\")\n" +
                  ".withResponseHandler($N)" +
                  ".withErrorResponseHandler($N)" +
                  hostPrefixExpression(opModel) +
                  ".withInput($L)",
                  ClientExecutionParams.class,
                  requestType,
                  responseType,
+                 opModel.getOperationName(),
                  "responseHandler",
                  "errorResponseHandler",
                  opModel.getInput().getVariableName());
@@ -126,6 +128,7 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
         String asyncRequestBody = opModel.hasStreamingInput() ? ".withAsyncRequestBody(requestBody)"
                                                               : "";
         return CodeBlock.builder().add("\n\nreturn clientHandler.execute(new $T<$T, $T>()\n" +
+                                       ".withOperationName(\"$N\")\n" +
                                        ".withMarshaller(new $T(protocolFactory))" +
                                        ".withResponseHandler(responseHandler)" +
                                        ".withErrorResponseHandler($N)\n" +
@@ -135,6 +138,7 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
                                        ClientExecutionParams.class,
                                        requestType,
                                        pojoResponseType,
+                                       opModel.getOperationName(),
                                        marshaller,
                                        "errorResponseHandler",
                                        opModel.getInput().getVariableName(),

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-async-client-class.java

@@ -159,6 +159,7 @@ public CompletableFuture<APostOperationResponse> aPostOperation(APostOperationRe
                                                                                                        operationMetadata);
 
             return clientHandler.execute(new ClientExecutionParams<APostOperationRequest, APostOperationResponse>()
+                                             .withOperationName("APostOperation")
                                              .withMarshaller(new APostOperationRequestMarshaller(protocolFactory)).withResponseHandler(responseHandler)
                                              .withErrorResponseHandler(errorResponseHandler).hostPrefixExpression(resolvedHostExpression)
                                              .withInput(aPostOperationRequest));
@@ -205,6 +206,7 @@ public CompletableFuture<APostOperationWithOutputResponse> aPostOperationWithOut
 
             return clientHandler
                 .execute(new ClientExecutionParams<APostOperationWithOutputRequest, APostOperationWithOutputResponse>()
+                             .withOperationName("APostOperationWithOutput")
                              .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory))
                              .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                              .withInput(aPostOperationWithOutputRequest));
@@ -272,6 +274,7 @@ public CompletableFuture<Void> eventStreamOperation(EventStreamOperationRequest
 
             clientHandler.execute(
                 new ClientExecutionParams<EventStreamOperationRequest, EventStreamOperationResponse>()
+                    .withOperationName("EventStreamOperation")
                     .withMarshaller(new EventStreamOperationRequestMarshaller(protocolFactory))
                     .withAsyncRequestBody(software.amazon.awssdk.core.async.AsyncRequestBody.fromPublisher(adapted))
                     .withFullDuplex(true).withResponseHandler(responseHandler)
@@ -337,6 +340,7 @@ public CompletableFuture<EventStreamOperationWithOnlyInputResponse> eventStreamO
 
             return clientHandler
                 .execute(new ClientExecutionParams<EventStreamOperationWithOnlyInputRequest, EventStreamOperationWithOnlyInputResponse>()
+                             .withOperationName("EventStreamOperationWithOnlyInput")
                              .withMarshaller(new EventStreamOperationWithOnlyInputRequestMarshaller(protocolFactory))
                              .withAsyncRequestBody(software.amazon.awssdk.core.async.AsyncRequestBody.fromPublisher(adapted))
                              .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
@@ -384,6 +388,7 @@ public CompletableFuture<GetWithoutRequiredMembersResponse> getWithoutRequiredMe
 
             return clientHandler
                 .execute(new ClientExecutionParams<GetWithoutRequiredMembersRequest, GetWithoutRequiredMembersResponse>()
+                             .withOperationName("GetWithoutRequiredMembers")
                              .withMarshaller(new GetWithoutRequiredMembersRequestMarshaller(protocolFactory))
                              .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                              .withInput(getWithoutRequiredMembersRequest));
@@ -427,6 +432,7 @@ public CompletableFuture<PaginatedOperationWithResultKeyResponse> paginatedOpera
 
             return clientHandler
                 .execute(new ClientExecutionParams<PaginatedOperationWithResultKeyRequest, PaginatedOperationWithResultKeyResponse>()
+                             .withOperationName("PaginatedOperationWithResultKey")
                              .withMarshaller(new PaginatedOperationWithResultKeyRequestMarshaller(protocolFactory))
                              .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                              .withInput(paginatedOperationWithResultKeyRequest));
@@ -543,6 +549,7 @@ public CompletableFuture<PaginatedOperationWithoutResultKeyResponse> paginatedOp
 
             return clientHandler
                 .execute(new ClientExecutionParams<PaginatedOperationWithoutResultKeyRequest, PaginatedOperationWithoutResultKeyResponse>()
+                             .withOperationName("PaginatedOperationWithoutResultKey")
                              .withMarshaller(new PaginatedOperationWithoutResultKeyRequestMarshaller(protocolFactory))
                              .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                              .withInput(paginatedOperationWithoutResultKeyRequest));
@@ -664,6 +671,7 @@ public CompletableFuture<StreamingInputOperationResponse> streamingInputOperatio
 
             return clientHandler
                 .execute(new ClientExecutionParams<StreamingInputOperationRequest, StreamingInputOperationResponse>()
+                             .withOperationName("StreamingInputOperation")
                              .withMarshaller(new StreamingInputOperationRequestMarshaller(protocolFactory))
                              .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                              .withAsyncRequestBody(requestBody).withInput(streamingInputOperationRequest));
@@ -719,6 +727,7 @@ public <ReturnT> CompletableFuture<ReturnT> streamingInputOutputOperation(
 
             return clientHandler.execute(
                 new ClientExecutionParams<StreamingInputOutputOperationRequest, StreamingInputOutputOperationResponse>()
+                    .withOperationName("StreamingInputOutputOperation")
                     .withMarshaller(new StreamingInputOutputOperationRequestMarshaller(protocolFactory))
                     .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                     .withAsyncRequestBody(requestBody).withInput(streamingInputOutputOperationRequest),
@@ -774,6 +783,7 @@ public <ReturnT> CompletableFuture<ReturnT> streamingOutputOperation(
 
             return clientHandler.execute(
                 new ClientExecutionParams<StreamingOutputOperationRequest, StreamingOutputOperationResponse>()
+                    .withOperationName("StreamingOutputOperation")
                     .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory))
                     .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                     .withInput(streamingOutputOperationRequest), asyncResponseTransformer).whenComplete((r, e) -> {

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-json-client-class.java

@@ -115,6 +115,7 @@ public APostOperationResponse aPostOperation(APostOperationRequest aPostOperatio
                                                                                                    operationMetadata);
 
         return clientHandler.execute(new ClientExecutionParams<APostOperationRequest, APostOperationResponse>()
+                                         .withOperationName("APostOperation")
                                          .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                                          .hostPrefixExpression(resolvedHostExpression).withInput(aPostOperationRequest)
                                          .withMarshaller(new APostOperationRequestMarshaller(protocolFactory)));
@@ -155,6 +156,7 @@ public APostOperationWithOutputResponse aPostOperationWithOutput(
 
         return clientHandler
             .execute(new ClientExecutionParams<APostOperationWithOutputRequest, APostOperationWithOutputResponse>()
+                         .withOperationName("APostOperationWithOutput")
                          .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                          .withInput(aPostOperationWithOutputRequest)
                          .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory)));
@@ -195,6 +197,7 @@ public GetWithoutRequiredMembersResponse getWithoutRequiredMembers(
 
         return clientHandler
             .execute(new ClientExecutionParams<GetWithoutRequiredMembersRequest, GetWithoutRequiredMembersResponse>()
+                         .withOperationName("GetWithoutRequiredMembers")
                          .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                          .withInput(getWithoutRequiredMembersRequest)
                          .withMarshaller(new GetWithoutRequiredMembersRequestMarshaller(protocolFactory)));
@@ -231,6 +234,7 @@ public PaginatedOperationWithResultKeyResponse paginatedOperationWithResultKey(
 
         return clientHandler
             .execute(new ClientExecutionParams<PaginatedOperationWithResultKeyRequest, PaginatedOperationWithResultKeyResponse>()
+                         .withOperationName("PaginatedOperationWithResultKey")
                          .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                          .withInput(paginatedOperationWithResultKeyRequest)
                          .withMarshaller(new PaginatedOperationWithResultKeyRequestMarshaller(protocolFactory)));
@@ -341,6 +345,7 @@ public PaginatedOperationWithoutResultKeyResponse paginatedOperationWithoutResul
 
         return clientHandler
             .execute(new ClientExecutionParams<PaginatedOperationWithoutResultKeyRequest, PaginatedOperationWithoutResultKeyResponse>()
+                         .withOperationName("PaginatedOperationWithoutResultKey")
                          .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                          .withInput(paginatedOperationWithoutResultKeyRequest)
                          .withMarshaller(new PaginatedOperationWithoutResultKeyRequestMarshaller(protocolFactory)));
@@ -461,6 +466,7 @@ public StreamingInputOperationResponse streamingInputOperation(StreamingInputOpe
                                                                                                    operationMetadata);
 
         return clientHandler.execute(new ClientExecutionParams<StreamingInputOperationRequest, StreamingInputOperationResponse>()
+                                         .withOperationName("StreamingInputOperation")
                                          .withResponseHandler(responseHandler)
                                          .withErrorResponseHandler(errorResponseHandler)
                                          .withInput(streamingInputOperationRequest)
@@ -522,6 +528,7 @@ public <ReturnT> ReturnT streamingInputOutputOperation(
 
         return clientHandler.execute(
             new ClientExecutionParams<StreamingInputOutputOperationRequest, StreamingInputOutputOperationResponse>()
+                .withOperationName("StreamingInputOutputOperation")
                 .withResponseHandler(responseHandler)
                 .withErrorResponseHandler(errorResponseHandler)
                 .withInput(streamingInputOutputOperationRequest)
@@ -570,6 +577,7 @@ public <ReturnT> ReturnT streamingOutputOperation(StreamingOutputOperationReques
 
         return clientHandler.execute(
             new ClientExecutionParams<StreamingOutputOperationRequest, StreamingOutputOperationResponse>()
+                .withOperationName("StreamingOutputOperation")
                 .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                 .withInput(streamingOutputOperationRequest)
                 .withMarshaller(new StreamingOutputOperationRequestMarshaller(protocolFactory)), responseTransformer);

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java

@@ -77,6 +77,7 @@ public APostOperationResponse aPostOperation(APostOperationRequest aPostOperatio
         HttpResponseHandler<AwsServiceException> errorResponseHandler = protocolFactory.createErrorResponseHandler();
 
         return clientHandler.execute(new ClientExecutionParams<APostOperationRequest, APostOperationResponse>()
+                                         .withOperationName("APostOperation")
                                          .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                                          .hostPrefixExpression(resolvedHostExpression).withInput(aPostOperationRequest)
                                          .withMarshaller(new APostOperationRequestMarshaller(protocolFactory)));
@@ -114,6 +115,7 @@ public APostOperationWithOutputResponse aPostOperationWithOutput(
 
         return clientHandler
             .execute(new ClientExecutionParams<APostOperationWithOutputRequest, APostOperationWithOutputResponse>()
+                         .withOperationName("APostOperationWithOutput")
                          .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
                          .withInput(aPostOperationWithOutputRequest)
                          .withMarshaller(new APostOperationWithOutputRequestMarshaller(protocolFactory)));

core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/handler/AwsClientHandlerUtils.java

@@ -80,7 +80,8 @@ public static <InputT extends SdkRequest, OutputT extends SdkResponse> Execution
             .putAttribute(AwsSignerExecutionAttribute.SIGNING_REGION, clientConfig.option(AwsClientOption.SIGNING_REGION))
             .putAttribute(SdkInternalExecutionAttribute.IS_FULL_DUPLEX, executionParams.isFullDuplex())
             .putAttribute(SdkExecutionAttribute.CLIENT_TYPE, clientConfig.option(SdkClientOption.CLIENT_TYPE))
-            .putAttribute(SdkExecutionAttribute.SERVICE_NAME, clientConfig.option(SdkClientOption.SERVICE_NAME));
+            .putAttribute(SdkExecutionAttribute.SERVICE_NAME, clientConfig.option(SdkClientOption.SERVICE_NAME))
+            .putAttribute(SdkExecutionAttribute.OPERATION_NAME, executionParams.getOperationName());
 
         ExecutionInterceptorChain executionInterceptorChain =
                 new ExecutionInterceptorChain(clientConfig.option(SdkClientOption.EXECUTION_INTERCEPTORS));

core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/ClientExecutionParams.java

@@ -42,6 +42,7 @@ public final class ClientExecutionParams<InputT extends SdkRequest, OutputT> {
     private HttpResponseHandler<? extends SdkException> errorResponseHandler;
     private boolean fullDuplex;
     private String hostPrefixExpression;
+    private String operationName;
 
     public Marshaller<InputT> getMarshaller() {
         return marshaller;
@@ -111,6 +112,18 @@ public ClientExecutionParams<InputT, OutputT> withFullDuplex(boolean fullDuplex)
         return this;
     }
 
+    public String getOperationName() {
+        return operationName;
+    }
+
+    /**
+     * Sets the operation name of the API.
+     */
+    public ClientExecutionParams<InputT, OutputT> withOperationName(String operationName) {
+        this.operationName = operationName;
+        return this;
+    }
+
     public String hostPrefixExpression() {
         return hostPrefixExpression;
     }

core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/SdkExecutionAttribute.java

@@ -43,6 +43,8 @@ public class SdkExecutionAttribute {
     public static final ExecutionAttribute<Integer> TIME_OFFSET = new ExecutionAttribute<>("TimeOffset");
 
     public static final ExecutionAttribute<ClientType> CLIENT_TYPE = new ExecutionAttribute<>("ClientType");
+
+    public static final ExecutionAttribute<String> OPERATION_NAME = new ExecutionAttribute<>("OperationName");
 
     protected SdkExecutionAttribute() {
     }