Skip to content

refactor(app/inbound): use full import path for metrics labels #4122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 2, 2025
Merged

refactor(app/inbound): use full import path for metrics labels #4122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions linkerd/app/inbound/src/http/router.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{policy, stack_labels, Inbound};
use linkerd_app_core::{
classify, errors, http_tracing, metrics, profiles,
classify, errors, http_tracing, profiles,
proxy::{http, tap},
svc::{self, ExtractParam, Param},
tls,
Expand Down Expand Up @@ -333,9 +333,12 @@ impl Param<profiles::http::Route> for ProfileRoute {
}
}

impl Param<metrics::ProfileRouteLabels> for ProfileRoute {
fn param(&self) -> metrics::ProfileRouteLabels {
metrics::ProfileRouteLabels::inbound(self.profile.addr.clone(), &self.route)
impl Param<linkerd_app_core::metrics::ProfileRouteLabels> for ProfileRoute {
fn param(&self) -> linkerd_app_core::metrics::ProfileRouteLabels {
linkerd_app_core::metrics::ProfileRouteLabels::inbound(
self.profile.addr.clone(),
&self.route,
)
}
}

Expand Down Expand Up @@ -392,9 +395,9 @@ impl Param<transport::labels::Key> for Logical {

fn endpoint_labels(
unsafe_authority_labels: bool,
) -> impl svc::ExtractParam<metrics::EndpointLabels, Logical> + Clone {
move |t: &Logical| -> metrics::EndpointLabels {
metrics::InboundEndpointLabels {
) -> impl svc::ExtractParam<linkerd_app_core::metrics::EndpointLabels, Logical> + Clone {
move |t: &Logical| -> linkerd_app_core::metrics::EndpointLabels {
linkerd_app_core::metrics::InboundEndpointLabels {
tls: t.tls.as_ref().map(|t| t.labels()),
authority: unsafe_authority_labels
.then(|| t.logical.as_ref().map(|d| d.as_http_authority()))
Expand Down
Loading