Revert "Bjorncs/upgrade netty"

3 files changed, 14 insertions, 23 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java
index 8dcf61911dd..874bf35021b 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java
@@ -1,6 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jdisc.http;
 
+import org.jboss.netty.handler.codec.http.CookieDecoder;
+import org.jboss.netty.handler.codec.http.CookieEncoder;
+import org.jboss.netty.handler.codec.http.DefaultCookie;
+
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -10,7 +14,6 @@ import java.util.concurrent.TimeUnit;
 /**
  * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
  */
-@SuppressWarnings("deprecation")
 public class Cookie {
 
     private final Set<Integer> ports = new HashSet<>();
@@ -237,11 +240,10 @@ public class Cookie {
     }
 
     private static String encodeCookies(Iterable<? extends Cookie> cookies, boolean server) {
-        org.jboss.netty.handler.codec.http.CookieEncoder encoder =
-                new org.jboss.netty.handler.codec.http.CookieEncoder(server);
+        CookieEncoder encoder = new org.jboss.netty.handler.codec.http.CookieEncoder(server);
         for (Cookie cookie : cookies) {
             org.jboss.netty.handler.codec.http.Cookie nettyCookie =
-                    new org.jboss.netty.handler.codec.http.DefaultCookie(String.valueOf(cookie.getName()), String.valueOf(cookie.getValue()));
+                    new DefaultCookie(String.valueOf(cookie.getName()), String.valueOf(cookie.getValue()));
             nettyCookie.setComment(cookie.getComment());
             nettyCookie.setCommentUrl(cookie.getCommentUrl());
             nettyCookie.setDiscard(cookie.isDiscard());
@@ -258,8 +260,7 @@ public class Cookie {
     }
 
     private static List<Cookie> decodeCookies(String str) {
-        org.jboss.netty.handler.codec.http.CookieDecoder decoder =
-                new org.jboss.netty.handler.codec.http.CookieDecoder();
+        CookieDecoder decoder = new CookieDecoder();
         List<Cookie> ret = new LinkedList<>();
         for (org.jboss.netty.handler.codec.http.Cookie nettyCookie : decoder.decode(str)) {
             Cookie cookie = new Cookie();
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
index 6c4759915b2..ff80a8a845d 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
@@ -9,14 +9,12 @@ import com.yahoo.jdisc.handler.RequestHandler;
 import com.yahoo.jdisc.handler.ResponseHandler;
 import com.yahoo.jdisc.http.servlet.ServletOrJdiscHttpRequest;
 import com.yahoo.jdisc.service.CurrentContainer;
-import org.eclipse.jetty.http.HttpURI;
-import org.eclipse.jetty.util.MultiMap;
+import org.jboss.netty.handler.codec.http.QueryStringDecoder;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.net.URI;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -86,7 +84,7 @@ public class HttpRequest extends Request implements ServletOrJdiscHttpRequest {
             this.method = method;
             this.version = version;
             this.remoteAddress = remoteAddress;
-            this.parameters.putAll(getUriQueryParameters(uri));
+            this.parameters.putAll(new QueryStringDecoder(uri.toString(), true).getParameters());
             if (connectedAtMillis != null) {
                 this.connectedAt = connectedAtMillis;
             } else {
@@ -104,7 +102,7 @@ public class HttpRequest extends Request implements ServletOrJdiscHttpRequest {
             this.method = method;
             this.version = version;
             this.remoteAddress = null;
-            this.parameters.putAll(getUriQueryParameters(uri));
+            this.parameters.putAll(new QueryStringDecoder(uri.toString(), true).getParameters());
             this.connectedAt = creationTime(TimeUnit.MILLISECONDS);
         } catch (RuntimeException e) {
             release();
@@ -112,18 +110,6 @@ public class HttpRequest extends Request implements ServletOrJdiscHttpRequest {
         }
     }
 
-    private static Map<String, List<String>> getUriQueryParameters(URI uri) {
-        MultiMap<String> queryParameters = new MultiMap<>();
-        new HttpURI(uri).decodeQueryTo(queryParameters);
-
-        // Do a deep copy so we do not leak Jetty classes outside
-        Map<String, List<String>> deepCopiedQueryParameters = new HashMap<>();
-        for (Map.Entry<String, List<String>> entry : queryParameters.entrySet()) {
-            deepCopiedQueryParameters.put(entry.getKey(), new ArrayList<>(entry.getValue()));
-        }
-        return deepCopiedQueryParameters;
-    }
-
     public Method getMethod() {
         return method;
     }
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
index 837f21519f2..300cf13bfa6 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java
@@ -70,6 +70,7 @@ public class JettyHttpServer extends AbstractServerProvider {
         String NAME_DIMENSION = "serverName";
         String PORT_DIMENSION = "serverPort";
 
+        String NUM_ACTIVE_REQUESTS = "serverNumActiveRequests";
         String NUM_OPEN_CONNECTIONS = "serverNumOpenConnections";
         String NUM_CONNECTIONS_OPEN_MAX = "serverConnectionsOpenMax";
         String CONNECTION_DURATION_MAX = "serverConnectionDurationMax";
@@ -82,6 +83,8 @@ public class JettyHttpServer extends AbstractServerProvider {
         String MANHATTAN_NUM_BYTES_SENT     = "http.out.bytes";
 
         String NUM_CONNECTIONS = "serverNumConnections";
+        String NUM_CONNECTIONS_IDLE = "serverNumConnectionsIdle";
+        String NUM_UNEXPECTED_DISCONNECTS = "serverNumUnexpectedDisconnects";
 
         /* For historical reasons, these are all aliases for the same metric. 'jdisc.http' should ideally be the only one. */
         String JDISC_HTTP_REQUESTS = "jdisc.http.requests";
@@ -93,6 +96,7 @@ public class JettyHttpServer extends AbstractServerProvider {
         String NUM_SUCCESSFUL_WRITES = "serverNumSuccessfulResponseWrites";
         String NUM_FAILED_WRITES = "serverNumFailedResponseWrites";
 
+        String NETWORK_LATENCY = "serverNetworkLatency";
         String TOTAL_SUCCESSFUL_LATENCY = "serverTotalSuccessfulResponseLatency";
         String MANHATTAN_TOTAL_SUCCESSFUL_LATENCY = "http.latency";
         String TOTAL_FAILED_LATENCY = "serverTotalFailedResponseLatency";