Issue #4954 - ByteCount API

+ More updates from quick review of concept with simone Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Jun 9, 2020 · da18068 · da18068
1 parent dd3813a
commit da18068
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ByteCountEvent.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ByteCountEvent.java
@@ -31,7 +31,8 @@ public interface ByteCountEvent
     Throwable getResponseFailure();
 
     // TODO: do we care about upgraded connections?
-    // TODO: what about HTTP/2 ?
+    // TODO: what about the TLS bytes? (SSLConnection bytesIn / bytesOut?)
+    // TODO: what about HTTP/2 ?  (what about non-stream frames? settings, window-updates, reset, etc)
 
     interface HttpByteCount
     {

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ByteCountEventAdaptor.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ByteCountEventAdaptor.java
@@ -117,6 +117,11 @@ void onBodyEnd(long connectionCount, long byteCountAPI)
             this.trailerStart = connectionCount;
         }
 
+        public void onTrailerStart(long connectionCount)
+        {
+            this.trailerStart = connectionCount;
+        }
+
         void onTrailerEnd(long connectionCount)
         {
             this.trailerEnd = connectionCount;

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ByteCounterChannelListener.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ByteCounterChannelListener.java
@@ -60,6 +60,7 @@ public void onRequestEnd(Request request)
             HttpInput httpInput = request.getHttpInput();
             long byteCountRequestAPI = httpInput.getContentConsumed();
             byteCountEventAdaptor.getRequestCount().onBodyEnd(connection.getBytesIn(), byteCountRequestAPI);
+            byteCountEventAdaptor.getRequestCount().onTrailerStart(connection.getBytesIn());
         }
     }
 
@@ -85,6 +86,8 @@ public void onRequestFailure(Request request, Throwable failure)
         }
     }
 
+    // TODO: investigate Http Dispatch Failure too.
+
     @Override
     public void onResponseBegin(Request request)
     {

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
@@ -1150,6 +1150,8 @@ default void onResponseContent(Request request, ByteBuffer content)
         {
         }
 
+        // TODO: need onResponseTrailers(Request request) - see https://github.com/eclipse/jetty.project/issues/4956
+
         /**
          * Invoked when the response has been fully written.
          *