refactor: rename metrics to prometheus metrics

Signed-off-by: Gustavo Inacio <[email protected]>

Author: gusinacio

crates/service/src/middleware.rs

@@ -6,11 +6,11 @@ mod inject_deployment;
 mod inject_labels;
 mod inject_receipt;
 mod inject_sender;
-mod metrics;
+mod prometheus_metrics;
 
 pub use inject_allocation::{allocation_middleware, Allocation, AllocationState};
 pub use inject_deployment::deployment_middleware;
 pub use inject_labels::labels_middleware;
 pub use inject_receipt::receipt_middleware;
 pub use inject_sender::{sender_middleware, Sender, SenderState};
-pub use metrics::MetricsMiddlewareLayer;
+pub use prometheus_metrics::PrometheusMetricsMiddlewareLayer;

crates/service/src/middleware/inject_labels.rs

@@ -13,7 +13,7 @@ use thegraph_core::DeploymentId;
 use super::{
     inject_allocation::Allocation,
     inject_sender::Sender,
-    metrics::{MetricLabelProvider, MetricLabels},
+    prometheus_metrics::{MetricLabelProvider, MetricLabels},
 };
 
 const NO_DEPLOYMENT_ID: &str = "no-deployment";
@@ -78,7 +78,7 @@ pub async fn labels_middleware(mut request: Request, next: Next) -> Response {
 #[cfg(test)]
 mod tests {
     use crate::middleware::{
-        inject_allocation::Allocation, inject_sender::Sender, metrics::MetricLabels,
+        inject_allocation::Allocation, inject_sender::Sender, prometheus_metrics::MetricLabels,
     };
 
     use super::labels_middleware;

crates/service/src/middleware/metrics.rs renamed to crates/service/src/middleware/prometheus_metrics.rs

@@ -21,52 +21,52 @@ pub trait MetricLabelProvider {
 }
 
 #[derive(Clone)]
-pub struct MetricsMiddleware<S> {
+pub struct PrometheusMetricsMiddleware<S> {
     inner: S,
     histogram: prometheus::HistogramVec,
     failure: prometheus::CounterVec,
 }
 
 #[derive(Clone)]
-pub struct MetricsMiddlewareLayer {
+pub struct PrometheusMetricsMiddlewareLayer {
     histogram: prometheus::HistogramVec,
     failure: prometheus::CounterVec,
 }
 
-impl MetricsMiddlewareLayer {
+impl PrometheusMetricsMiddlewareLayer {
     pub fn new(histogram: prometheus::HistogramVec, failure: prometheus::CounterVec) -> Self {
         Self { histogram, failure }
     }
 }
 
-impl<S> Layer<S> for MetricsMiddlewareLayer {
-    type Service = MetricsMiddleware<S>;
+impl<S> Layer<S> for PrometheusMetricsMiddlewareLayer {
+    type Service = PrometheusMetricsMiddleware<S>;
 
     fn layer(&self, inner: S) -> Self::Service {
-        MetricsMiddleware {
+        PrometheusMetricsMiddleware {
             inner,
             histogram: self.histogram.clone(),
             failure: self.failure.clone(),
         }
     }
 }
 
-impl<S, ReqBody> Service<Request<ReqBody>> for MetricsMiddleware<S>
+impl<S, ReqBody> Service<Request<ReqBody>> for PrometheusMetricsMiddleware<S>
 where
     S: Service<Request<ReqBody>> + Clone + 'static,
     ReqBody: 'static,
 {
     type Response = S::Response;
     type Error = S::Error;
-    type Future = MetricsFuture<S::Future>;
+    type Future = PrometheusMetricsFuture<S::Future>;
 
     fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self.inner.poll_ready(cx)
     }
 
-    fn call(&mut self, request: Request<ReqBody>) -> MetricsFuture<S::Future> {
+    fn call(&mut self, request: Request<ReqBody>) -> PrometheusMetricsFuture<S::Future> {
         let labels = request.extensions().get::<MetricLabels>().cloned();
-        MetricsFuture {
+        PrometheusMetricsFuture {
             timer: None,
             histogram: self.histogram.clone(),
             failure: self.failure.clone(),
@@ -77,7 +77,7 @@ where
 }
 
 #[pin_project]
-pub struct MetricsFuture<F> {
+pub struct PrometheusMetricsFuture<F> {
     /// Instant at which we started the requst.
     timer: Option<HistogramTimer>,
 
@@ -90,7 +90,7 @@ pub struct MetricsFuture<F> {
     fut: F,
 }
 
-impl<F, R, E> Future for MetricsFuture<F>
+impl<F, R, E> Future for PrometheusMetricsFuture<F>
 where
     F: Future<Output = Result<R, E>>,
 {
@@ -137,7 +137,7 @@ mod tests {
     use prometheus::core::Collector;
     use tower::{Service, ServiceBuilder, ServiceExt};
 
-    use crate::middleware::metrics::{MetricLabels, MetricsMiddlewareLayer};
+    use crate::middleware::prometheus_metrics::{MetricLabels, PrometheusMetricsMiddlewareLayer};
 
     use super::MetricLabelProvider;
 
@@ -190,7 +190,7 @@ mod tests {
         );
 
         let metrics_layer =
-            MetricsMiddlewareLayer::new(histogram_metric.clone(), failure_metric.clone());
+            PrometheusMetricsMiddlewareLayer::new(histogram_metric.clone(), failure_metric.clone());
         let mut service = ServiceBuilder::new()
             .layer(metrics_layer)
             .service_fn(handle);
@@ -219,7 +219,7 @@ mod tests {
         );
 
         let metrics_layer =
-            MetricsMiddlewareLayer::new(histogram_metric.clone(), failure_metric.clone());
+            PrometheusMetricsMiddlewareLayer::new(histogram_metric.clone(), failure_metric.clone());
         let mut service = ServiceBuilder::new()
             .layer(metrics_layer)
             .service_fn(handle_err);

crates/service/src/service/indexer_service.rs

@@ -40,7 +40,7 @@ use crate::{
     metrics::{HANDLER_FAILURE, HANDLER_HISTOGRAM},
     middleware::{
         allocation_middleware, deployment_middleware, labels_middleware, receipt_middleware,
-        sender_middleware, AllocationState, MetricsMiddlewareLayer, SenderState,
+        sender_middleware, AllocationState, PrometheusMetricsMiddlewareLayer, SenderState,
     },
     routes::{health, request_handler, static_subgraph_request_handler},
     tap::IndexerTapContext,
@@ -382,7 +382,7 @@ pub async fn run(options: IndexerServiceOptions) -> Result<(), anyhow::Error> {
         // inject metrics labels
         .layer(from_fn(labels_middleware))
         // metrics for histogram and failure
-        .layer(MetricsMiddlewareLayer::new(
+        .layer(PrometheusMetricsMiddlewareLayer::new(
             HANDLER_HISTOGRAM.clone(),
             HANDLER_FAILURE.clone(),
         ));