Skip to content

Commit 2e948ae

Browse files
olix0rolix0r
authored
Rename push_on_response to push_on_service (#1235)
The "on response" terminology is confusing: in all cases where we use push_on_response, we're actually pushing a layer that operates on a `NewService`'s returned `Service`. This rename helps to make this usage clearer.
1 parent d0878d5 commit 2e948ae

File tree

21 files changed

+83
-83
lines changed

21 files changed

+83
-83
lines changed

‎linkerd/app/admin/src/stack.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl Config {
8080
let admin = crate::server::Admin::new(report, ready, shutdown, trace);
8181
let admin = svc::stack(move |_| admin.clone())
8282
.push(metrics.http_endpoint.to_layer::<classify::Response, _, Http>())
83-
.push_on_response(
83+
.push_on_service(
8484
svc::layers()
8585
.push(metrics.http_errors.clone())
8686
.push(errors::layer())

‎linkerd/app/core/src/control.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,18 @@ impl Config {
8181
.push(tls::Client::layer(identity))
8282
.push_timeout(self.connect.timeout)
8383
.push(self::client::layer())
84-
.push_on_response(svc::MapErrLayer::new(Into::into))
84+
.push_on_service(svc::MapErrLayer::new(Into::into))
8585
.into_new_service()
8686
.push_new_reconnect(self.connect.backoff)
8787
// Ensure individual endpoints are driven to readiness so that the balancer need not
8888
// drive them all directly.
89-
.push_on_response(svc::layer::mk(svc::SpawnReady::new))
89+
.push_on_service(svc::layer::mk(svc::SpawnReady::new))
9090
.push(self::resolve::layer(dns, resolve_backoff))
91-
.push_on_response(self::control::balance::layer())
91+
.push_on_service(self::control::balance::layer())
9292
.into_new_service()
9393
.push(metrics.to_layer::<classify::Response, _, _>())
9494
.push(self::add_origin::layer())
95-
.push_on_response(svc::layers().push_spawn_buffer(self.buffer_capacity))
95+
.push_on_service(svc::layers().push_spawn_buffer(self.buffer_capacity))
9696
.push_map_target(move |()| addr.clone())
9797
.push(svc::BoxNewService::layer())
9898
.into_inner()

‎linkerd/app/core/src/svc.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ impl<L> Layers<L> {
9292
.push(BufferLayer::new(capacity))
9393
}
9494

95-
pub fn push_on_response<U>(self, layer: U) -> Layers<Pair<L, stack::OnResponseLayer<U>>> {
96-
self.push(stack::OnResponseLayer::new(layer))
95+
pub fn push_on_service<U>(self, layer: U) -> Layers<Pair<L, stack::OnServiceLayer<U>>> {
96+
self.push(stack::OnServiceLayer::new(layer))
9797
}
9898

9999
pub fn push_instrument<G: Clone>(self, get_span: G) -> Layers<Pair<L, NewInstrumentLayer<G>>> {
@@ -171,8 +171,8 @@ impl<S> Stack<S> {
171171

172172
/// Assuming `S` implements `NewService` or `MakeService`, applies the given
173173
/// `L`-typed layer on each service produced by `S`.
174-
pub fn push_on_response<L: Clone>(self, layer: L) -> Stack<stack::OnResponse<L, S>> {
175-
self.push(stack::OnResponseLayer::new(layer))
174+
pub fn push_on_service<L: Clone>(self, layer: L) -> Stack<stack::OnService<L, S>> {
175+
self.push(stack::OnServiceLayer::new(layer))
176176
}
177177

178178
pub fn push_timeout(self, timeout: Duration) -> Stack<tower::timeout::Timeout<S>> {

‎linkerd/app/gateway/src/lib.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ where
159159
}
160160
}
161161
}))
162-
.push_on_response(
162+
.push_on_service(
163163
svc::layers()
164164
.push(
165165
inbound
@@ -195,7 +195,7 @@ where
195195
}
196196
}))
197197
.instrument(|h: &HttpTarget| debug_span!("gateway", target = %h.target, v = %h.version))
198-
.push_on_response(
198+
.push_on_service(
199199
svc::layers()
200200
.push(
201201
inbound
@@ -209,7 +209,7 @@ where
209209
.push_spawn_buffer(buffer_capacity),
210210
)
211211
.push_cache(cache_max_idle_age)
212-
.push_on_response(
212+
.push_on_service(
213213
svc::layers()
214214
.push(http::Retain::layer())
215215
.push(http::BoxResponse::layer()),
@@ -247,7 +247,7 @@ where
247247
)
248248
.push_http_server()
249249
.into_stack()
250-
.push_on_response(svc::BoxService::layer())
250+
.push_on_service(svc::BoxService::layer())
251251
.push(svc::BoxNewService::layer())
252252
.push_switch(
253253
|GatewayTransportHeader {
@@ -266,7 +266,7 @@ where
266266
})),
267267
None => Ok::<_, Infallible>(svc::Either::B(target)),
268268
},
269-
tcp.push_on_response(svc::BoxService::layer())
269+
tcp.push_on_service(svc::BoxService::layer())
270270
.push(svc::BoxNewService::layer())
271271
.into_inner(),
272272
)
@@ -277,7 +277,7 @@ where
277277
},
278278
legacy_http.into_inner(),
279279
)
280-
.push_on_response(svc::BoxService::layer())
280+
.push_on_service(svc::BoxService::layer())
281281
.push(svc::BoxNewService::layer())
282282
.into_inner()
283283
}

‎linkerd/app/inbound/src/accept.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl<N> Inbound<N> {
7171
let OrigDstAddr(addr) = t.param();
7272
info_span!("server", port = addr.port())
7373
})
74-
.push_on_response(svc::BoxService::layer())
74+
.push_on_service(svc::BoxService::layer())
7575
.push(svc::BoxNewService::layer())
7676
})
7777
}

‎linkerd/app/inbound/src/detect.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl<N> Inbound<N> {
131131
}))
132132
},
133133
svc::stack(forward.clone())
134-
.push_on_response(svc::MapTargetLayer::new(io::BoxedIo::new))
134+
.push_on_service(svc::MapTargetLayer::new(io::BoxedIo::new))
135135
.into_inner(),
136136
)
137137
.push(tls::NewDetectTls::layer(TlsParams {
@@ -150,10 +150,10 @@ impl<N> Inbound<N> {
150150
Ok(svc::Either::A(t))
151151
},
152152
svc::stack(forward)
153-
.push_on_response(svc::MapTargetLayer::new(io::BoxedIo::new))
153+
.push_on_service(svc::MapTargetLayer::new(io::BoxedIo::new))
154154
.into_inner(),
155155
)
156-
.push_on_response(svc::BoxService::layer())
156+
.push_on_service(svc::BoxService::layer())
157157
.push(svc::BoxNewService::layer())
158158
})
159159
}
@@ -180,7 +180,7 @@ impl<N> Inbound<N> {
180180

181181
let detect = http
182182
.clone()
183-
.push_on_response(svc::MapTargetLayer::new(io::BoxedIo::new))
183+
.push_on_service(svc::MapTargetLayer::new(io::BoxedIo::new))
184184
.push(transport::metrics::NewServer::layer(
185185
rt.metrics.transport.clone(),
186186
))
@@ -209,7 +209,7 @@ impl<N> Inbound<N> {
209209
}
210210
},
211211
svc::stack(forward)
212-
.push_on_response(svc::MapTargetLayer::new(io::BoxedIo::new))
212+
.push_on_service(svc::MapTargetLayer::new(io::BoxedIo::new))
213213
.push(transport::metrics::NewServer::layer(
214214
rt.metrics.transport.clone(),
215215
))
@@ -220,7 +220,7 @@ impl<N> Inbound<N> {
220220
.push(detect::NewDetectService::layer(ConfigureHttpDetect))
221221
.check_new_service::<Detect, I>();
222222

223-
http.push_on_response(svc::MapTargetLayer::new(io::BoxedIo::new))
223+
http.push_on_service(svc::MapTargetLayer::new(io::BoxedIo::new))
224224
.push(transport::metrics::NewServer::layer(
225225
rt.metrics.transport.clone(),
226226
))
@@ -248,7 +248,7 @@ impl<N> Inbound<N> {
248248
},
249249
detect.into_inner(),
250250
)
251-
.push_on_response(svc::BoxService::layer())
251+
.push_on_service(svc::BoxService::layer())
252252
.push(svc::BoxNewService::layer())
253253
.check_new_service::<Tls, I>()
254254
})

‎linkerd/app/inbound/src/direct.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ impl<N> Inbound<N> {
182182
// HTTP detection is not necessary in this case, since the transport
183183
// header indicates the connection's HTTP version.
184184
svc::stack(gateway.clone())
185-
.push_on_response(svc::MapTargetLayer::new(io::EitherIo::Left))
185+
.push_on_service(svc::MapTargetLayer::new(io::EitherIo::Left))
186186
.push_map_target(GatewayConnection::TransportHeader)
187187
.push(transport::metrics::NewServer::layer(
188188
rt.metrics.transport.clone(),
@@ -221,7 +221,7 @@ impl<N> Inbound<N> {
221221
// with transport header support.
222222
svc::stack(gateway)
223223
.push_map_target(GatewayConnection::Legacy)
224-
.push_on_response(svc::MapTargetLayer::new(io::EitherIo::Right))
224+
.push_on_service(svc::MapTargetLayer::new(io::EitherIo::Right))
225225
.push(transport::metrics::NewServer::layer(
226226
rt.metrics.transport.clone(),
227227
))
@@ -239,7 +239,7 @@ impl<N> Inbound<N> {
239239
identity: rt.identity.clone().map(WithTransportHeaderAlpn),
240240
}))
241241
.check_new_service::<T, I>()
242-
.push_on_response(svc::BoxService::layer())
242+
.push_on_service(svc::BoxService::layer())
243243
.push(svc::BoxNewService::layer())
244244
})
245245
}

‎linkerd/app/inbound/src/http/router.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ impl<C> Inbound<C> {
9090
config.proxy.connect.h1_settings,
9191
config.proxy.connect.h2_settings,
9292
))
93-
.push_on_response(svc::MapErrLayer::new(Into::into))
93+
.push_on_service(svc::MapErrLayer::new(Into::into))
9494
.into_new_service()
9595
.push_new_reconnect(config.proxy.connect.backoff)
9696
.check_new_service::<Http, http::Request<_>>()
@@ -103,11 +103,11 @@ impl<C> Inbound<C> {
103103
.http_endpoint
104104
.to_layer::<classify::Response, _, _>(),
105105
)
106-
.push_on_response(http_tracing::client(
106+
.push_on_service(http_tracing::client(
107107
rt.span_sink.clone(),
108108
super::trace_labels(),
109109
))
110-
.push_on_response(http::BoxResponse::layer())
110+
.push_on_service(http::BoxResponse::layer())
111111
.check_new_service::<Logical, http::Request<_>>();
112112

113113
// Attempts to discover a service profile for each logical target (as
@@ -117,10 +117,10 @@ impl<C> Inbound<C> {
117117
.check_new_service::<Logical, http::Request<http::BoxBody>>()
118118
// The HTTP stack doesn't use the profile resolution, so drop it.
119119
.push_map_target(Logical::from)
120-
.push_on_response(http::BoxResponse::layer())
120+
.push_on_service(http::BoxResponse::layer())
121121
.push(profiles::http::route_request::layer(
122122
svc::proxies()
123-
.push_on_response(http::BoxRequest::layer())
123+
.push_on_service(http::BoxRequest::layer())
124124
// Records per-route metrics.
125125
.push(
126126
rt.metrics
@@ -140,7 +140,7 @@ impl<C> Inbound<C> {
140140
direction: metrics::Direction::In,
141141
}
142142
})
143-
.push_on_response(http::BoxResponse::layer())
143+
.push_on_service(http::BoxResponse::layer())
144144
.into_inner(),
145145
))
146146
.push_switch(
@@ -160,7 +160,7 @@ impl<C> Inbound<C> {
160160
Ok(svc::Either::B(logical))
161161
},
162162
http.clone()
163-
.push_on_response(http::BoxResponse::layer())
163+
.push_on_service(http::BoxResponse::layer())
164164
.check_new_service::<Logical, http::Request<_>>()
165165
.into_inner(),
166166
)
@@ -182,7 +182,7 @@ impl<C> Inbound<C> {
182182
Ok(profiles::LookupAddr(addr.into()))
183183
}))
184184
.instrument(|_: &Logical| debug_span!("profile"))
185-
.push_on_response(
185+
.push_on_service(
186186
svc::layers()
187187
.push(http::BoxResponse::layer())
188188
.push(svc::layer::mk(svc::SpawnReady::new)),
@@ -191,11 +191,11 @@ impl<C> Inbound<C> {
191191
.push_when_unready(
192192
config.profile_idle_timeout,
193193
http.clone()
194-
.push_on_response(svc::layer::mk(svc::SpawnReady::new))
194+
.push_on_service(svc::layer::mk(svc::SpawnReady::new))
195195
.into_inner(),
196196
)
197197
.check_new_service::<Logical, http::Request<http::BoxBody>>()
198-
.push_on_response(
198+
.push_on_service(
199199
svc::layers()
200200
.push(rt.metrics.stack.layer(stack_labels("http", "logical")))
201201
.push(svc::FailFast::layer(
@@ -205,7 +205,7 @@ impl<C> Inbound<C> {
205205
.push_spawn_buffer(config.proxy.buffer_capacity),
206206
)
207207
.push_cache(config.proxy.cache_max_idle_age)
208-
.push_on_response(
208+
.push_on_service(
209209
svc::layers()
210210
.push(http::Retain::layer())
211211
.push(http::BoxResponse::layer()),

‎linkerd/app/inbound/src/http/server.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl<H> Inbound<H> {
4444
// the request may have been downgraded from a HTTP/2 orig-proto request.
4545
.push(http::NewNormalizeUri::layer())
4646
.push(NewSetIdentityHeader::layer())
47-
.push_on_response(
47+
.push_on_service(
4848
svc::layers()
4949
// Downgrades the protocol if upgraded by an outbound proxy.
5050
.push(http::orig_proto::Downgrade::layer())
@@ -71,7 +71,7 @@ impl<H> Inbound<H> {
7171
.check_new_service::<T, http::Request<_>>()
7272
.instrument(|t: &T| debug_span!("http", v = %Param::<Version>::param(t)))
7373
.push(http::NewServeHttp::layer(h2_settings, rt.drain.clone()))
74-
.push_on_response(svc::BoxService::layer())
74+
.push_on_service(svc::BoxService::layer())
7575
.push(svc::BoxNewService::layer())
7676
})
7777
}

‎linkerd/app/inbound/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ impl<S> Inbound<S> {
166166
rt.metrics.transport.clone(),
167167
))
168168
.push_make_thunk()
169-
.push_on_response(
169+
.push_on_service(
170170
svc::layers()
171171
.push(tcp::Forward::layer())
172172
.push(drain::Retain::layer(rt.drain.clone())),

0 commit comments

Comments
 (0)