From 838a170882d34b82c03dc9d24bc0fa4fe09812fe Mon Sep 17 00:00:00 2001
From: Evan Zou <ezou@meta.com>
Date: Fri, 10 Jan 2025 12:32:52 -0800
Subject: [PATCH] Make ServiceInfoHolder dependency non-transitive

Summary: After refactoring `ServiceInfoHolder`, `AsyncProcessor` no longer has a dependency on `ServiceInfoHolder`. Various test fixtures depend on the symbol transitively by including `AsyncProcessor`. This diff moves the dependency out for clarity.

Reviewed By: sazonovkirill

Differential Revision: D67882822

fbshipit-source-id: 42ebeb428cd49b3727e955d86f8826306904b577
---
 thrift/lib/cpp2/GeneratedCodeHelper.h  | 1 +
 thrift/lib/cpp2/async/AsyncProcessor.h | 1 -
 thrift/lib/cpp2/gen/service_h.h        | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/thrift/lib/cpp2/GeneratedCodeHelper.h b/thrift/lib/cpp2/GeneratedCodeHelper.h
index e186581a5f9..8b516248638 100644
--- a/thrift/lib/cpp2/GeneratedCodeHelper.h
+++ b/thrift/lib/cpp2/GeneratedCodeHelper.h
@@ -40,6 +40,7 @@
 #include <thrift/lib/cpp2/async/ClientBufferedStream.h>
 #include <thrift/lib/cpp2/async/ClientSinkBridge.h>
 #include <thrift/lib/cpp2/async/RequestChannel.h>
+#include <thrift/lib/cpp2/async/ServiceInfoHolder.h>
 #include <thrift/lib/cpp2/async/Sink.h>
 #include <thrift/lib/cpp2/async/StreamCallbacks.h>
 #include <thrift/lib/cpp2/detail/meta.h>
diff --git a/thrift/lib/cpp2/async/AsyncProcessor.h b/thrift/lib/cpp2/async/AsyncProcessor.h
index e8dda081de1..42485a87c81 100644
--- a/thrift/lib/cpp2/async/AsyncProcessor.h
+++ b/thrift/lib/cpp2/async/AsyncProcessor.h
@@ -50,7 +50,6 @@
 #include <thrift/lib/cpp2/async/SchemaV1.h>
 #include <thrift/lib/cpp2/async/ServerRequestData.h>
 #include <thrift/lib/cpp2/async/ServerStream.h>
-#include <thrift/lib/cpp2/async/ServiceInfoHolder.h>
 #include <thrift/lib/cpp2/async/Sink.h>
 #include <thrift/lib/cpp2/protocol/Protocol.h>
 #include <thrift/lib/cpp2/server/ConcurrencyControllerInterface.h>
diff --git a/thrift/lib/cpp2/gen/service_h.h b/thrift/lib/cpp2/gen/service_h.h
index 8f7885b8db6..7a2d4ec6f76 100644
--- a/thrift/lib/cpp2/gen/service_h.h
+++ b/thrift/lib/cpp2/gen/service_h.h
@@ -28,6 +28,7 @@
 #include <thrift/lib/cpp2/async/FutureRequest.h>
 #include <thrift/lib/cpp2/async/HeaderChannel.h>
 #include <thrift/lib/cpp2/async/RequestChannel.h>
+#include <thrift/lib/cpp2/async/ServiceInfoHolder.h>
 
 namespace folly {