Re-enabling distributed tracing through logging framework
This commit is contained in:
@@ -835,31 +835,35 @@
|
|||||||
([id q v]
|
([id q v]
|
||||||
(statsd/increment "query.graphql.count" {:tags #{(str "query:" (query-name q))}})
|
(statsd/increment "query.graphql.count" {:tags #{(str "query:" (query-name q))}})
|
||||||
(statsd/time! [(str "query.graphql.time" ) {:tags #{(str "query:" (query-name q))}}]
|
(statsd/time! [(str "query.graphql.time" ) {:tags #{(str "query:" (query-name q))}}]
|
||||||
(lc/with-context {:query q}
|
(mu/with-context {:query q}
|
||||||
(log/info "executing query name" (query-name q))
|
(mu/trace
|
||||||
(try
|
::user-query
|
||||||
(let [[result time] (time-it (simplify (execute schema q v {:id id})))]
|
[]
|
||||||
(info-event "Query completed"
|
(lc/with-context {:query q}
|
||||||
{:time (:time time)
|
(log/info "executing query name" (query-name q))
|
||||||
:errors (seq (:errors result))})
|
(try
|
||||||
(when (seq (:errors result))
|
(let [[result time] (time-it (simplify (execute schema q v {:id id})))]
|
||||||
(throw (ex-info "GraphQL error" {:result result})))
|
(info-event "Query completed"
|
||||||
result)
|
{:time (:time time)
|
||||||
|
:errors (seq (:errors result))})
|
||||||
|
(when (seq (:errors result))
|
||||||
|
(throw (ex-info "GraphQL error" {:result result})))
|
||||||
|
result)
|
||||||
|
|
||||||
(catch Exception e
|
(catch Exception e
|
||||||
(if-let [v (or (:validation-error (ex-data e))
|
(if-let [v (or (:validation-error (ex-data e))
|
||||||
(:validation-error (ex-data (.getCause e))))]
|
(:validation-error (ex-data (.getCause e))))]
|
||||||
|
|
||||||
(do
|
(do
|
||||||
(alog/warn ::query-validation
|
(alog/warn ::query-validation
|
||||||
:exception e)
|
:exception e)
|
||||||
(warn-event "validation error" {:validation-error v
|
(warn-event "validation error" {:validation-error v
|
||||||
:data (ex-data e)})
|
:data (ex-data e)})
|
||||||
(throw e)
|
(throw e)
|
||||||
#_{:errors [{:message v}]})
|
#_{:errors [{:message v}]})
|
||||||
(do
|
(do
|
||||||
(error-event "query error" {:error e})
|
(error-event "query error" {:error e})
|
||||||
(alog/error ::query-error
|
(alog/error ::query-error
|
||||||
:exception e)
|
:exception e)
|
||||||
|
|
||||||
(throw e)))))))))
|
(throw e)))))))))))
|
||||||
|
|||||||
Reference in New Issue
Block a user