Dedicated HTTP server/client crate

Also have better names for the HTTP routes

crates/cli/src/commands/server.rs

@@ -21,20 +21,15 @@ use std::{
 use anyhow::Context;
 use clap::Parser;
 use futures::{future::TryFutureExt, stream::TryStreamExt};
-use hyper::{header, Server};
+use hyper::Server;
 use mas_config::RootConfig;
 use mas_email::{MailTransport, Mailer};
 use mas_storage::MIGRATOR;
 use mas_tasks::TaskQueue;
 use mas_templates::Templates;
-use tower::{make::Shared, ServiceBuilder};
-use tower_http::{
-    compression::CompressionLayer, sensitive_headers::SetSensitiveHeadersLayer, trace::TraceLayer,
-};
+use tower::make::Shared;
 use tracing::{error, info};
 
-use crate::telemetry::{OtelMakeSpan, OtelOnResponse};
-
 #[derive(Parser, Debug, Default)]
 pub(super) struct Options {
     /// Automatically apply pending migrations
@@ -216,23 +211,7 @@ impl Options {
 
         let warp_service = warp::service(root);
 
-        let service = ServiceBuilder::new()
-            // Add high level tracing/logging to all requests
-            .layer(
-                TraceLayer::new_for_http()
-                    .make_span_with(OtelMakeSpan)
-                    .on_response(OtelOnResponse),
-            )
-            // Set a timeout
-            .timeout(Duration::from_secs(10))
-            // Compress responses
-            .layer(CompressionLayer::new())
-            // Mark the `Authorization` and `Cookie` headers as sensitive so it doesn't show in logs
-            .layer(SetSensitiveHeadersLayer::new(vec![
-                header::AUTHORIZATION,
-                header::COOKIE,
-            ]))
-            .service(warp_service);
+        let service = mas_http::server(warp_service);
 
         info!("Listening on http://{}", listener.local_addr().unwrap());
 

crates/cli/src/telemetry.rs

@@ -16,7 +16,6 @@ use std::{net::SocketAddr, time::Duration};
 
 use anyhow::bail;
 use futures::stream::{Stream, StreamExt};
-use hyper::{header, Version};
 use mas_config::{MetricsExporterConfig, Propagator, TelemetryConfig, TracingExporterConfig};
 use opentelemetry::{
     global,
@@ -27,16 +26,12 @@ use opentelemetry::{
         trace::Tracer,
         Resource,
     },
-    trace::TraceContextExt,
 };
-use opentelemetry_http::HeaderExtractor;
 #[cfg(feature = "jaeger")]
 use opentelemetry_jaeger::Propagator as JaegerPropagator;
 use opentelemetry_semantic_conventions as semcov;
 #[cfg(feature = "zipkin")]
 use opentelemetry_zipkin::{B3Encoding, Propagator as ZipkinPropagator};
-use tower_http::trace::{MakeSpan, OnResponse};
-use tracing::field;
 use url::Url;
 
 pub fn setup(config: &TelemetryConfig) -> anyhow::Result<Option<Tracer>> {
@@ -240,75 +235,3 @@ fn resource() -> Resource {
 
     resource.merge(&detected)
 }
-
-#[derive(Debug, Clone, Default)]
-pub struct OtelMakeSpan;
-
-impl<B> MakeSpan<B> for OtelMakeSpan {
-    fn make_span(&mut self, request: &hyper::Request<B>) -> tracing::Span {
-        // Extract the context from the headers
-        let headers = request.headers();
-        let extractor = HeaderExtractor(headers);
-
-        let cx = opentelemetry::global::get_text_map_propagator(|propagator| {
-            propagator.extract(&extractor)
-        });
-
-        let cx = if cx.span().span_context().is_remote() {
-            cx
-        } else {
-            opentelemetry::Context::new()
-        };
-
-        // Attach the context so when the request span is created it gets properly
-        // parented
-        let _guard = cx.attach();
-
-        let version = match request.version() {
-            Version::HTTP_09 => "0.9",
-            Version::HTTP_10 => "1.0",
-            Version::HTTP_11 => "1.1",
-            Version::HTTP_2 => "2.0",
-            Version::HTTP_3 => "3.0",
-            _ => "",
-        };
-
-        let span = tracing::info_span!(
-            "request",
-            http.method = %request.method(),
-            http.target = %request.uri(),
-            http.flavor = version,
-            http.status_code = field::Empty,
-            http.user_agent = field::Empty,
-            otel.kind = "server",
-            otel.status_code = field::Empty,
-        );
-
-        if let Some(user_agent) = headers
-            .get(header::USER_AGENT)
-            .and_then(|s| s.to_str().ok())
-        {
-            span.record("http.user_agent", &user_agent);
-        }
-
-        span
-    }
-}
-
-#[derive(Debug, Clone, Default)]
-pub struct OtelOnResponse;
-
-impl<B> OnResponse<B> for OtelOnResponse {
-    fn on_response(self, response: &hyper::Response<B>, _latency: Duration, span: &tracing::Span) {
-        let s = response.status();
-        let status = if s.is_success() {
-            "ok"
-        } else if s.is_client_error() || s.is_server_error() {
-            "error"
-        } else {
-            "unset"
-        };
-        span.record("otel.status_code", &status);
-        span.record("http.status_code", &s.as_u16());
-    }
-}