From 51d48d082edd65b6a4ea78db7c772b840f36f42a Mon Sep 17 00:00:00 2001 From: Miguel Fernandez Date: Mon, 23 Jan 2023 12:51:56 +0100 Subject: [PATCH] Fix tracing when no sampling traceparent is given --- query-engine/query-engine/src/server/mod.rs | 29 ++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/query-engine/query-engine/src/server/mod.rs b/query-engine/query-engine/src/server/mod.rs index 3f38c19cf022..925588d7dafc 100644 --- a/query-engine/query-engine/src/server/mod.rs +++ b/query-engine/query-engine/src/server/mod.rs @@ -113,11 +113,17 @@ async fn graphql_handler(state: State, req: Request) -> Result) -> Result) -> Result, hyper::Error> { let path = req.uri().path().to_owned(); let sections: Vec<&str> = path.split('/').collect(); - let span = info_span!("prisma:engine:itx_runner", user_facing = true, itx_id = field::Empty); if sections.len() == 3 && sections[2] == "start" { - return transaction_start_handler(state, req).instrument(span).await; + return transaction_start_handler(state, req).await; } if sections.len() == 4 && sections[3] == "commit" { - return transaction_commit_handler(state, sections[2].into()) - .instrument(span) - .await; + return transaction_commit_handler(state, sections[2].into()).await; } if sections.len() == 4 && sections[3] == "rollback" { - return transaction_rollback_handler(state, sections[2].into()) - .instrument(span) - .await; + return transaction_rollback_handler(state, sections[2].into()).await; } let res = Response::builder() @@ -245,16 +246,20 @@ async fn transaction_handler(state: State, req: Request) -> Result) -> Result, hyper::Error> { + let cx = get_parent_span_context(req.headers()); let body_start = req.into_body(); // block and buffer request until the request has completed let full_body = hyper::body::to_bytes(body_start).await?; let tx_opts: TransactionOptions = serde_json::from_slice(full_body.as_ref()).unwrap(); + let span = info_span!("prisma:engine:itx_runner", user_facing = true, itx_id = field::Empty); + span.set_parent(cx); + let result = state .cx .executor .start_tx(state.cx.query_schema().clone(), &tx_opts) - .instrument(Span::current()) + .instrument(span) .await; match result {