From 2df4e29e180f5e79bee04aa4b4d83536e9f7f3a4 Mon Sep 17 00:00:00 2001
From: Congyu WANG <leonwang998@gmail.com>
Date: Mon, 5 Aug 2024 19:34:04 +0800
Subject: [PATCH 1/3] fix h2 request_summary

---
 pingora-core/src/protocols/http/v2/server.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pingora-core/src/protocols/http/v2/server.rs b/pingora-core/src/protocols/http/v2/server.rs
index 5bd6bc02..0227e43e 100644
--- a/pingora-core/src/protocols/http/v2/server.rs
+++ b/pingora-core/src/protocols/http/v2/server.rs
@@ -348,12 +348,8 @@ impl HttpSession {
         format!(
             "{} {}, Host: {}",
             self.request_header.method,
-            self.request_header.uri,
-            self.request_header
-                .headers
-                .get(header::HOST)
-                .map(|v| String::from_utf8_lossy(v.as_bytes()))
-                .unwrap_or_default()
+            self.request_header.uri.path(),
+            self.request_header.uri.host().unwrap_or_default(),
         )
     }
 

From 53e1810a27de581f6d5a9606198d9ac443f4a63c Mon Sep 17 00:00:00 2001
From: Congyu WANG <leonwang998@gmail.com>
Date: Mon, 5 Aug 2024 19:55:16 +0800
Subject: [PATCH 2/3] also add port number

---
 pingora-core/src/protocols/http/v2/server.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pingora-core/src/protocols/http/v2/server.rs b/pingora-core/src/protocols/http/v2/server.rs
index 0227e43e..73827ea6 100644
--- a/pingora-core/src/protocols/http/v2/server.rs
+++ b/pingora-core/src/protocols/http/v2/server.rs
@@ -346,10 +346,16 @@ impl HttpSession {
     /// Return a string `$METHOD $PATH $HOST`. Mostly for logging and debug purpose
     pub fn request_summary(&self) -> String {
         format!(
-            "{} {}, Host: {}",
+            "{} {}, Host: {}:{}",
             self.request_header.method,
             self.request_header.uri.path(),
             self.request_header.uri.host().unwrap_or_default(),
+            self.req_header()
+                .uri
+                .port()
+                .as_ref()
+                .map(|port| port.as_str())
+                .unwrap_or_default()
         )
     }
 

From 8102a0900bf30bf740e58c3a541bb86d296eb660 Mon Sep 17 00:00:00 2001
From: Congyu WANG <leonwang998@gmail.com>
Date: Wed, 7 Aug 2024 15:36:06 +0800
Subject: [PATCH 3/3] also print query with path for h2 just as h1

---
 pingora-core/src/protocols/http/v2/server.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pingora-core/src/protocols/http/v2/server.rs b/pingora-core/src/protocols/http/v2/server.rs
index 73827ea6..447a4e30 100644
--- a/pingora-core/src/protocols/http/v2/server.rs
+++ b/pingora-core/src/protocols/http/v2/server.rs
@@ -20,6 +20,7 @@ use h2::server;
 use h2::server::SendResponse;
 use h2::{RecvStream, SendStream};
 use http::header::HeaderName;
+use http::uri::PathAndQuery;
 use http::{header, HeaderMap, Response};
 use log::{debug, warn};
 use pingora_http::{RequestHeader, ResponseHeader};
@@ -348,7 +349,11 @@ impl HttpSession {
         format!(
             "{} {}, Host: {}:{}",
             self.request_header.method,
-            self.request_header.uri.path(),
+            self.request_header
+                .uri
+                .path_and_query()
+                .map(PathAndQuery::as_str)
+                .unwrap_or_default(),
             self.request_header.uri.host().unwrap_or_default(),
             self.req_header()
                 .uri