Use timestamp from Jetty as creation time for Request/HttpRequest

5 files changed, 18 insertions, 16 deletions

diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index f9b146bc669..236586a4132 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -1683,7 +1683,7 @@
       "public"
     ],
     "methods" : [
-      "protected void <init>(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version, java.net.SocketAddress, java.lang.Long)",
+      "protected void <init>(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version, java.net.SocketAddress, java.lang.Long, long)",
       "public com.yahoo.jdisc.http.HttpRequest$Method getMethod()",
       "public void setMethod(com.yahoo.jdisc.http.HttpRequest$Method)",
       "public com.yahoo.jdisc.http.HttpRequest$Version getVersion()",
@@ -1713,7 +1713,7 @@
       "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method)",
       "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version)",
       "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version, java.net.SocketAddress)",
-      "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version, java.net.SocketAddress, long)",
+      "public static com.yahoo.jdisc.http.HttpRequest newServerRequest(com.yahoo.jdisc.service.CurrentContainer, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version, java.net.SocketAddress, long, long)",
       "public static com.yahoo.jdisc.http.HttpRequest newClientRequest(com.yahoo.jdisc.Request, java.net.URI)",
       "public static com.yahoo.jdisc.http.HttpRequest newClientRequest(com.yahoo.jdisc.Request, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method)",
       "public static com.yahoo.jdisc.http.HttpRequest newClientRequest(com.yahoo.jdisc.Request, java.net.URI, com.yahoo.jdisc.http.HttpRequest$Method, com.yahoo.jdisc.http.HttpRequest$Version)"
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java b/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
index 4ad38a9f965..877140a94d7 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/HttpRequest.java
@@ -81,9 +81,9 @@ public class HttpRequest extends Request {
     private Long connectionTimeout;
 
     protected HttpRequest(CurrentContainer container, URI uri, Method method, Version version,
-                          SocketAddress remoteAddress, Long connectedAtMillis)
+                          SocketAddress remoteAddress, Long connectedAtMillis, long creationTime)
     {
-        super(container, uri);
+        super(container, uri, true, creationTime);
         try {
             this.method = method;
             this.version = version;
@@ -313,13 +313,13 @@ public class HttpRequest extends Request {
 
     public static HttpRequest newServerRequest(CurrentContainer container, URI uri, Method method, Version version,
                                                SocketAddress remoteAddress) {
-        return new HttpRequest(container, uri, method, version, remoteAddress, null);
+        return new HttpRequest(container, uri, method, version, remoteAddress, null, -1);
     }
 
     public static HttpRequest newServerRequest(CurrentContainer container, URI uri, Method method, Version version,
-                                               SocketAddress remoteAddress, long connectedAtMillis)
+                                               SocketAddress remoteAddress, long connectedAtMillis, long creationTime)
     {
-        return new HttpRequest(container, uri, method, version, remoteAddress, connectedAtMillis);
+        return new HttpRequest(container, uri, method, version, remoteAddress, connectedAtMillis, creationTime);
     }
 
     public static HttpRequest newClientRequest(Request parent, URI uri) {
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/filter/util/FilterTestUtils.java b/container-core/src/main/java/com/yahoo/jdisc/http/filter/util/FilterTestUtils.java
index 147c13c8e3a..f3ad631f136 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/filter/util/FilterTestUtils.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/filter/util/FilterTestUtils.java
@@ -76,7 +76,7 @@ public class FilterTestUtils {
 
         public DiscFilterRequest build() {
             var httpReq = HttpRequest.newServerRequest(
-                    new DummyContainer(clock), uri, method, version, remoteAddress, clock.millis());
+                    new DummyContainer(clock), uri, method, version, remoteAddress, clock.millis(), clock.millis());
             var filterReq = new DiscFilterRequest(httpReq);
             filterReq.setUserPrincipal(principal);
             attributes.forEach(filterReq::setAttribute);
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java
index 1aa12808f71..8c8109fa518 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestFactory.java
@@ -26,19 +26,21 @@ class HttpRequestFactory {
 
     public static HttpRequest newJDiscRequest(CurrentContainer container, HttpServletRequest servletRequest) {
         try {
-            HttpRequest httpRequest = HttpRequest.newServerRequest(
+            var jettyRequest = (Request) servletRequest;
+            var jdiscHttpReq = HttpRequest.newServerRequest(
                     container,
                     getUri(servletRequest),
                     getMethod(servletRequest),
                     HttpRequest.Version.fromString(servletRequest.getProtocol()),
                     new InetSocketAddress(servletRequest.getRemoteAddr(), servletRequest.getRemotePort()),
-                    getConnection((Request) servletRequest).getCreatedTimeStamp());
-            httpRequest.context().put(RequestUtils.JDISC_REQUEST_X509CERT, getCertChain(servletRequest));
-            httpRequest.context().put(RequestUtils.JDICS_REQUEST_PORT, servletRequest.getLocalPort());
+                    getConnection(jettyRequest).getCreatedTimeStamp(),
+                    jettyRequest.getTimeStamp());
+            jdiscHttpReq.context().put(RequestUtils.JDISC_REQUEST_X509CERT, getCertChain(servletRequest));
+            jdiscHttpReq.context().put(RequestUtils.JDICS_REQUEST_PORT, servletRequest.getLocalPort());
             SSLSession sslSession = (SSLSession) servletRequest.getAttribute(RequestUtils.JETTY_REQUEST_SSLSESSION);
-            httpRequest.context().put(RequestUtils.JDISC_REQUEST_SSLSESSION, sslSession);
-            servletRequest.setAttribute(HttpRequest.class.getName(), httpRequest);
-            return httpRequest;
+            jdiscHttpReq.context().put(RequestUtils.JDISC_REQUEST_SSLSESSION, sslSession);
+            servletRequest.setAttribute(HttpRequest.class.getName(), jdiscHttpReq);
+            return jdiscHttpReq;
         } catch (Utf8Appendable.NotUtf8Exception e) {
             throw createBadQueryException(e);
         }
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java b/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
index 30e58f6d2f5..16ee274d8e0 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java
@@ -74,7 +74,7 @@ public class HttpRequestTestCase {
         URI uri = URI.create("http://localhost/path?foo=bar&foo=baz&cox=69");
         InetSocketAddress address = new InetSocketAddress("remotehost", 69);
         final HttpRequest request = HttpRequest.newServerRequest(mockContainer(), uri, HttpRequest.Method.GET,
-                HttpRequest.Version.HTTP_1_1, address, 1L);
+                HttpRequest.Version.HTTP_1_1, address, 1L, 1);
         assertEquals(uri, request.getUri());
 
         assertEquals(HttpRequest.Method.GET, request.getMethod());