наблюдаемость: ввести безопасный контракт метрик

crates/crank-adapter-rest/Cargo.toml

@@ -9,9 +9,9 @@ version.workspace = true
 [dependencies]
 async-trait = "0.1"
 crank-core = { path = "../crank-core" }
+crank-metrics = { path = "../crank-metrics" }
 crank-trace = { path = "../crank-trace" }
 futures-util = "0.3"
-metrics.workspace = true
 opentelemetry.workspace = true
 reqwest = { workspace = true, features = ["stream"] }
 serde.workspace = true

crates/crank-adapter-rest/src/client.rs

@@ -7,6 +7,7 @@ use std::{
 };
 
 use crank_core::{HttpMethod, RestTarget};
+use crank_metrics::{UpstreamOperationKind, UpstreamOutcome, UpstreamRequestMetrics};
 use crank_trace::{ErrorCategory, Stage, StageOutcome};
 use futures_util::StreamExt;
 use opentelemetry::{global, propagation::Injector, trace::TraceContextExt};
@@ -71,24 +72,13 @@ impl RestAdapter {
         target: &RestTarget,
         request: &RestRequest,
     ) -> Result<RestResponse, RestAdapterError> {
-        let started_at = std::time::Instant::now();
+        let request_metrics = UpstreamRequestMetrics::start(UpstreamOperationKind::Rest);
         let result = self.execute_inner(target, request).await;
         let outcome = match &result {
-            Ok(_) => "success",
+            Ok(_) => UpstreamOutcome::Success,
             Err(error) => upstream_outcome(error),
         };
-        metrics::counter!(
-            "crank_upstream_requests_total",
-            "operation_kind" => "rest",
-            "outcome" => outcome
-        )
-        .increment(1);
-        metrics::histogram!(
-            "crank_upstream_request_duration_seconds",
-            "operation_kind" => "rest",
-            "outcome" => outcome
-        )
-        .record(started_at.elapsed().as_secs_f64());
+        request_metrics.complete(outcome);
         result
     }
 
@@ -149,27 +139,27 @@ impl RestAdapter {
     }
 }
 
-fn upstream_outcome(error: &RestAdapterError) -> &'static str {
+fn upstream_outcome(error: &RestAdapterError) -> UpstreamOutcome {
     match error {
         RestAdapterError::UnexpectedStatus { status, .. } if (400..500).contains(status) => {
-            "client_error"
+            UpstreamOutcome::ClientError
         }
         RestAdapterError::UnexpectedStatus { status, .. } if (500..600).contains(status) => {
-            "server_error"
+            UpstreamOutcome::ServerError
         }
-        RestAdapterError::UnexpectedStatus { .. } => "unexpected_status",
-        RestAdapterError::Transport(error) if error.is_timeout() => "timeout",
-        RestAdapterError::Transport(_) => "transport_error",
-        RestAdapterError::ResponseTooLarge { .. } => "response_too_large",
-        RestAdapterError::TargetNotAllowed { .. } => "rejected",
-        RestAdapterError::WindowExpired => "window_expired",
-        RestAdapterError::InvalidSseEvent => "invalid_response",
+        RestAdapterError::UnexpectedStatus { .. } => UpstreamOutcome::UnexpectedStatus,
+        RestAdapterError::Transport(error) if error.is_timeout() => UpstreamOutcome::Timeout,
+        RestAdapterError::Transport(_) => UpstreamOutcome::TransportError,
+        RestAdapterError::ResponseTooLarge { .. } => UpstreamOutcome::ResponseTooLarge,
+        RestAdapterError::TargetNotAllowed { .. } => UpstreamOutcome::Rejected,
+        RestAdapterError::WindowExpired => UpstreamOutcome::WindowExpired,
+        RestAdapterError::InvalidSseEvent => UpstreamOutcome::InvalidResponse,
         RestAdapterError::InvalidBaseUrl { .. }
         | RestAdapterError::InvalidPathParameter { .. }
         | RestAdapterError::InvalidQueryParameter { .. }
         | RestAdapterError::InvalidHeaderName { .. }
-        | RestAdapterError::InvalidHeaderValue { .. } => "invalid_request",
-        RestAdapterError::InvalidConfiguration { .. } => "configuration",
+        | RestAdapterError::InvalidHeaderValue { .. } => UpstreamOutcome::InvalidRequest,
+        RestAdapterError::InvalidConfiguration { .. } => UpstreamOutcome::Configuration,
     }
 }