Skip to content

fix(tracing): mark database query/mutation spans as client, not internal #10869

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

Open
eeshsaxena wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −5
Open

fix(tracing): mark database query/mutation spans as client, not internal #10869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1310367
fix(tracing): mark database query/mutation spans as client, not internal
eeshsaxena Aug 9, 2026
01a16a0
fix(tracing): mark database query/mutation spans as client, not internal
eeshsaxena Aug 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/src-lib/Hasura/Backends/MSSQL/Instances/Transport.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ runQuery ::
runQuery reqId query fieldName _userInfo logger _ sourceConfig tx genSql _ = do
logQueryLog logger $ mkQueryLog query fieldName genSql reqId
withElapsedTime
$ newSpan ("MSSQL Query for root field " <>> fieldName) SKInternal
$ newSpan ("MSSQL Query for root field " <>> fieldName) SKClient
$ (<* attachSourceConfigAttributes @'MSSQL sourceConfig)
$ fmap snd (run tx)

Expand Down Expand Up @@ -116,7 +116,7 @@ runMutation ::
runMutation reqId query fieldName _userInfo logger _ sourceConfig tx _genSql _ = do
logQueryLog logger $ mkQueryLog query fieldName Nothing reqId
withElapsedTime
$ newSpan ("MSSQL Mutation for root field " <>> fieldName) SKInternal
$ newSpan ("MSSQL Mutation for root field " <>> fieldName) SKClient
$ (<* attachSourceConfigAttributes @'MSSQL sourceConfig)
$ run tx

Expand Down
6 changes: 3 additions & 3 deletions server/src-lib/Hasura/Backends/Postgres/Instances/Transport.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ runPGQuery reqId query fieldName _userInfo logger _ sourceConfig tx genSql resol
-- log the generated SQL and the graphql query
logQueryLog logger $ mkQueryLog query fieldName genSql reqId (resolvedConnectionTemplate <$ resolvedConnectionTemplate)
withElapsedTime
$ newSpan ("Postgres Query for root field " <>> fieldName) SKInternal
$ newSpan ("Postgres Query for root field " <>> fieldName) SKClient
$ (<* attachSourceConfigAttributes @('Postgres pgKind) sourceConfig)
$ runQueryTx (_pscExecCtx sourceConfig) (GraphQLQuery resolvedConnectionTemplate)
$ fmap snd (runOnBaseMonad tx)
Expand Down Expand Up @@ -114,7 +114,7 @@ runPGMutation reqId query fieldName userInfo logger _ sourceConfig tx _genSql re
-- log the graphql query
logQueryLog logger $ mkQueryLog query fieldName Nothing reqId (resolvedConnectionTemplate <$ resolvedConnectionTemplate)
withElapsedTime
$ newSpan ("Postgres Mutation for root field " <>> fieldName) SKInternal
$ newSpan ("Postgres Mutation for root field " <>> fieldName) SKClient
$ (<* attachSourceConfigAttributes @('Postgres pgKind) sourceConfig)
$ runTxWithCtxAndUserInfo userInfo (_pscExecCtx sourceConfig) (Tx PG.ReadWrite Nothing) (GraphQLQuery resolvedConnectionTemplate)
$ runOnBaseMonad tx
Expand Down Expand Up @@ -204,7 +204,7 @@ runPGMutationTransaction reqId query userInfo logger sourceConfig resolvedConnec
withElapsedTime
$ runTxWithCtxAndUserInfo userInfo (_pscExecCtx sourceConfig) (Tx PG.ReadWrite Nothing) (GraphQLQuery resolvedConnectionTemplate)
$ flip InsOrdHashMap.traverseWithKey mutations \fieldName dbsi ->
newSpan ("Postgres Mutation for root field " <>> fieldName) SKInternal
newSpan ("Postgres Mutation for root field " <>> fieldName) SKClient
$ (<* attachSourceConfigAttributes @('Postgres pgKind) sourceConfig)
$ fmap arResult
$ runOnBaseMonad
Expand Down