Remove service namespace from the RPC

Author: kvinwang

guest-agent/rpc/build.rs

@@ -6,8 +6,6 @@ fn main() {
         .disable_package_emission()
         .enable_serde_extension()
         .disable_service_name_emission()
-        .keep_service_name("Tappd")
-        .keep_service_name("Worker")
         .compile_dir("./proto")
         .expect("failed to compile proto files");
 }

guest-agent/src/main.rs

@@ -48,7 +48,7 @@ async fn run_internal_v0(state: AppState, figment: Figment) -> Result<()> {
     let rocket = rocket::custom(figment)
         .mount(
             "/prpc/",
-            ra_rpc::prpc_routes!(AppState, InternalRpcHandlerV0),
+            ra_rpc::prpc_routes!(AppState, InternalRpcHandlerV0, trim: "Tappd."),
         )
         .manage(state);
     let ignite = rocket
@@ -98,7 +98,10 @@ async fn run_internal(state: AppState, figment: Figment) -> Result<()> {
 async fn run_external(state: AppState, figment: Figment) -> Result<()> {
     let rocket = rocket::custom(figment)
         .mount("/", http_routes::external_routes(state.config()))
-        .mount("/prpc", ra_rpc::prpc_routes!(AppState, ExternalRpcHandler))
+        .mount(
+            "/prpc",
+            ra_rpc::prpc_routes!(AppState, ExternalRpcHandler, trim: "Worker."),
+        )
         .attach(AdHoc::on_response("Add app version header", |_req, res| {
             Box::pin(async move {
                 res.set_raw_header("X-App-Version", app_version());

kms/rpc/build.rs

@@ -5,6 +5,7 @@ fn main() {
         .build_scale_ext(false)
         .disable_package_emission()
         .enable_serde_extension()
+        .disable_service_name_emission()
         .compile_dir("./proto")
         .expect("failed to compile proto files");
 }

kms/src/main.rs

@@ -62,7 +62,10 @@ async fn run_onboard_service(kms_config: KmsConfig, figment: Figment) -> Result<
 
     let _ = rocket::custom(figment)
         .mount("/", rocket::routes![index, finish])
-        .mount("/prpc", ra_rpc::prpc_routes!(OnboardState, OnboardHandler))
+        .mount(
+            "/prpc",
+            ra_rpc::prpc_routes!(OnboardState, OnboardHandler, trim: "Onboard."),
+        )
         .manage(state)
         .launch()
         .await
@@ -107,7 +110,10 @@ async fn main() -> Result<()> {
                 res.set_raw_header("X-App-Version", app_version());
             })
         }))
-        .mount("/prpc", ra_rpc::prpc_routes!(KmsState, RpcHandler))
+        .mount(
+            "/prpc",
+            ra_rpc::prpc_routes!(KmsState, RpcHandler, trim: "KMS."),
+        )
         .manage(state);
 
     let verifier = QuoteVerifier::new(pccs_url);

vmm/src/main.rs

@@ -47,7 +47,10 @@ async fn run_external_api(app: App, figment: Figment, api_auth: ApiToken) -> Res
         .mount("/", main_routes::routes())
         .mount("/guest", ra_rpc::prpc_routes!(App, GuestApiHandler))
         .mount("/api", ra_rpc::prpc_routes!(App, HostApiHandler))
-        .mount("/prpc", ra_rpc::prpc_routes!(App, RpcHandler, trim: "Teepod."))
+        .mount(
+            "/prpc",
+            ra_rpc::prpc_routes!(App, RpcHandler, trim: "Teepod."),
+        )
         .manage(app)
         .manage(api_auth)
         .attach(AdHoc::on_response("Add app rev header", |_req, res| {