Add timeout value to the ingress timeout failure message

Reviewed By: JunqiWang Differential Revision: D54854639 fbshipit-source-id: ba77197eece8aded5f6fa58c6b8885d34af2ea34
facebook · Mar 22, 2024 · a96bebe · a96bebe
1 parent 72f28a3
commit a96bebe
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/proxygen/lib/http/session/HTTPTransaction.cpp b/proxygen/lib/http/session/HTTPTransaction.cpp
@@ -782,15 +782,33 @@ void HTTPTransaction::onIngressTimeout() {
     if (windowUpdateTimeout) {
       HTTPException ex(
           HTTPException::Direction::INGRESS_AND_EGRESS,
-          folly::to<std::string>("ingress timeout, streamID=", id_));
+          folly::to<std::string>(
+              "ingress timeout, streamID=",
+              id_,
+              ", timeout=",
+              idleTimeout_.has_value()
+                  ? std::chrono::duration_cast<std::chrono::milliseconds>(
+                        idleTimeout_.value())
+                        .count()
+                  : -1,
+              "ms"));
       ex.setProxygenError(kErrorWriteTimeout);
       // This is a protocol error
       ex.setCodecStatusCode(ErrorCode::PROTOCOL_ERROR);
       onError(ex);
     } else {
       HTTPException ex(
           HTTPException::Direction::INGRESS,
-          folly::to<std::string>("ingress timeout, streamID=", id_));
+          folly::to<std::string>(
+              "ingress timeout, streamID=",
+              id_,
+              ", timeout=",
+              idleTimeout_.has_value()
+                  ? std::chrono::duration_cast<std::chrono::milliseconds>(
+                        idleTimeout_.value())
+                        .count()
+                  : -1,
+              "ms"));
       ex.setProxygenError(kErrorTimeout);
       onError(ex);
     }

diff --git a/proxygen/lib/http/session/test/HTTPDownstreamSessionTest.cpp b/proxygen/lib/http/session/test/HTTPDownstreamSessionTest.cpp
@@ -2847,7 +2847,12 @@ TEST_F(HTTP2DownstreamSessionTest, H2TimeoutWin) {
   handler->expectEgressPaused();
   handler->expectError([&](const HTTPException& ex) {
     ASSERT_EQ(ex.getProxygenError(), kErrorWriteTimeout);
-    ASSERT_EQ(folly::to<std::string>("ingress timeout, streamID=", streamID),
+    ASSERT_EQ(folly::to<std::string>(
+                  "ingress timeout, streamID=",
+                  streamID,
+                  ", timeout=",
+                  transactionTimeouts_->getDefaultTimeout().count(),
+                  "ms"),
               std::string(ex.what()));
     handler->terminate();
   });
@@ -4150,7 +4155,12 @@ TEST_F(HTTP2DownstreamSessionTest, TestTransactionStallByFlowControl) {
 
   handler->expectError([&](const HTTPException& ex) {
     ASSERT_EQ(ex.getProxygenError(), kErrorWriteTimeout);
-    ASSERT_EQ(folly::to<std::string>("ingress timeout, streamID=", streamID),
+    ASSERT_EQ(folly::to<std::string>(
+                  "ingress timeout, streamID=",
+                  streamID,
+                  ", timeout=",
+                  transactionTimeouts_->getDefaultTimeout().count(),
+                  "ms"),
               std::string(ex.what()));
     handler->terminate();
   });