|
1 | 1 | use crate::{policy, stack_labels, Inbound};
|
2 | 2 | use linkerd_app_core::{
|
3 |
| - classify, errors, http_tracing, metrics, profiles, |
| 3 | + classify, errors, http_tracing, profiles, |
4 | 4 | proxy::{http, tap},
|
5 | 5 | svc::{self, ExtractParam, Param},
|
6 | 6 | tls,
|
@@ -333,9 +333,12 @@ impl Param<profiles::http::Route> for ProfileRoute {
|
333 | 333 | }
|
334 | 334 | }
|
335 | 335 |
|
336 |
| -impl Param<metrics::ProfileRouteLabels> for ProfileRoute { |
337 |
| - fn param(&self) -> metrics::ProfileRouteLabels { |
338 |
| - metrics::ProfileRouteLabels::inbound(self.profile.addr.clone(), &self.route) |
| 336 | +impl Param<linkerd_app_core::metrics::ProfileRouteLabels> for ProfileRoute { |
| 337 | + fn param(&self) -> linkerd_app_core::metrics::ProfileRouteLabels { |
| 338 | + linkerd_app_core::metrics::ProfileRouteLabels::inbound( |
| 339 | + self.profile.addr.clone(), |
| 340 | + &self.route, |
| 341 | + ) |
339 | 342 | }
|
340 | 343 | }
|
341 | 344 |
|
@@ -392,9 +395,9 @@ impl Param<transport::labels::Key> for Logical {
|
392 | 395 |
|
393 | 396 | fn endpoint_labels(
|
394 | 397 | unsafe_authority_labels: bool,
|
395 |
| -) -> impl svc::ExtractParam<metrics::EndpointLabels, Logical> + Clone { |
396 |
| - move |t: &Logical| -> metrics::EndpointLabels { |
397 |
| - metrics::InboundEndpointLabels { |
| 398 | +) -> impl svc::ExtractParam<linkerd_app_core::metrics::EndpointLabels, Logical> + Clone { |
| 399 | + move |t: &Logical| -> linkerd_app_core::metrics::EndpointLabels { |
| 400 | + linkerd_app_core::metrics::InboundEndpointLabels { |
398 | 401 | tls: t.tls.as_ref().map(|t| t.labels()),
|
399 | 402 | authority: unsafe_authority_labels
|
400 | 403 | .then(|| t.logical.as_ref().map(|d| d.as_http_authority()))
|
|
0 commit comments