From 0014c6b321b67e8d77a98443eb4389c66549adee Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Thu, 26 Sep 2024 16:43:55 +0200 Subject: [PATCH] Make binary engine span names consistent with library engine --- query-engine/query-engine/src/server/mod.rs | 31 +++++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/query-engine/query-engine/src/server/mod.rs b/query-engine/query-engine/src/server/mod.rs index 2a49683227e..a94b5f3e8a1 100644 --- a/query-engine/query-engine/src/server/mod.rs +++ b/query-engine/query-engine/src/server/mod.rs @@ -112,7 +112,8 @@ async fn request_handler(cx: Arc, req: Request) -> Result, req: Request) - let mut tx_opts: TransactionOptions = serde_json::from_slice(full_body.as_ref()).unwrap(); let tx_id = Some(tx_opts.with_new_transaction_id()); - let (span, _traceparent, capturer) = setup_telemetry(&headers, &tx_id).await; + let (span, _traceparent, capturer) = setup_telemetry( + info_span!("prisma:engine:start_transaction", user_facing = true), + &headers, + &tx_id, + ) + .await; let result = cx .executor @@ -258,7 +264,12 @@ async fn transaction_commit_handler( req: Request, tx_id: TxId, ) -> Result, hyper::Error> { - let (span, _traceparent, capturer) = setup_telemetry(req.headers(), &Some(tx_id.clone())).await; + let (span, _traceparent, capturer) = setup_telemetry( + info_span!("prisma:engine:commit_transaction", user_facing = true), + req.headers(), + &Some(tx_id.clone()), + ) + .await; let result = cx.executor.commit_tx(tx_id).instrument(span).await; @@ -274,7 +285,12 @@ async fn transaction_rollback_handler( req: Request, tx_id: TxId, ) -> Result, hyper::Error> { - let (span, _traceparent, capturer) = setup_telemetry(req.headers(), &Some(tx_id.clone())).await; + let (span, _traceparent, capturer) = setup_telemetry( + info_span!("prisma:engine:rollback_transaction", user_facing = true), + req.headers(), + &Some(tx_id.clone()), + ) + .await; let result = cx.executor.rollback_tx(tx_id).instrument(span).await; @@ -355,7 +371,11 @@ fn err_to_http_resp( build_json_response(status, &err) } -async fn setup_telemetry(headers: &HeaderMap, tx_id: &Option) -> (Span, Option, Capturer) { +async fn setup_telemetry( + span: Span, + headers: &HeaderMap, + tx_id: &Option, +) -> (Span, Option, Capturer) { let capture_settings = { let settings = headers .get("X-capture-telemetry") @@ -377,7 +397,6 @@ async fn setup_telemetry(headers: &HeaderMap, tx_id: &Option) -> (Span, Op } }; - let span = info_span!("prisma:engine", user_facing = true); let traceparent = if let Some(parent_context) = parent_context { let requester_traceparent = TraceParent::from_remote_context(&parent_context); span.set_parent(parent_context);