Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integration branch for #4336 #4823

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
+13 −29
Draft

Integration branch for #4336 #4823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3450f5
qe: always create a span for `prisma:engine` regardless of iTX
aqrln Oct 6, 2023
b5bdd13
Merge branch 'main' into qe-always-create-a-span-for-prisma-engine-re…
Druue Apr 10, 2024
71fd6b6
qe-wasm: add json serialization span and expand engine span
aqrln Apr 10, 2024
46637e0
qe-wasm: remove unused import
aqrln Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 2 additions & 7 deletions query-engine/query-engine-node-api/src/engine.rs
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ use serde::Deserialize;
use serde_json::json;
use std::{collections::HashMap, future::Future, marker::PhantomData, panic::AssertUnwindSafe, sync::Arc};
use tokio::sync::RwLock;
use tracing::{field, instrument::WithSubscriber, Instrument, Span};
use tracing::{field, instrument::WithSubscriber, Instrument};
use tracing_subscriber::filter::LevelFilter;
use user_facing_errors::Error;

Expand Down Expand Up @@ -319,12 +319,7 @@ impl QueryEngine {

let query = RequestBody::try_from_str(&body, engine.engine_protocol())?;

let span = if tx_id.is_none() {
tracing::info_span!("prisma:engine", user_facing = true)
} else {
Span::none()
};

let span = tracing::info_span!("prisma:engine", user_facing = true);
let trace_id = telemetry::helpers::set_parent_context_from_json_str(&span, &trace);

async move {
Expand Down
22 changes: 8 additions & 14 deletions query-engine/query-engine-wasm/src/wasm/engine.rs
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ use request_handlers::{load_executor, RequestBody, RequestHandler};
use serde_json::json;
use std::{marker::PhantomData, sync::Arc};
use tokio::sync::RwLock;
use tracing::{field, instrument::WithSubscriber, Instrument, Level, Span};
use tracing::{field, instrument::WithSubscriber, Instrument, Level};
use tracing_subscriber::filter::LevelFilter;
use wasm_bindgen::prelude::wasm_bindgen;

Expand Down Expand Up @@ -188,23 +188,17 @@ impl QueryEngine {

let query = RequestBody::try_from_str(&body, engine.engine_protocol())?;

async move {
let span = if tx_id.is_none() {
tracing::info_span!("prisma:engine", user_facing = true)
} else {
Span::none()
};

let trace_id = telemetry::helpers::set_parent_context_from_json_str(&span, &trace);
let span = tracing::info_span!("prisma:engine", user_facing = true);
let trace_id = telemetry::helpers::set_parent_context_from_json_str(&span, &trace);

async move {
let handler = RequestHandler::new(engine.executor(), engine.query_schema(), engine.engine_protocol());
let response = handler
.handle(query, tx_id.map(TxId::from), trace_id)
.instrument(span)
.await;
let response = handler.handle(query, tx_id.map(TxId::from), trace_id).await;

Ok(serde_json::to_string(&response)?)
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)
Expand Down
11 changes: 3 additions & 8 deletions query-engine/query-engine/src/server/mod.rs
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ use std::collections::HashMap;
use std::net::SocketAddr;
use std::sync::Arc;
use std::time::Instant;
use tracing::{field, Instrument, Span};
use tracing::{field, Instrument};
use tracing_opentelemetry::OpenTelemetrySpanExt;

/// Starts up the graphql query engine server
Expand Down Expand Up @@ -116,13 +116,8 @@ async fn request_handler(cx: Arc<PrismaContext>, req: Request<Body>) -> Result<R
let tx_id = transaction_id(headers);
let tracing_cx = get_parent_span_context(headers);

let span = if tx_id.is_none() {
let span = info_span!("prisma:engine", user_facing = true);
span.set_parent(tracing_cx);
span
} else {
Span::none()
};
let span = info_span!("prisma:engine", user_facing = true);
span.set_parent(tracing_cx);

let mut traceparent = traceparent(headers);
let mut trace_id = get_trace_id_from_traceparent(traceparent.as_deref());
Expand Down