Skip to content

refactor(app/outbound): simplify backend metrics layer #4299

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
cratelyn merged 2 commits into from
Nov 17, 2025
Merged

refactor(app/outbound): simplify backend metrics layer #4299

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2026cf0
refactor(app/outbound): simplify backend layer construction
cratelyn Nov 10, 2025
602333c
refactor(app/outbound): type aliases in backend metrics layer
cratelyn Nov 10, 2025
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
40 changes: 21 additions & 19 deletions linkerd/app/outbound/src/http/logical/policy/route/backend/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use crate::{BackendRef, ParentRef, RouteRef};
use linkerd_app_core::{metrics::prom, svc};
use linkerd_http_prom::{
body_data::response::{BodyDataMetrics, NewRecordBodyData, ResponseBodyFamilies},
count_reqs::{NewCountRequests, RequestCount, RequestCountFamilies},
record_response::{self, NewResponseDuration},
body_data::response::{BodyDataMetrics, ResponseBodyFamilies},
count_reqs::{RequestCount, RequestCountFamilies},
record_response,
stream_label::{LabelSet, StreamLabel},
};

Expand All @@ -30,18 +30,19 @@ type ResponseMetrics<L> = record_response::ResponseMetrics<
<L as StreamLabel>::StatusLabels,
>;

type Instrumented<T, N> = NewRecordBodyData<NewCountRequests<NewResponseDuration<T, N>>>;
type NewRecordBodyData<N> =
linkerd_http_prom::body_data::response::NewRecordBodyData<ExtractRecordBodyDataParams, N>;
type NewCountRequests<N> = linkerd_http_prom::count_reqs::NewCountRequests<ExtractRequestCount, N>;
type NewResponseDuration<T, N> = linkerd_http_prom::record_response::NewResponseDuration<
T,
ExtractRecordDurationParams<ResponseMetrics<<T as MkStreamLabel>::StreamLabel>>,
N,
>;

pub fn layer<T, N>(
metrics: &RouteBackendMetrics<T::StreamLabel>,
) -> impl svc::Layer<
N,
Service = NewRecordBodyData<
ExtractRecordBodyDataParams,
NewCountRequests<
ExtractRequestCount,
NewResponseDuration<T, ExtractRecordDurationParams<ResponseMetrics<T::StreamLabel>>, N>,
>,
>,
> + Clone
) -> impl svc::Layer<N, Service = Instrumented<T, N>> + Clone
where
T: MkStreamLabel,
T::DurationLabels: LabelSet,
Expand All @@ -56,12 +57,13 @@ where

svc::layer::mk(move |inner| {
use svc::Layer;
NewRecordBodyData::layer_via(ExtractRecordBodyDataParams(body_metrics.clone())).layer(
NewCountRequests::layer_via(ExtractRequestCount(requests.clone())).layer(
NewRecordDuration::layer_via(ExtractRecordDurationParams(responses.clone()))
.layer(inner),
),
)

let record = NewRecordDuration::layer_via(ExtractRecordDurationParams(responses.clone()));
let count = NewCountRequests::layer_via(ExtractRequestCount(requests.clone()));
let body_data =
NewRecordBodyData::layer_via(ExtractRecordBodyDataParams(body_metrics.clone()));

body_data.layer(count.layer(record.layer(inner)))
})
}

Expand Down
Loading