refactor(app/inbound): clean up body metrics imports

now that we have request and response layers, we use consistent paths
for each.

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

Author: cratelyn

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

@@ -11,7 +11,7 @@ use linkerd_app_core::{
     svc,
 };
 use linkerd_http_prom::{
-    body_data::response::{BodyDataMetrics, NewRecordBodyData},
+    body_data::{self, BodyDataMetrics},
     count_reqs::{NewCountRequests, RequestCount},
 };
 
@@ -26,9 +26,9 @@ pub(super) fn layer<N>(
     N,
     Service = NewCountRequests<
         ExtractRequestCount,
-        NewRecordBodyData<
+        body_data::response::NewRecordBodyData<
             ExtractResponseBodyDataMetrics,
-            linkerd_http_prom::body_data::request::NewRecordBodyData<
+            body_data::request::NewRecordBodyData<
                 N,
                 ExtractRequestBodyDataParams,
                 ExtractRequestBodyDataMetrics,
@@ -45,12 +45,12 @@ pub(super) fn layer<N>(
 
     let body = {
         let extract = ExtractResponseBodyDataMetrics(response_body_data.clone());
-        NewRecordBodyData::layer_via(extract)
+        body_data::response::NewRecordBodyData::layer_via(extract)
     };
 
     let request = {
         let extract = ExtractRequestBodyDataParams(request_body_data.clone());
-        linkerd_http_prom::body_data::request::NewRecordBodyData::new(extract)
+        body_data::request::NewRecordBodyData::new(extract)
     };
 
     svc::layer::mk(move |inner| count.layer(body.layer(request.layer(inner))))
@@ -72,8 +72,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)]
@@ -86,8 +86,8 @@ pub struct ExtractResponseBodyDataMetrics(ResponseBodyFamilies);
 
 #[derive(Clone, Debug)]
 pub struct RequestBodyFamilies {
-    grpc: linkerd_http_prom::body_data::request::RequestBodyFamilies<RequestBodyDataLabels>,
-    http: linkerd_http_prom::body_data::request::RequestBodyFamilies<RequestBodyDataLabels>,
+    grpc: body_data::request::RequestBodyFamilies<RequestBodyDataLabels>,
+    http: body_data::request::RequestBodyFamilies<RequestBodyDataLabels>,
 }
 
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
@@ -189,12 +189,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 }
@@ -204,7 +204,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,
@@ -270,12 +270,12 @@ impl RequestBodyFamilies {
     pub fn register(reg: &mut prom::Registry) -> Self {
         let grpc = {
             let reg = reg.sub_registry_with_prefix("grpc");
-            linkerd_http_prom::body_data::request::RequestBodyFamilies::register(reg)
+            body_data::request::RequestBodyFamilies::register(reg)
         };
 
         let http = {
             let reg = reg.sub_registry_with_prefix("http");
-            linkerd_http_prom::body_data::request::RequestBodyFamilies::register(reg)
+            body_data::request::RequestBodyFamilies::register(reg)
         };
 
         Self { grpc, http }
@@ -285,7 +285,7 @@ impl RequestBodyFamilies {
     fn family(
         &self,
         variant: PermitVariant,
-    ) -> &linkerd_http_prom::body_data::request::RequestBodyFamilies<RequestBodyDataLabels> {
+    ) -> &body_data::request::RequestBodyFamilies<RequestBodyDataLabels> {
         let Self { grpc, http } = self;
         match variant {
             PermitVariant::Grpc => grpc,