refactor(app/inbound): qualified body metrics imports

see #4180.

to make way for the use of request body metrics middleware, we use
further qualified paths to `body_data::response::NewRecordBodyData`. to
be consistent across the board, we apply this change to the request
counting middleware as well.

NB: this is based upon #4186.

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

Author: cratelyn

linkerd/app/inbound/src/http/router/metrics.rs

@@ -11,8 +11,8 @@ use linkerd_app_core::{
     svc,
 };
 use linkerd_http_prom::{
-    body_data::{response::NewRecordBodyData, BodyDataMetrics},
-    count_reqs::{NewCountRequests, RequestCount},
+    body_data::{self, BodyDataMetrics},
+    count_reqs::{self, NewCountRequests, RequestCount},
 };
 
 pub(super) fn layer<N>(
@@ -25,7 +25,7 @@ pub(super) fn layer<N>(
     N,
     Service = NewCountRequests<
         ExtractRequestCount,
-        NewRecordBodyData<ExtractRecordBodyDataMetrics, N>,
+        body_data::response::NewRecordBodyData<ExtractRecordBodyDataMetrics, N>,
     >,
 > {
     use svc::Layer as _;
@@ -37,16 +37,16 @@ pub(super) fn layer<N>(
 
     let body = {
         let extract = ExtractRecordBodyDataMetrics(response_body_data.clone());
-        NewRecordBodyData::layer_via(extract)
+        body_data::response::NewRecordBodyData::layer_via(extract)
     };
 
     svc::layer::mk(move |inner| count.layer(body.layer(inner)))
 }
 
 #[derive(Clone, Debug)]
 pub struct RequestCountFamilies {
-    grpc: linkerd_http_prom::count_reqs::RequestCountFamilies<RequestCountLabels>,
-    http: linkerd_http_prom::count_reqs::RequestCountFamilies<RequestCountLabels>,
+    grpc: count_reqs::RequestCountFamilies<RequestCountLabels>,
+    http: count_reqs::RequestCountFamilies<RequestCountLabels>,
 }
 
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
@@ -59,8 +59,8 @@ pub struct ExtractRequestCount(pub RequestCountFamilies);
 
 #[derive(Clone, Debug)]
 pub struct ResponseBodyFamilies {
-    grpc: linkerd_http_prom::body_data::response::ResponseBodyFamilies<ResponseBodyDataLabels>,
-    http: linkerd_http_prom::body_data::response::ResponseBodyFamilies<ResponseBodyDataLabels>,
+    grpc: body_data::response::ResponseBodyFamilies<ResponseBodyDataLabels>,
+    http: body_data::response::ResponseBodyFamilies<ResponseBodyDataLabels>,
 }
 
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
@@ -159,12 +159,12 @@ impl ResponseBodyFamilies {
     pub fn register(reg: &mut prom::Registry) -> Self {
         let grpc = {
             let reg = reg.sub_registry_with_prefix("grpc");
-            linkerd_http_prom::body_data::response::ResponseBodyFamilies::register(reg)
+            body_data::response::ResponseBodyFamilies::register(reg)
         };
 
         let http = {
             let reg = reg.sub_registry_with_prefix("http");
-            linkerd_http_prom::body_data::response::ResponseBodyFamilies::register(reg)
+            body_data::response::ResponseBodyFamilies::register(reg)
         };
 
         Self { grpc, http }
@@ -174,7 +174,7 @@ impl ResponseBodyFamilies {
     fn family(
         &self,
         variant: PermitVariant,
-    ) -> &linkerd_http_prom::body_data::response::ResponseBodyFamilies<ResponseBodyDataLabels> {
+    ) -> &body_data::response::ResponseBodyFamilies<ResponseBodyDataLabels> {
         let Self { grpc, http } = self;
         match variant {
             PermitVariant::Grpc => grpc,