fix(qe-wasm): make traces consistent with node-api engine

libs/telemetry/src/formatting.rs

@@ -0,0 +1,22 @@
+use std::fmt;
+
+pub struct QueryForTracing<'a>(pub &'a str);
+
+impl fmt::Display for QueryForTracing<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", strip_query_traceparent(self.0))
+    }
+}
+
+pub fn strip_query_traceparent(query: &str) -> &str {
+    query.rsplit_once("/* traceparent=").map_or(query, |(str, remainder)| {
+        if remainder
+            .split_once("*/")
+            .is_some_and(|(_, suffix)| suffix.trim_end().is_empty())
+        {
+            str.trim_end()
+        } else {
+            query
+        }
+    })
+}

libs/telemetry/src/lib.rs

@@ -1,6 +1,7 @@
 pub mod collector;
 pub mod exporter;
 pub mod filter;
+pub mod formatting;
 pub mod id;
 pub mod layer;
 pub mod models;

quaint/Cargo.toml

@@ -71,6 +71,7 @@ fmt-sql = ["sqlformat"]
 [dependencies]
 connection-string = "0.2"
 percent-encoding = "2"
+telemetry.path = "../libs/telemetry"
 tracing.workspace = true
 tracing-futures.workspace = true
 async-trait.workspace = true

quaint/src/connector/metrics.rs

@@ -1,9 +1,11 @@
+use std::future::Future;
+
+use crosstarget_utils::time::ElapsedTimeCounter;
 use prisma_metrics::{counter, histogram};
+use telemetry::formatting::QueryForTracing;
 use tracing::{info_span, Instrument};
 
 use crate::ast::{Params, Value};
-use crosstarget_utils::time::ElapsedTimeCounter;
-use std::{fmt, future::Future};
 
 pub async fn query<'a, F, T, U>(
     tag: &'static str,
@@ -102,24 +104,3 @@ fn trace_query<'a>(query: &'a str, params: &'a [Value<'_>], result: &str, start:
         duration_ms = start.elapsed_time().as_millis() as u64,
     );
 }
-
-struct QueryForTracing<'a>(&'a str);
-
-impl fmt::Display for QueryForTracing<'_> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", strip_query_traceparent(self.0))
-    }
-}
-
-pub(super) fn strip_query_traceparent(query: &str) -> &str {
-    query.rsplit_once("/* traceparent=").map_or(query, |(str, remainder)| {
-        if remainder
-            .split_once("*/")
-            .is_some_and(|(_, suffix)| suffix.trim_end().is_empty())
-        {
-            str.trim_end()
-        } else {
-            query
-        }
-    })
-}

quaint/src/connector/postgres/native/cache.rs

@@ -6,11 +6,10 @@ use std::{
 use async_trait::async_trait;
 use lru_cache::LruCache;
 use postgres_types::Type;
+use telemetry::formatting::strip_query_traceparent;
 use tokio::sync::Mutex;
 use tokio_postgres::{Client, Error, Statement};
 
-use crate::connector::metrics::strip_query_traceparent;
-
 use super::query::{PreparedQuery, QueryMetadata, TypedQuery};
 
 /// Types that can be used as a cache for prepared queries and statements.

query-engine/driver-adapters/Cargo.toml

@@ -15,6 +15,7 @@ once_cell = "1.15"
 prisma-metrics.path = "../../libs/metrics"
 serde.workspace = true
 serde_json.workspace = true
+telemetry.path = "../../libs/telemetry"
 tracing.workspace = true
 tracing-core = "0.1"
 uuid.workspace = true

query-engine/driver-adapters/src/queryable.rs

@@ -13,6 +13,7 @@ use quaint::{
     prelude::{Query as QuaintQuery, Queryable as QuaintQueryable, ResultSet, TransactionCapable},
     visitor::{self, Visitor},
 };
+use telemetry::formatting::QueryForTracing;
 use tracing::{info_span, Instrument};
 
 /// A JsQueryable adapts a Proxy to implement quaint's Queryable interface. It has the
@@ -188,7 +189,7 @@ impl JsBaseQueryable {
             "prisma:engine:js:query:sql",
             "otel.kind" = "client",
             "db.system" = %self.db_system_name,
-            "db.query.text" = %sql,
+            "db.query.text" = %QueryForTracing(sql),
             user_facing = true,
         );
         let result_set = self.proxy.query_raw(query).instrument(sql_span).await?;
@@ -225,7 +226,7 @@ impl JsBaseQueryable {
             "prisma:engine:js:query:sql",
             "otel.kind" = "client",
             "db.system" = %self.db_system_name,
-            "db.query.text" = %sql,
+            "db.query.text" = %QueryForTracing(sql),
             user_facing = true,
         );
         let affected_rows = self.proxy.execute_raw(query).instrument(sql_span).await?;

query-engine/query-engine-wasm/src/wasm/engine.rs

@@ -207,24 +207,22 @@ impl QueryEngine {
 
             let query = RequestBody::try_from_str(&body, engine.engine_protocol())?;
 
-            async move {
-                let span = tracing::info_span!(
-                    "prisma:engine:query",
-                    user_facing = true,
-                    request_id = tracing::field::Empty,
-                );
+            let span = tracing::info_span!(
+                "prisma:engine:query",
+                user_facing = true,
+                request_id = tracing::field::Empty,
+            );
 
-                let traceparent = start_trace(&request_id, &trace, &span, &exporter).await?;
+            let traceparent = start_trace(&request_id, &trace, &span, &exporter).await?;
 
+            async move {
                 let handler = RequestHandler::new(engine.executor(), engine.query_schema(), engine.engine_protocol());
-                let response = handler
-                    .handle(query, tx_id.map(TxId::from), traceparent)
-                    .instrument(span)
-                    .await;
+                let response = handler.handle(query, tx_id.map(TxId::from), traceparent).await;
 
                 let serde_span = tracing::info_span!("prisma:engine:response_json_serialization", user_facing = true);
                 Ok(serde_span.in_scope(|| serde_json::to_string(&response))?)
             }
+            .instrument(span)
             .await
         }
         .with_subscriber(dispatcher)
@@ -250,17 +248,22 @@ impl QueryEngine {
                 user_facing = true,
                 request_id = tracing::field::Empty,
             );
+
             start_trace(&request_id, &trace, &span, &exporter).await?;
 
-            let tx_opts: TransactionOptions = serde_json::from_str(&input)?;
-            match engine
-                .executor()
-                .start_tx(engine.query_schema().clone(), engine.engine_protocol(), tx_opts)
-                .await
-            {
-                Ok(tx_id) => Ok(json!({ "id": tx_id.to_string() }).to_string()),
-                Err(err) => Ok(map_known_error(err)?),
+            async move {
+                let tx_opts: TransactionOptions = serde_json::from_str(&input)?;
+                match engine
+                    .executor()
+                    .start_tx(engine.query_schema().clone(), engine.engine_protocol(), tx_opts)
+                    .await
+                {
+                    Ok(tx_id) => Ok(json!({ "id": tx_id.to_string() }).to_string()),
+                    Err(err) => Ok(map_known_error(err)?),
+                }
             }
+            .instrument(span)
+            .await
         }
         .with_subscriber(dispatcher)
         .await
@@ -286,9 +289,10 @@ impl QueryEngine {
                 user_facing = true,
                 request_id = tracing::field::Empty
             );
+
             start_trace(&request_id, &trace, &span, &exporter).await?;
 
-            match engine.executor().commit_tx(TxId::from(tx_id)).await {
+            match engine.executor().commit_tx(TxId::from(tx_id)).instrument(span).await {
                 Ok(_) => Ok("{}".to_string()),
                 Err(err) => Ok(map_known_error(err)?),
             }
@@ -317,9 +321,10 @@ impl QueryEngine {
                 user_facing = true,
                 request_id = tracing::field::Empty,
             );
+
             start_trace(&request_id, &trace, &span, &exporter).await?;
 
-            match engine.executor().rollback_tx(TxId::from(tx_id)).await {
+            match engine.executor().rollback_tx(TxId::from(tx_id)).instrument(span).await {
                 Ok(_) => Ok("{}".to_string()),
                 Err(err) => Ok(map_known_error(err)?),
             }