fix: do not change server_with

Signed-off-by: hi-rustin <[email protected]>

console-subscriber/Cargo.toml

@@ -28,10 +28,9 @@ keywords = [
 default = ["env-filter"]
 parking_lot = ["parking_lot_crate", "tracing-subscriber/parking_lot"]
 env-filter = ["tracing-subscriber/env-filter"]
-grpc-web = ["tonic-web", "tower-http", "tower"]
+grpc-web = ["tonic-web", "tower-http"]
 
 [dependencies]
-
 crossbeam-utils = "0.8.7"
 tokio = { version = "^1.21", features = ["sync", "time", "macros", "tracing"] }
 tokio-stream = { version = "0.1", features = ["net"] }
@@ -58,7 +57,6 @@ crossbeam-channel = "0.5"
 # Only for the web feature:
 tonic-web = { version = "0.10.2", optional = true }
 tower-http = { version = "0.4", features = ["cors"], optional = true }
-tower = { version = "0.4", default-features = false, optional = true}
 
 [dev-dependencies]
 tokio = { version = "^1.21", features = ["full", "rt-multi-thread"] }

console-subscriber/src/builder.rs

@@ -521,17 +521,15 @@ impl Builder {
                     #[cfg(feature = "grpc-web")]
                     if cors_layer.is_some() {
                         server
-                            .serve_with_grpc_web(cors_layer.unwrap())
+                            .serve_with_grpc_web(
+                                tonic::transport::Server::builder(),
+                                cors_layer.unwrap(),
+                            )
                             .await
-                            .expect("console subscriber server failed")
-                    } else {
-                        server
-                            .serve()
-                            .await
-                            .expect("console subscriber server failed")
+                            .expect("console subscriber server failed");
+                        return;
                     }
 
-                    #[cfg(not(feature = "grpc-web"))]
                     server
                         .serve()
                         .await

console-subscriber/src/lib.rs

@@ -909,7 +909,6 @@ impl Server {
     /// [environment variable]: `Builder::with_default_env`
     pub const DEFAULT_PORT: u16 = 6669;
 
-    #[cfg(not(feature = "grpc-web"))]
     /// Starts the gRPC service with the default gRPC settings.
     ///
     /// To configure gRPC server settings before starting the server, use
@@ -932,13 +931,34 @@ impl Server {
     /// support.
     pub async fn serve_with_grpc_web(
         self,
+        builder: tonic::transport::Server,
         cors: tower_http::cors::CorsLayer,
     ) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
-        let builder = tonic::transport::Server::builder()
+        let addr = self.addr.clone();
+        let ServerParts {
+            instrument_server,
+            aggregator,
+        } = self.into_parts();
+        let router = builder
             .accept_http1(true)
             .layer(cors)
-            .layer(tonic_web::GrpcWebLayer::new());
-        self.serve_with(builder).await
+            .layer(tonic_web::GrpcWebLayer::new())
+            .add_service(instrument_server);
+        let aggregate = spawn_named(aggregator.run(), "console::aggregate");
+        let res = match addr {
+            ServerAddr::Tcp(addr) => {
+                let serve = router.serve(addr);
+                spawn_named(serve, "console::serve").await
+            }
+            #[cfg(unix)]
+            ServerAddr::Unix(path) => {
+                let incoming = UnixListener::bind(path)?;
+                let serve = router.serve_with_incoming(UnixListenerStream::new(incoming));
+                spawn_named(serve, "console::serve").await
+            }
+        };
+        aggregate.abort();
+        res?.map_err(Into::into)
     }
 
     /// Starts the gRPC service with the given [`tonic`] gRPC transport server
@@ -953,16 +973,7 @@ impl Server {
     /// [`tonic`]: https://docs.rs/tonic/
     pub async fn serve_with(
         self,
-        #[cfg(not(feature = "grpc-web"))] mut builder: tonic::transport::Server,
-        #[cfg(feature = "grpc-web")] mut builder: tonic::transport::Server<
-            tower::layer::util::Stack<
-                tonic_web::GrpcWebLayer,
-                tower::layer::util::Stack<
-                    tower_http::cors::CorsLayer,
-                    tower::layer::util::Identity,
-                >,
-            >,
-        >,
+        mut builder: tonic::transport::Server,
     ) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
         let addr = self.addr.clone();
         let ServerParts {