Only bump the overload count if includeInRecentRequests is true

Summary: To be consistent with the behavior we have for incrementing/decrementing request counts, we should add `includeInRecentRequests` check to exclude those unwanted thrift methods. Reviewed By: joshkirstein Differential Revision: D45362412 fbshipit-source-id: f544e7f293dbe29f83f1a50545d09711701d1871
facebook · Apr 28, 2023 · 06c2980 · 06c2980
1 parent 0d92a2e
commit 06c2980
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/thrift/lib/cpp2/transport/core/ThriftRequest.h b/thrift/lib/cpp2/transport/core/ThriftRequest.h
@@ -83,6 +83,10 @@ class ThriftRequestCore : public ResponseChannelRequest {
     return kind_ == RpcKind::SINGLE_REQUEST_NO_RESPONSE;
   }
 
+  bool includeInRecentRequests() const {
+    return stateMachine_.includeInRecentRequests();
+  }
+
   protocol::PROTOCOL_TYPES getProtoId() const {
     return static_cast<protocol::PROTOCOL_TYPES>(header_.getProtocolId());
   }

diff --git a/thrift/lib/cpp2/transport/rocket/server/ThriftRocketServerHandler.cpp b/thrift/lib/cpp2/transport/rocket/server/ThriftRocketServerHandler.cpp
@@ -647,7 +647,9 @@ void ThriftRocketServerHandler::handleRequestOverloadedServer(
       folly::make_exception_wrapper<TApplicationException>(
           TApplicationException::LOADSHEDDING, errorMessage),
       errorCode);
-  requestsRegistry_->getRequestCounter().incrementOverloadCount();
+  if (request->includeInRecentRequests()) {
+    requestsRegistry_->getRequestCounter().incrementOverloadCount();
+  }
 }
 
 void ThriftRocketServerHandler::handleAppError(