Revert "Merge pull request #1909 from Netflix/add_http_request_header_read_timeout_handler"

This reverts commit 2d84112, reversing
changes made to fc25765.

Author: connorworley

zuul-core/src/main/java/com/netflix/zuul/netty/server/BaseServerStartup.java

@@ -166,8 +166,6 @@ protected void addChannelDependencies(
 
         channelDeps.set(ZuulDependencyKeys.sessionCtxDecorator, sessionCtxDecorator);
         channelDeps.set(ZuulDependencyKeys.requestCompleteHandler, reqCompleteHandler);
-        final Counter httpRequestHeadersReadTimeoutCounter = registry.counter("server.http.request.headers.read.timeout");
-        channelDeps.set(ZuulDependencyKeys.httpRequestHeadersReadTimeoutCounter, httpRequestHeadersReadTimeoutCounter);
         final Counter httpRequestReadTimeoutCounter = registry.counter("server.http.request.read.timeout");
         channelDeps.set(ZuulDependencyKeys.httpRequestReadTimeoutCounter, httpRequestReadTimeoutCounter);
         channelDeps.set(ZuulDependencyKeys.filterLoader, filterLoader);
@@ -191,8 +189,6 @@ protected void addChannelDependencies(
 
         channelDeps.set(ZuulDependencyKeys.sessionCtxDecorator, sessionCtxDecorator);
         channelDeps.set(ZuulDependencyKeys.requestCompleteHandler, reqCompleteHandler);
-        final Counter httpRequestHeadersReadTimeoutCounter = registry.counter("server.http.request.headers.read.timeout");
-        channelDeps.set(ZuulDependencyKeys.httpRequestHeadersReadTimeoutCounter, httpRequestHeadersReadTimeoutCounter);
         final Counter httpRequestReadTimeoutCounter = registry.counter("server.http.request.read.timeout");
         channelDeps.set(ZuulDependencyKeys.httpRequestReadTimeoutCounter, httpRequestReadTimeoutCounter);
         channelDeps.set(ZuulDependencyKeys.filterLoader, filterLoader);

zuul-core/src/main/java/com/netflix/zuul/netty/server/BaseZuulChannelInitializer.java

@@ -17,7 +17,6 @@
 package com.netflix.zuul.netty.server;
 
 import com.google.common.base.Preconditions;
-import com.netflix.config.CachedDynamicBooleanProperty;
 import com.netflix.config.CachedDynamicIntProperty;
 import com.netflix.netty.common.CloseOnIdleStateHandler;
 import com.netflix.netty.common.Http1ConnectionCloseHandler;
@@ -57,7 +56,6 @@
 import com.netflix.zuul.netty.insights.PassportStateHttpServerHandler;
 import com.netflix.zuul.netty.insights.ServerStateHandler;
 import com.netflix.zuul.netty.server.ssl.SslHandshakeInfoHandler;
-import com.netflix.zuul.netty.timeouts.HttpHeadersTimeoutHandler;
 import com.netflix.zuul.passport.PassportState;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
@@ -90,12 +88,6 @@ public abstract class BaseZuulChannelInitializer extends ChannelInitializer<Chan
     public static final CachedDynamicIntProperty MAX_CHUNK_SIZE =
             new CachedDynamicIntProperty("server.http.decoder.maxChunkSize", 32768);
 
-    public static final CachedDynamicBooleanProperty HTTP_REQUEST_HEADERS_READ_TIMEOUT_ENABLED =
-            new CachedDynamicBooleanProperty("server.http.request.headers.read.timeout.enabled", false);
-
-    public static final CachedDynamicIntProperty HTTP_REQUEST_HEADERS_READ_TIMEOUT =
-            new CachedDynamicIntProperty("server.http.request.headers.read.timeout", 10000);
-
     /**
      * The port that the server intends to listen on.  Subclasses should NOT use this field, as it may not be set, and
      * may differ from the actual listening port.  For example:
@@ -137,7 +129,6 @@ public abstract class BaseZuulChannelInitializer extends ChannelInitializer<Chan
     // protected final RequestRejectedChannelHandler requestRejectedChannelHandler;
     protected final SessionContextDecorator sessionContextDecorator;
     protected final RequestCompleteHandler requestCompleteHandler;
-    protected final Counter httpRequestHeadersReadTimeoutCounter;
     protected final Counter httpRequestReadTimeoutCounter;
     protected final FilterLoader filterLoader;
     protected final FilterUsageNotifier filterUsageNotifier;
@@ -215,7 +206,6 @@ private BaseZuulChannelInitializer(
 
         this.sessionContextDecorator = channelDependencies.get(ZuulDependencyKeys.sessionCtxDecorator);
         this.requestCompleteHandler = channelDependencies.get(ZuulDependencyKeys.requestCompleteHandler);
-        this.httpRequestHeadersReadTimeoutCounter = channelDependencies.get(ZuulDependencyKeys.httpRequestHeadersReadTimeoutCounter);
         this.httpRequestReadTimeoutCounter = channelDependencies.get(ZuulDependencyKeys.httpRequestReadTimeoutCounter);
 
         this.filterLoader = channelDependencies.get(ZuulDependencyKeys.filterLoader);
@@ -261,11 +251,6 @@ protected HttpServerCodec createHttpServerCodec() {
     }
 
     protected void addHttpRelatedHandlers(ChannelPipeline pipeline) {
-        pipeline.addLast(new HttpHeadersTimeoutHandler.InboundHandler(
-            HTTP_REQUEST_HEADERS_READ_TIMEOUT_ENABLED::get,
-            HTTP_REQUEST_HEADERS_READ_TIMEOUT::get,
-            httpRequestHeadersReadTimeoutCounter
-        ));
         pipeline.addLast(new PassportStateHttpServerHandler.InboundHandler());
         pipeline.addLast(new PassportStateHttpServerHandler.OutboundHandler());
         if (httpRequestReadTimeout > -1) {

zuul-core/src/main/java/com/netflix/zuul/netty/server/ZuulDependencyKeys.java

@@ -48,8 +48,6 @@ public class ZuulDependencyKeys {
             new ChannelConfigKey<>("sessionCtxDecorator");
     public static final ChannelConfigKey<RequestCompleteHandler> requestCompleteHandler =
             new ChannelConfigKey<>("requestCompleteHandler");
-    public static final ChannelConfigKey<Counter> httpRequestHeadersReadTimeoutCounter =
-            new ChannelConfigKey<>("httpRequestHeadersReadTimeoutCounter");
     public static final ChannelConfigKey<Counter> httpRequestReadTimeoutCounter =
             new ChannelConfigKey<>("httpRequestReadTimeoutCounter");
     public static final ChannelConfigKey<FilterLoader> filterLoader = new ChannelConfigKey<>("filterLoader");

zuul-core/src/main/java/com/netflix/zuul/netty/timeouts/HttpHeadersTimeoutHandler.java

@@ -52,7 +52,6 @@
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.ServerSocket;
-import java.net.Socket;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -142,10 +141,6 @@ static void afterAll() {
 
     @BeforeEach
     void beforeEachTest() {
-        AbstractConfiguration config = ConfigurationManager.getConfigInstance();
-        config.setProperty("server.http.request.headers.read.timeout.enabled", false);
-        config.setProperty("server.http.request.headers.read.timeout", 10000);
-
         this.pathSegment = randomPathSegment();
         this.wmRuntimeInfo = wireMockExtension.getRuntimeInfo();
         this.wireMock = wireMockExtension.getRuntimeInfo().getWireMock();
@@ -271,63 +266,6 @@ void httpGetFailsDueToOriginReadTimeout(
         verifyResponseHeaders(response);
     }
 
-    @ParameterizedTest
-    @MethodSource("arguments")
-    void httpGetHappyPathWithHeadersReadTimeout(
-            final String description,
-            final OkHttpClient okHttp,
-            final boolean requestBodyBuffering,
-            final boolean responseBodyBuffering)
-            throws Exception {
-        AbstractConfiguration config = ConfigurationManager.getConfigInstance();
-        config.setProperty("server.http.request.headers.read.timeout.enabled", true);
-
-        wireMock.register(get(anyUrl()).willReturn(ok().withBody("hello world")));
-
-        Request request = setupRequestBuilder(requestBodyBuffering, responseBodyBuffering)
-                .get()
-                .build();
-        Response response = okHttp.newCall(request).execute();
-        assertThat(response.code()).isEqualTo(200);
-        assertThat(response.body().string()).isEqualTo("hello world");
-        verifyResponseHeaders(response);
-    }
-
-    @ParameterizedTest
-    @MethodSource("arguments")
-    void httpPostHappyPathWithHeadersReadTimeout(
-            final String description,
-            final OkHttpClient okHttp,
-            final boolean requestBodyBuffering,
-            final boolean responseBodyBuffering)
-            throws Exception {
-        AbstractConfiguration config = ConfigurationManager.getConfigInstance();
-        config.setProperty("server.http.request.headers.read.timeout.enabled", true);
-
-        wireMock.register(post(anyUrl()).willReturn(ok().withBody("Thank you next")));
-
-        Request request = setupRequestBuilder(requestBodyBuffering, responseBodyBuffering)
-                .post(RequestBody.create("Simple POST request body".getBytes(StandardCharsets.UTF_8)))
-                .build();
-        Response response = okHttp.newCall(request).execute();
-        assertThat(response.code()).isEqualTo(200);
-        assertThat(response.body().string()).isEqualTo("Thank you next");
-        verifyResponseHeaders(response);
-    }
-
-    @Test
-    void httpGetFailsDueToHeadersReadTimeout() throws Exception {
-        AbstractConfiguration config = ConfigurationManager.getConfigInstance();
-        config.setProperty("server.http.request.headers.read.timeout.enabled", true);
-        config.setProperty("server.http.request.headers.read.timeout", 100);
-
-        Socket slowClient = new Socket("localhost", ZUUL_SERVER_PORT);
-        Thread.sleep(500);
-        // end of stream reached because zuul closed the connection
-        assertThat(slowClient.getInputStream().read()).isEqualTo(-1);
-        slowClient.close();
-    }
-
     @ParameterizedTest
     @MethodSource("arguments")
     void httpGetFailsDueToMalformedResponseChunk(