Skip to content

refactor(app/outbound): use svc::layers() to apply layers #4191

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

Closed
wants to merge 1 commit into from
Closed

refactor(app/outbound): use svc::layers() to apply layers #4191

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
30 changes: 20 additions & 10 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
Expand Up @@ -35,7 +35,7 @@ pub fn layer<T, N>(
NewResponseDuration<T, ExtractRecordDurationParams<ResponseMetrics<T::StreamLabel>>, N>,
>,
>,
> + Clone
Copy link
Member

@olix0r olix0r Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's generally good for our layers to be clone, it would preferable to preserve this

Copy link
Member Author

@cratelyn cratelyn Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have not found a clear way to preserve this. i'm rather surprised by this, as i don't see any clear reason why this shouldn't be Clone. i tried wrapping the layer in a svc::layer::mk() call, with and without a call to into_inner() (below), but that didn't seem to work either!

i'd normally put this down, but the layers().push().push() syntax feels nice enough that i'm curious what's standing in the way here.

>
where
T: MkStreamLabel,
N: svc::NewService<T>,
Expand All @@ -59,15 +59,25 @@ where
body_metrics,
} = metrics.clone();

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 duration = {
let extract = ExtractRecordDurationParams(responses.clone());
NewRecordDuration::layer_via(extract)
};

let count_reqs = {
let extract = ExtractRequestCount(requests.clone());
NewCountRequests::layer_via(extract)
};

let body_data = {
let extract = ExtractRecordBodyDataParams(body_metrics.clone());
NewRecordBodyData::layer_via(extract)
};

svc::layers()
.push(duration)
.push(count_reqs)
.push(body_data)
Copy link
Member

@olix0r olix0r Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can do an into_inner() to drop the Layers type wrapper...

Copy link
Member Author

@cratelyn cratelyn Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i opened #4192, which introduces an into_inner() method.

}

#[derive(Clone, Debug)]
Expand Down
Loading