Skip to content

Commit 8d87b44

Browse files
committed
can disable user agent
1 parent cde96ac commit 8d87b44

File tree

2 files changed

+22
-17
lines changed

2 files changed

+22
-17
lines changed

tonic/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ codegen = ["dep:async-trait"]
2424
gzip = ["dep:flate2"]
2525
deflate = ["dep:flate2"]
2626
zstd = ["dep:zstd"]
27-
default = ["router", "transport", "codegen", "prost"]
27+
default = ["router", "transport", "codegen", "prost", "user-agent"]
28+
user-agent = []
2829
prost = ["dep:prost"]
2930
_tls-any = ["dep:tokio-rustls", "dep:tokio", "tokio?/rt", "tokio?/macros"] # Internal. Please choose one of `tls-ring` or `tls-aws-lc`
3031
tls-ring = ["_tls-any", "tokio-rustls/ring"]

tonic/src/transport/channel/service/connection.rs

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
use super::{AddOrigin, Reconnect, SharedExec, UserAgent};
2-
use crate::{
3-
body::Body,
4-
transport::{channel::BoxFuture, service::GrpcTimeout, Endpoint},
5-
};
6-
use http::{Request, Response, Uri};
7-
use hyper::rt;
8-
use hyper::{client::conn::http2::Builder, rt::Executor};
9-
use hyper_util::rt::TokioTimer;
101
use std::{
112
fmt,
123
task::{Context, Poll},
134
};
14-
use tower::load::Load;
5+
6+
use http::{Request, Response, Uri};
7+
use hyper::{client::conn::http2::Builder, rt, rt::Executor};
8+
use hyper_util::rt::TokioTimer;
159
use tower::{
1610
layer::Layer,
1711
limit::{concurrency::ConcurrencyLimitLayer, rate::RateLimitLayer},
12+
load::Load,
1813
util::BoxService,
1914
ServiceBuilder, ServiceExt,
2015
};
2116
use tower_service::Service;
2217

18+
use super::{AddOrigin, Reconnect, SharedExec, UserAgent};
19+
use crate::{
20+
body::Body,
21+
transport::{channel::BoxFuture, service::GrpcTimeout, Endpoint},
22+
};
23+
2324
pub(crate) struct Connection {
2425
inner: BoxService<Request<Body>, Response<Body>, crate::BoxError>,
2526
}
@@ -55,13 +56,16 @@ impl Connection {
5556
settings.max_header_list_size(val);
5657
}
5758

58-
let stack = ServiceBuilder::new()
59-
.layer_fn(|s| {
60-
let origin = endpoint.origin.as_ref().unwrap_or(endpoint.uri()).clone();
59+
let stack = ServiceBuilder::new().layer_fn(|s| {
60+
let origin = endpoint.origin.as_ref().unwrap_or(endpoint.uri()).clone();
61+
62+
AddOrigin::new(s, origin)
63+
});
64+
65+
#[cfg(feature = "user-agent")]
66+
let stack = stack.layer_fn(|s| UserAgent::new(s, endpoint.user_agent.clone()));
6167

62-
AddOrigin::new(s, origin)
63-
})
64-
.layer_fn(|s| UserAgent::new(s, endpoint.user_agent.clone()))
68+
let stack = stack
6569
.layer_fn(|s| GrpcTimeout::new(s, endpoint.timeout))
6670
.option_layer(endpoint.concurrency_limit.map(ConcurrencyLimitLayer::new))
6771
.option_layer(endpoint.rate_limit.map(|(l, d)| RateLimitLayer::new(l, d)))

0 commit comments

Comments
 (0)