refactor(app): Hoist label extractor out of retry middleware

this commit promotes the `RetryLabelExtract` type out of the route retry
middleware, and into the metrics submodule.

in preparation for generalizing this component, we rename it to
`RouteLabelExtract`.

Signed-off-by: katelyn martin <[email protected]>

Author: cratelyn

linkerd/app/outbound/src/http/logical/policy/route.rs

@@ -132,7 +132,7 @@ where
                             route_ref,
                             ..
                         } = &rt.params;
-                        retry::RetryLabelExtract(parent_ref.clone(), route_ref.clone())
+                        metrics::labels::RouteLabelExtract(parent_ref.clone(), route_ref.clone())
                     };
                     let metrics = metrics.retry.clone();
                     retry::NewHttpRetry::layer_via_mk(mk_extract, metrics)

linkerd/app/outbound/src/http/logical/policy/route/metrics/labels.rs

@@ -1,6 +1,7 @@
 //! Prometheus label types.
 use linkerd_app_core::{
-    dns, errors, metrics::prom::EncodeLabelSetMut, proxy::http, Error as BoxError,
+    dns, errors, metrics::prom::EncodeLabelSetMut, proxy::http, svc::ExtractParam,
+    Error as BoxError,
 };
 use prometheus_client::encoding::*;
 
@@ -39,6 +40,9 @@ pub struct GrpcRsp {
     pub error: Option<Error>,
 }
 
+#[derive(Clone, Debug)]
+pub struct RouteLabelExtract(pub ParentRef, pub RouteRef);
+
 #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
 pub enum Error {
     FailFast,
@@ -211,6 +215,17 @@ impl EncodeLabelSet for GrpcRsp {
     }
 }
 
+// === impl RouteLabelExtract ===
+
+impl<B> ExtractParam<Route, http::Request<B>> for RouteLabelExtract {
+    fn extract_param(&self, t: &http::Request<B>) -> Route {
+        let Self(parent, route) = self;
+        let uri = t.uri();
+
+        Route::new(parent.clone(), route.clone(), uri)
+    }
+}
+
 // === impl Error ===
 
 impl Error {

linkerd/app/outbound/src/http/logical/policy/route/retry.rs

@@ -1,12 +1,14 @@
-use super::{extensions, metrics::labels::Route as RouteLabels};
-use crate::{ParentRef, RouteRef};
+use super::{
+    extensions,
+    metrics::labels::{Route as RouteLabels, RouteLabelExtract},
+};
 use futures::future::{Either, Ready};
 use linkerd_app_core::{
     cause_ref, classify,
     exp_backoff::ExponentialBackoff,
     is_caused_by,
     proxy::http::{self, stream_timeouts::ResponseTimeoutError},
-    svc::{self, http::h2, ExtractParam},
+    svc::{self, http::h2},
     Error, Result,
 };
 use linkerd_http_retry::{self as retry, peek_trailers::PeekTrailersBody};
@@ -18,7 +20,7 @@ use tokio::time;
 pub struct IsRetry(());
 
 pub type NewHttpRetry<F, N> =
-    retry::NewHttpRetry<RetryPolicy, RouteLabels, F, RetryLabelExtract, N>;
+    retry::NewHttpRetry<RetryPolicy, RouteLabels, F, RouteLabelExtract, N>;
 
 #[derive(Clone, Debug)]
 pub struct RetryPolicy {
@@ -31,9 +33,6 @@ pub struct RetryPolicy {
     pub backoff: Option<ExponentialBackoff>,
 }
 
-#[derive(Clone, Debug)]
-pub struct RetryLabelExtract(pub ParentRef, pub RouteRef);
-
 pub type RouteRetryMetrics = retry::MetricFamilies<RouteLabels>;
 
 // === impl RetryPolicy ===
@@ -163,14 +162,3 @@ impl RetryPolicy {
         false
     }
 }
-
-// === impl RetryLabelExtract ===
-
-impl<B> ExtractParam<RouteLabels, http::Request<B>> for RetryLabelExtract {
-    fn extract_param(&self, t: &http::Request<B>) -> RouteLabels {
-        let Self(parent, route) = self;
-        let uri = t.uri();
-
-        RouteLabels::new(parent.clone(), route.clone(), uri)
-    }
-}