maybe fixes

This commit is contained in:
2023-01-06 21:44:46 -08:00
parent 87fedc7dfb
commit 631ea024b5

View File

@@ -835,34 +835,31 @@
([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))}}]
(mu/with-context {:query q (lc/with-context {:query q}
:user id} (log/info "executing query name" (query-name q))
(mu/trace ::graphql-query (try
(lc/with-context {:query q} (let [[result time] (time-it (simplify (execute schema q v {:id id})))]
(log/info "executing query name" (query-name q)) (info-event "Query completed"
(try {:time (:time time)
(let [[result time] (time-it (simplify (execute schema q v {:id id})))] :errors (seq (:errors result))})
(info-event "Query completed" (when (seq (:errors result))
{:time (:time time) (throw (ex-info "GraphQL error" {:result result})))
:errors (seq (:errors result))}) 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)))))))))