hasura/graphql-engine
1
0
Fork 0
mirror of https://github.com/hasura/graphql-engine.git synced 2025-01-07 08:13:18 +03:00
Code Issues Projects Releases Wiki Activity

Server: Format Tracing values to string

Browse Source 
GitOrigin-RevId: eaa5aba0bc283f36870910671e3336aca0ea8222
This commit is contained in:
Naveen Naidu 2021-04-14 16:09:53 +05:30 committed by hasura-bot
parent 5850423aa6
commit f6fbf20b80
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -39,6 +39,7 @@ In the future, we will probably offer a way to explicitly choose which behaviour
- server: add a new `/dev/rts_stats` endpoint, enabled when hasura is started with '+RTS -T' - server: add a new `/dev/rts_stats` endpoint, enabled when hasura is started with '+RTS -T'
- server: re-enable a default HASURA_GRAPHQL_PG_CONN_LIFETIME of 10min - server: re-enable a default HASURA_GRAPHQL_PG_CONN_LIFETIME of 10min
- server: support for bigquery datasets - server: support for bigquery datasets
- server: format the values of `injectEventContext` as hexadecimal string instead of integer (fix #6465)
- console: add custom_column_names to track_table request with replaced invalid characters (#992) - console: add custom_column_names to track_table request with replaced invalid characters (#992)
- console: add details button to the success notification to see inserted row - console: add details button to the success notification to see inserted row
- console: add request preview for REST endpoints - console: add request preview for REST endpoints

8
server/src-lib/Hasura/Tracing.hs
View File

@ -247,8 +247,8 @@ extractHttpContext hdrs = do
injectEventContext :: TraceContext -> J.Value injectEventContext :: TraceContext -> J.Value
injectEventContext TraceContext{..} = injectEventContext TraceContext{..} =
J.object J.object
[ "trace_id" J..= tcCurrentTrace [ "trace_id" J..= word64ToHex tcCurrentTrace
, "span_id" J..= tcCurrentSpan , "span_id" J..= word64ToHex tcCurrentSpan
] ]
-- | Extract a trace context from an event trigger payload. -- | Extract a trace context from an event trigger payload.
@ -256,9 +256,9 @@ extractEventContext :: J.Value -> IO (Maybe TraceContext)
extractEventContext e = do extractEventContext e = do
freshSpanId <- liftIO Rand.randomIO freshSpanId <- liftIO Rand.randomIO
pure $ TraceContext pure $ TraceContext
<$> (e ^? JL.key "trace_context" . JL.key "trace_id" . JL._Integral) <$> (hexToWord64 =<< e ^? JL.key "trace_context" . JL.key "trace_id" . JL._String)
<*> pure freshSpanId <*> pure freshSpanId
<*> pure (e ^? JL.key "trace_context" . JL.key "span_id" . JL._Integral) <*> pure (hexToWord64 =<< e ^? JL.key "trace_context" . JL.key "span_id" . JL._String)
-- | Perform HTTP request which supports Trace headers -- | Perform HTTP request which supports Trace headers
tracedHttpRequest tracedHttpRequest