Pass in base service name to ServiceInterceptor

Summary:
Consider:

```
service A {
  void foo();
}

service B extends A {}
```

Today, `ServiceInterceptor` receives service name as "B" and method name "foo". The fact that "A" is where the service is defined is lost.

For ACLs, the defining service is what is important. This passes an additional string to `onRequest` and `onResponse` that includes this information (see fixtures).

Reviewed By: WoodyWangHou

Differential Revision: D65899533

fbshipit-source-id: 2a0e7919d21883d1db029348f2ccce2fe55db31e

thrift/compiler/generate/templates/cpp2/service_tcc/process_and_return.mustache

@@ -132,6 +132,7 @@ void {{service:parent_service_cpp_name}}AsyncProcessor::executeRequest_{{#servic
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "{{service:parent_service_name}}"
     , "{{ > common/function_name}}"
     , nullptr /* exceptionFuncPointer */
     , apache::thrift::detail::ServerRequestHelper::eventBase(serverRequest)
@@ -157,6 +158,7 @@ void {{service:parent_service_cpp_name}}AsyncProcessor::executeRequest_{{#servic
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "{{service:parent_service_name}}"
     , "{{ > common/function_name}}"
     , return_{{function:prefixed_name}}<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_{{#service:interaction?}}{{service:name}}_{{/service:interaction?}}{{function:cpp_name}}<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/adapter/out/cpp2/gen-cpp2/AdapterService.tcc

@@ -67,6 +67,7 @@ void AdapterServiceAsyncProcessor::executeRequest_count(apache::thrift::ServerRe
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "AdapterService"
     , "count"
     , return_count<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_count<ProtocolIn_, ProtocolOut_>
@@ -178,6 +179,7 @@ void AdapterServiceAsyncProcessor::executeRequest_adaptedTypes(apache::thrift::S
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "AdapterService"
     , "adaptedTypes"
     , return_adaptedTypes<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_adaptedTypes<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/adapter/out/cpp2/gen-cpp2/Service.tcc

@@ -74,6 +74,7 @@ void ServiceAsyncProcessor::executeRequest_func(apache::thrift::ServerRequest&&
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "Service"
     , "func"
     , return_func<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_func<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/basic-annotations/out/cpp2/gen-cpp2/BadService.tcc

@@ -65,6 +65,7 @@ void GoodServiceAsyncProcessor::executeRequest_bar(apache::thrift::ServerRequest
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "BadService"
     , "bar"
     , return_bar<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_bar<ProtocolIn_, ProtocolOut_>
@@ -178,6 +179,7 @@ void GoodServiceAsyncProcessor::executeRequest_BadInteraction_foo(apache::thrift
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "BadService"
     , "BadInteraction.foo"
     , return_BadInteraction_foo<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_BadInteraction_foo<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/basic-annotations/out/cpp2/gen-cpp2/FooBarBazService.tcc

@@ -69,6 +69,7 @@ void FooBarBazServiceAsyncProcessor::executeRequest_foo(apache::thrift::ServerRe
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "FooBarBazService"
     , "foo"
     , return_foo<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_foo<ProtocolIn_, ProtocolOut_>
@@ -175,6 +176,7 @@ void FooBarBazServiceAsyncProcessor::executeRequest_bar(apache::thrift::ServerRe
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "FooBarBazService"
     , "bar"
     , return_bar<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_bar<ProtocolIn_, ProtocolOut_>
@@ -281,6 +283,7 @@ void FooBarBazServiceAsyncProcessor::executeRequest_baz(apache::thrift::ServerRe
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "FooBarBazService"
     , "baz"
     , return_baz<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_baz<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/basic-annotations/out/cpp2/gen-cpp2/MyService.tcc

@@ -76,6 +76,7 @@ void MyServiceAsyncProcessor::executeRequest_ping(apache::thrift::ServerRequest&
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "ping"
     , return_ping<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_ping<ProtocolIn_, ProtocolOut_>
@@ -199,6 +200,7 @@ void MyServiceAsyncProcessor::executeRequest_getRandomData(apache::thrift::Serve
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "getRandomData"
     , return_getRandomData<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_getRandomData<ProtocolIn_, ProtocolOut_>
@@ -310,6 +312,7 @@ void MyServiceAsyncProcessor::executeRequest_hasDataById(apache::thrift::ServerR
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "hasDataById"
     , return_hasDataById<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_hasDataById<ProtocolIn_, ProtocolOut_>
@@ -421,6 +424,7 @@ void MyServiceAsyncProcessor::executeRequest_getDataById(apache::thrift::ServerR
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "getDataById"
     , return_getDataById<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_getDataById<ProtocolIn_, ProtocolOut_>
@@ -535,6 +539,7 @@ void MyServiceAsyncProcessor::executeRequest_putDataById(apache::thrift::ServerR
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "putDataById"
     , return_putDataById<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_putDataById<ProtocolIn_, ProtocolOut_>
@@ -642,6 +647,7 @@ void MyServiceAsyncProcessor::executeRequest_lobDataById(apache::thrift::ServerR
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "lobDataById"
     , nullptr /* exceptionFuncPointer */
     , apache::thrift::detail::ServerRequestHelper::eventBase(serverRequest)
@@ -727,6 +733,7 @@ void MyServiceAsyncProcessor::executeRequest_cppDoNothing(apache::thrift::Server
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "doNothing"
     , return_cppDoNothing<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_cppDoNothing<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/basic-annotations/out/cpp2/gen-cpp2/MyServicePrioChild.tcc

@@ -65,6 +65,7 @@ void MyServicePrioChildAsyncProcessor::executeRequest_pang(apache::thrift::Serve
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyServicePrioChild"
     , "pang"
     , return_pang<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_pang<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/basic-annotations/out/cpp2/gen-cpp2/MyServicePrioParent.tcc

@@ -67,6 +67,7 @@ void MyServicePrioParentAsyncProcessor::executeRequest_ping(apache::thrift::Serv
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyServicePrioParent"
     , "ping"
     , return_ping<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_ping<ProtocolIn_, ProtocolOut_>
@@ -173,6 +174,7 @@ void MyServicePrioParentAsyncProcessor::executeRequest_pong(apache::thrift::Serv
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyServicePrioParent"
     , "pong"
     , return_pong<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_pong<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/basic-stack-arguments/out/cpp2/gen-cpp2/DbMixedStackArguments.tcc

@@ -70,6 +70,7 @@ void DbMixedStackArgumentsAsyncProcessor::executeRequest_getDataByKey0(apache::t
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "DbMixedStackArguments"
     , "getDataByKey0"
     , return_getDataByKey0<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_getDataByKey0<ProtocolIn_, ProtocolOut_>
@@ -181,6 +182,7 @@ void DbMixedStackArgumentsAsyncProcessor::executeRequest_getDataByKey1(apache::t
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "DbMixedStackArguments"
     , "getDataByKey1"
     , return_getDataByKey1<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_getDataByKey1<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/basic-stack-arguments/out/cpp2/gen-cpp2/MyService.tcc

@@ -73,6 +73,7 @@ void MyServiceAsyncProcessor::executeRequest_hasDataById(apache::thrift::ServerR
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "hasDataById"
     , return_hasDataById<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_hasDataById<ProtocolIn_, ProtocolOut_>
@@ -184,6 +185,7 @@ void MyServiceAsyncProcessor::executeRequest_getDataById(apache::thrift::ServerR
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "getDataById"
     , return_getDataById<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_getDataById<ProtocolIn_, ProtocolOut_>
@@ -298,6 +300,7 @@ void MyServiceAsyncProcessor::executeRequest_putDataById(apache::thrift::ServerR
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "putDataById"
     , return_putDataById<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_putDataById<ProtocolIn_, ProtocolOut_>
@@ -405,6 +408,7 @@ void MyServiceAsyncProcessor::executeRequest_lobDataById(apache::thrift::ServerR
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "lobDataById"
     , nullptr /* exceptionFuncPointer */
     , apache::thrift::detail::ServerRequestHelper::eventBase(serverRequest)

thrift/compiler/test/fixtures/basic-stack-arguments/out/cpp2/gen-cpp2/MyServiceFast.tcc

@@ -76,6 +76,7 @@ void MyServiceFastAsyncProcessor::executeRequest_hasDataById(apache::thrift::Ser
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyServiceFast"
     , "hasDataById"
     , return_hasDataById<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_hasDataById<ProtocolIn_, ProtocolOut_>
@@ -190,6 +191,7 @@ void MyServiceFastAsyncProcessor::executeRequest_getDataById(apache::thrift::Ser
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyServiceFast"
     , "getDataById"
     , return_getDataById<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_getDataById<ProtocolIn_, ProtocolOut_>
@@ -307,6 +309,7 @@ void MyServiceFastAsyncProcessor::executeRequest_putDataById(apache::thrift::Ser
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyServiceFast"
     , "putDataById"
     , return_putDataById<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_putDataById<ProtocolIn_, ProtocolOut_>
@@ -413,6 +416,7 @@ void MyServiceFastAsyncProcessor::executeRequest_lobDataById(apache::thrift::Ser
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyServiceFast"
     , "lobDataById"
     , nullptr /* exceptionFuncPointer */
     , apache::thrift::detail::ServerRequestHelper::eventBase(serverRequest)

thrift/compiler/test/fixtures/basic-structured-annotations/out/cpp2/gen-cpp2/MyService.tcc

@@ -67,6 +67,7 @@ void MyServiceAsyncProcessor::executeRequest_first(apache::thrift::ServerRequest
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "first"
     , return_first<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_first<ProtocolIn_, ProtocolOut_>
@@ -178,6 +179,7 @@ void MyServiceAsyncProcessor::executeRequest_second(apache::thrift::ServerReques
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "second"
     , return_second<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_second<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/basic/out/cpp2/gen-cpp2/DbMixedStackArguments.tcc

@@ -70,6 +70,7 @@ void DbMixedStackArgumentsAsyncProcessor::executeRequest_getDataByKey0(apache::t
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "DbMixedStackArguments"
     , "getDataByKey0"
     , return_getDataByKey0<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_getDataByKey0<ProtocolIn_, ProtocolOut_>
@@ -181,6 +182,7 @@ void DbMixedStackArgumentsAsyncProcessor::executeRequest_getDataByKey1(apache::t
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "DbMixedStackArguments"
     , "getDataByKey1"
     , return_getDataByKey1<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_getDataByKey1<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/basic/out/cpp2/gen-cpp2/FB303Service.tcc

@@ -68,6 +68,7 @@ void FB303ServiceAsyncProcessor::executeRequest_simple_rpc(apache::thrift::Serve
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "FB303Service"
     , "simple_rpc"
     , return_simple_rpc<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_simple_rpc<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/basic/out/cpp2/gen-cpp2/FooService.tcc

@@ -65,6 +65,7 @@ void FooServiceAsyncProcessor::executeRequest_simple_rpc(apache::thrift::ServerR
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "FooService"
     , "simple_rpc"
     , return_simple_rpc<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_simple_rpc<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/basic/out/cpp2/gen-cpp2/MyService.tcc

@@ -82,6 +82,7 @@ void MyServiceAsyncProcessor::executeRequest_ping(apache::thrift::ServerRequest&
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "ping"
     , return_ping<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_ping<ProtocolIn_, ProtocolOut_>
@@ -188,6 +189,7 @@ void MyServiceAsyncProcessor::executeRequest_getRandomData(apache::thrift::Serve
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "getRandomData"
     , return_getRandomData<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_getRandomData<ProtocolIn_, ProtocolOut_>
@@ -299,6 +301,7 @@ void MyServiceAsyncProcessor::executeRequest_sink(apache::thrift::ServerRequest&
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "sink"
     , return_sink<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_sink<ProtocolIn_, ProtocolOut_>
@@ -411,6 +414,7 @@ void MyServiceAsyncProcessor::executeRequest_putDataById(apache::thrift::ServerR
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "putDataById"
     , return_putDataById<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_putDataById<ProtocolIn_, ProtocolOut_>
@@ -520,6 +524,7 @@ void MyServiceAsyncProcessor::executeRequest_hasDataById(apache::thrift::ServerR
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "hasDataById"
     , return_hasDataById<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_hasDataById<ProtocolIn_, ProtocolOut_>
@@ -631,6 +636,7 @@ void MyServiceAsyncProcessor::executeRequest_getDataById(apache::thrift::ServerR
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "getDataById"
     , return_getDataById<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_getDataById<ProtocolIn_, ProtocolOut_>
@@ -742,6 +748,7 @@ void MyServiceAsyncProcessor::executeRequest_deleteDataById(apache::thrift::Serv
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "deleteDataById"
     , return_deleteDataById<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_deleteDataById<ProtocolIn_, ProtocolOut_>
@@ -849,6 +856,7 @@ void MyServiceAsyncProcessor::executeRequest_lobDataById(apache::thrift::ServerR
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "lobDataById"
     , nullptr /* exceptionFuncPointer */
     , apache::thrift::detail::ServerRequestHelper::eventBase(serverRequest)
@@ -934,6 +942,7 @@ void MyServiceAsyncProcessor::executeRequest_invalid_return_for_hack(apache::thr
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "invalid_return_for_hack"
     , return_invalid_return_for_hack<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_invalid_return_for_hack<ProtocolIn_, ProtocolOut_>
@@ -1042,6 +1051,7 @@ void MyServiceAsyncProcessor::executeRequest_rpc_skipped_codegen(apache::thrift:
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "MyService"
     , "rpc_skipped_codegen"
     , return_rpc_skipped_codegen<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_rpc_skipped_codegen<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/client-methods/out/cpp2/gen-cpp2/HeaderClientMethodsAnnotationOnFunction.tcc

@@ -70,6 +70,7 @@ void HeaderClientMethodsAnnotationOnFunctionAsyncProcessor::executeRequest_echo(
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "HeaderClientMethodsAnnotationOnFunction"
     , "echo"
     , return_echo<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_echo<ProtocolIn_, ProtocolOut_>
@@ -181,6 +182,7 @@ void HeaderClientMethodsAnnotationOnFunctionAsyncProcessor::executeRequest_echo_
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "HeaderClientMethodsAnnotationOnFunction"
     , "echo_2"
     , return_echo_2<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_echo_2<ProtocolIn_, ProtocolOut_>

thrift/compiler/test/fixtures/client-methods/out/cpp2/gen-cpp2/HeaderClientMethodsAnnotationOnService.tcc

@@ -70,6 +70,7 @@ void HeaderClientMethodsAnnotationOnServiceAsyncProcessor::executeRequest_echo(a
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "HeaderClientMethodsAnnotationOnService"
     , "echo"
     , return_echo<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_echo<ProtocolIn_, ProtocolOut_>
@@ -181,6 +182,7 @@ void HeaderClientMethodsAnnotationOnServiceAsyncProcessor::executeRequest_echo_2
     apache::thrift::detail::ServerRequestHelper::request(std::move(serverRequest))
     , std::move(ctxStack)
     , this->getServiceName()
+    , "HeaderClientMethodsAnnotationOnService"
     , "echo_2"
     , return_echo_2<ProtocolIn_,ProtocolOut_>
     , throw_wrapped_echo_2<ProtocolIn_, ProtocolOut_>