Address feedback

Author: zoewangg

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/NettyRequestExecutor.java

@@ -297,7 +297,7 @@ private void addWriteTimeoutHandlers() {
                                      new IdleStateHandler(0, context.configuration().writeTimeoutMillis(), 0,
                                                           TimeUnit.MILLISECONDS));
         channel.pipeline().addBefore(httpStreamsName, null,
-                                     new WriteIdleTimeoutHandler());
+                                     new WriteIdleTimeoutHandler(context.configuration().writeTimeoutMillis()));
     }
 
     /**

http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/WriteIdleTimeoutHandler.java

@@ -29,8 +29,13 @@
  */
 @SdkInternalApi
 public final class WriteIdleTimeoutHandler extends ChannelDuplexHandler {
+    private final long timeoutMillis;
     private boolean closed;
 
+    public WriteIdleTimeoutHandler(long timeoutMillis) {
+        this.timeoutMillis = timeoutMillis;
+    }
+
     @Override
     public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
         if (evt instanceof IdleStateEvent) {
@@ -42,21 +47,15 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
         super.userEventTriggered(ctx, evt);
     }
 
-    private void writeTimeout(ChannelHandlerContext ctx) throws Exception {
+    private void writeTimeout(ChannelHandlerContext ctx) {
         if (!closed) {
-            IOException exception = new IOException(
-                errorMessageWithChannelDiagnostics(ctx.channel(), "No data was written to the request body for the configured "
-                                                                  + "write timeout duration. "
-                                                                  + "This can occur if the request body publisher is slow to "
-                                                                  + "produce data, "
-                                                                  + "for example when using AsyncRequestBody.fromInputStream() "
-                                                                  + "with an executor "
-                                                                  + "that has fewer threads than concurrent requests. "
-                                                                  + "If applicable, consider increasing the executor's thread "
-                                                                  + "pool size or "
-                                                                  + "investigating what is preventing the request body from "
-                                                                  + "being written."));
-            ctx.fireExceptionCaught(exception);
+            String message = String.format("No data was written to the request body within %dms. "
+                                           + "This can occur if the request body publisher is not producing data, "
+                                           + "for example when using AsyncRequestBody.fromInputStream() with an "
+                                           + "executor that has fewer threads than concurrent requests. "
+                                           + "Verify that the request body publisher is sending data or "
+                                           + "investigate why it may be blocked.", timeoutMillis);
+            ctx.fireExceptionCaught(new IOException(errorMessageWithChannelDiagnostics(ctx.channel(), message)));
             ctx.close();
             closed = true;
         }

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/fault/WriteIdleTimeoutTest.java

@@ -106,7 +106,7 @@ public void stalledBodyPublisher_shouldTriggerWriteIdleTimeout() throws Interrup
 
         assertThatThrownBy(() -> future.get(5, TimeUnit.SECONDS))
             .hasCauseInstanceOf(IOException.class)
-            .hasStackTraceContaining("No data was written to the request body");
+            .hasStackTraceContaining("No data was written to the request body within 500ms");
     }
 
     private CompletableFuture<Void> sendRequest(SdkHttpFullRequest request, SdkHttpContentPublisher contentPublisher) {

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/HandlerRemovingChannelPoolListenerTest.java

@@ -74,7 +74,7 @@ public void setup() throws Exception {
         pipeline.addLast(new ReadTimeoutHandler(10));
         pipeline.addLast(new WriteTimeoutHandler(10));
         pipeline.addLast(new IdleStateHandler(0, 10, 0));
-        pipeline.addLast(new WriteIdleTimeoutHandler());
+        pipeline.addLast(new WriteIdleTimeoutHandler(10000));
         handler = HandlerRemovingChannelPoolListener.create();
     }
 

http-clients/netty-nio-client/src/test/java/software/amazon/awssdk/http/nio/netty/internal/WriteIdleTimeoutHandlerTest.java

@@ -28,19 +28,19 @@ class WriteIdleTimeoutHandlerTest {
 
     @Test
     void writerIdleEvent_shouldFireExceptionAndCloseChannel() {
-        EmbeddedChannel channel = new EmbeddedChannel(new WriteIdleTimeoutHandler());
+        EmbeddedChannel channel = new EmbeddedChannel(new WriteIdleTimeoutHandler(30000));
 
         channel.pipeline().fireUserEventTriggered(IdleStateEvent.WRITER_IDLE_STATE_EVENT);
 
         assertThat(channel.isOpen()).isFalse();
         assertThatThrownBy(channel::checkException)
             .isInstanceOf(IOException.class)
-            .hasMessageContaining("No data was written to the request body");
+            .hasMessageContaining("No data was written to the request body within 30000ms");
     }
 
     @Test
     void readerIdleEvent_shouldBeIgnored() {
-        EmbeddedChannel channel = new EmbeddedChannel(new WriteIdleTimeoutHandler());
+        EmbeddedChannel channel = new EmbeddedChannel(new WriteIdleTimeoutHandler(30000));
 
         channel.pipeline().fireUserEventTriggered(IdleStateEvent.READER_IDLE_STATE_EVENT);
 
@@ -49,7 +49,7 @@ void readerIdleEvent_shouldBeIgnored() {
 
     @Test
     void duplicateWriterIdleEvent_shouldNotFireTwice() {
-        EmbeddedChannel channel = new EmbeddedChannel(new WriteIdleTimeoutHandler());
+        EmbeddedChannel channel = new EmbeddedChannel(new WriteIdleTimeoutHandler(30000));
 
         channel.pipeline().fireUserEventTriggered(IdleStateEvent.WRITER_IDLE_STATE_EVENT);