From 4d837da7a7bf93239f2546ae9e0c3f6f190abb6d Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Thu, 5 Nov 2020 17:52:32 -0500
Subject: [PATCH] that was a bad idea

---
 backend/src/main.rs         |  2 +-
 backend/src/rocket_trace.rs | 69 ++++---------------------------------
 2 files changed, 7 insertions(+), 64 deletions(-)

diff --git a/backend/src/main.rs b/backend/src/main.rs
index 5d76b96..b094231 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -60,7 +60,7 @@ fn main() -> Result<()> {
         .attach(cors)
         .attach(MainDatabase::fairing())
         .attach(SpaceHelmet::default())
-        .attach(TraceRequest {})
+        .attach(RequestId {})
         .attach(paseto::ed25519_keypair())
         .attach(DiscordWebhook::fairing())
         .attach(Mastodon::fairing())
diff --git a/backend/src/rocket_trace.rs b/backend/src/rocket_trace.rs
index 4463d4d..ec5c39b 100644
--- a/backend/src/rocket_trace.rs
+++ b/backend/src/rocket_trace.rs
@@ -1,91 +1,34 @@
 use rocket::fairing::{Fairing, Info, Kind};
-use rocket::http::{ContentType, Header, Method, Status};
+use rocket::http::Header;
 use rocket::{Data, Request, Response};
 use rusty_ulid::generate_ulid_string;
-use std::mem;
-use tracing::{span, span::Entered, Level, Span};
 
-struct SpanWrapper<'a> {
-    span: Box<Span>,
-    entered: Entered<'a>,
-}
+pub struct RequestId;
 
-pub struct TraceRequest;
-
-impl Fairing for TraceRequest {
+impl Fairing for RequestId {
     fn info(&self) -> Info {
         Info {
-            name: "Tracing spans per request",
+            name: "Request ID",
             kind: Kind::Request | Kind::Response,
         }
     }
 
     fn on_request(&self, request: &mut Request, _: &Data) {
-        let reqid: String = match request.headers().get_one("X-Request-Id") {
-            Some(reqid) => reqid.to_string(),
+        match request.headers().get_one("X-Request-Id") {
+            Some(_) => {}
             None => {
                 let reqid = generate_ulid_string();
                 request.add_header(Header::new("X-Request-Id", reqid.clone()));
-                reqid
             }
         };
-
-        request.local_cache(|| {
-            let span = span!(
-                Level::INFO,
-                "request",
-                method = &request.method().to_string()[..],
-                uri = &request.uri().to_string()[..],
-                addr = &request
-                    .client_ip()
-                    .map(|ip| ip.to_string())
-                    .unwrap_or("unknown".to_string())[..],
-                request_id = &reqid[..],
-            );
-            let span = Box::new(span);
-            let entered = span.enter();
-            let entered_lt = unsafe { mem::transmute::<_, Entered<'static>>(entered) };
-
-            Box::new(SpanWrapper {
-                entered: entered_lt,
-                span: span,
-            })
-        });
     }
 
     fn on_response(&self, request: &Request, response: &mut Response) {
-        let span: &Box<SpanWrapper> = request.local_cache(|| {
-            Box::new({
-                let span = error_span!(
-                    "somehow the span wasn't put into the request, neat",
-                    method = &request.method().to_string()[..],
-                    uri = &request.uri().to_string()[..],
-                    address = &request
-                        .real_ip()
-                        .map(|ip| ip.to_string())
-                        .unwrap_or("unknown".to_string())[..],
-                );
-
-                let span = Box::new(span);
-                let entered = span.enter();
-                let entered_lt = unsafe { mem::transmute::<_, Entered<'static>>(entered) };
-
-                SpanWrapper {
-                    entered: entered_lt,
-                    span: span,
-                }
-            })
-        });
         match request.headers().get_one("X-Request-Id") {
             Some(reqid) => {
                 response.set_header(Header::new("X-Request-Id", format!("{}", reqid)));
             }
             None => {}
         };
-        info!(
-            status_code = &response.status().code,
-            status_reason = response.status().reason
-        );
-        drop(span);
     }
 }