Merge branch 'main' of github.com:cloudwego/volo

Author: jizhuozhi

Cargo.lock

@@ -27,13 +27,7 @@ rust-version = "1.80.0"
 pilota = "0.11"
 pilota-build = "0.11"
 pilota-thrift-parser = "0.11"
-# pilota = { git = "https://github.com/cloudwego/pilota.git", branch = "main" }
-# pilota-build = { git = "https://github.com/cloudwego/pilota.git", branch = "main" }
-# pilota-thrift-parser = { git = "https://github.com/cloudwego/pilota.git", branch = "main" }
-
 motore = "0.4"
-# motore = { git = "https://github.com/cloudwego/motore.git", branch = "main" }
-
 metainfo = "0.7"
 
 ahash = "0.8"
@@ -58,11 +52,11 @@ futures = "0.3"
 futures-util = "0.3"
 flate2 = "1"
 git2 = { version = "0.20", default-features = false }
-governor = "0.8"
+governor = "0.10"
 h2 = "0.4"
 heck = "0.5"
 hex = "0.4"
-hickory-resolver = "0.24"
+hickory-resolver = "0.25"
 http = "1"
 http-body = "1"
 http-body-util = "0.1"
@@ -110,17 +104,17 @@ serde_urlencoded = "0.7"
 serde_yaml = "0.9"
 simdutf8 = "0.1"
 socket2 = "0.5"
-sonic-rs = "0.3"
+sonic-rs = "0.5"
 syn = "2"
-sysinfo = "0.33"
+sysinfo = "0.34"
 tempfile = "3"
 thiserror = "2"
 tokio = "1"
 tokio-stream = "0.1"
 tokio-test = "0.4"
 tokio-util = "0.7"
-tonic = "0.12"
-tonic-web = "0.12"
+tonic = "0.13"
+tonic-web = "0.13"
 tower = "0.5"
 tracing = "0.1"
 tracing-subscriber = "0.3"
@@ -152,3 +146,10 @@ codegen-units = 1
 panic = 'unwind'
 incremental = false
 overflow-checks = false
+
+[patch.crates-io]
+# pilota = { git = "https://github.com/cloudwego/pilota.git", branch = "main" }
+# pilota-build = { git = "https://github.com/cloudwego/pilota.git", branch = "main" }
+# pilota-thrift-parser = { git = "https://github.com/cloudwego/pilota.git", branch = "main" }
+# motore = { git = "https://github.com/cloudwego/motore.git", branch = "main" }
+# metainfo = { git = "https://github.com/cloudwego/metainfo.git", branch = "main"}

Cargo.toml

@@ -103,6 +103,6 @@ impl Counter {
                 total
             )
         };
-        println!("{}", result);
+        println!("{result}");
     }
 }

benchmark/src/runner/counter.rs

@@ -35,6 +35,6 @@ pub async fn process_request(recoder: &Recoder, req: Request) -> Response {
 
 pub fn process_response(action: &str, msg: &str) {
     if action == REPORT_ACTION {
-        println!("{}", msg);
+        println!("{msg}");
     }
 }

benchmark/src/runner/processor.rs

@@ -140,6 +140,8 @@ volo-http = { path = "../volo-http", features = [
 volo-gen = { path = "./volo-gen" }
 
 [features]
+tls = ["rustls"]
+
 __tls = []
 rustls = ["__tls", "volo/rustls", "volo-grpc/rustls", "volo-http/rustls"]
 native-tls = [

examples/Cargo.toml

@@ -43,13 +43,13 @@ fn build_request(base_uri: &str, content_type: &str, accept: &str) -> Request<Fu
 
     let bytes = match content_type {
         "grpc-web" => encode_body(),
-        _ => panic!("invalid content type {}", content_type),
+        _ => panic!("invalid content type {content_type}"),
     };
 
     Request::builder()
         .method(Method::POST)
-        .header(CONTENT_TYPE, format!("application/{}", content_type))
-        .header(ACCEPT, format!("application/{}", accept))
+        .header(CONTENT_TYPE, format!("application/{content_type}"))
+        .header(ACCEPT, format!("application/{accept}"))
         .uri(request_uri)
         .body(Full::new(bytes))
         .unwrap()

examples/src/grpc/grpc-web/client.rs

@@ -19,12 +19,12 @@ async fn main() {
     let tls_config = ClientTlsConfig::new("example.com", connector);
 
     let addr: SocketAddr = "127.0.0.1:8080".parse().unwrap();
-    let client = volo_gen::proto_gen::hello::GreeterClientBuilder::new("hello")
+    let client = volo_gen::proto_gen::helloworld::GreeterClientBuilder::new("hello")
         .tls_config(tls_config)
         .address(addr)
         .build();
 
-    let req = volo_gen::proto_gen::hello::HelloRequest {
+    let req = volo_gen::proto_gen::helloworld::HelloRequest {
         name: FastStr::from_static_str("Volo"),
     };
     let resp = client.say_hello(req).await;

examples/src/grpc/tls/client.rs

@@ -7,13 +7,13 @@ use volo_grpc::server::{Server, ServiceBuilder};
 
 pub struct S;
 
-impl volo_gen::proto_gen::hello::Greeter for S {
+impl volo_gen::proto_gen::helloworld::Greeter for S {
     async fn say_hello(
         &self,
-        req: volo_grpc::Request<volo_gen::proto_gen::hello::HelloRequest>,
-    ) -> Result<volo_grpc::Response<volo_gen::proto_gen::hello::HelloReply>, volo_grpc::Status>
+        req: volo_grpc::Request<volo_gen::proto_gen::helloworld::HelloRequest>,
+    ) -> Result<volo_grpc::Response<volo_gen::proto_gen::helloworld::HelloReply>, volo_grpc::Status>
     {
-        let resp = volo_gen::proto_gen::hello::HelloReply {
+        let resp = volo_gen::proto_gen::helloworld::HelloReply {
             message: format!("Hello, {}!", req.get_ref().name).into(),
         };
         Ok(volo_grpc::Response::new(resp))
@@ -39,7 +39,9 @@ async fn main() {
 
     Server::new()
         .tls_config(tls_config)
-        .add_service(ServiceBuilder::new(volo_gen::proto_gen::hello::GreeterServer::new(S)).build())
+        .add_service(
+            ServiceBuilder::new(volo_gen::proto_gen::helloworld::GreeterServer::new(S)).build(),
+        )
         .run(addr)
         .await
         .unwrap();

examples/src/grpc/tls/server.rs

@@ -176,7 +176,7 @@ async fn box_body_test() -> Body {
 }
 
 async fn full_uri(uri: FullUri) -> String {
-    format!("{}\n", uri)
+    format!("{uri}\n")
 }
 
 async fn redirect_to_index() -> Redirect {

examples/src/http/example-http-server.rs

@@ -19,12 +19,11 @@ async fn main() {
     let client = {
         let mut builder = Client::builder();
         builder.set_tls_config(connector);
-        builder.build()
+        builder.build().expect("failed to build client")
     };
 
     let resp = client
         .get("https://[::1]:8080/")
-        .expect("invalid uri")
         .send()
         .await
         .expect("request failed")