notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

minor tweak to make usernames show up correctly.

Browse Source
This commit is contained in:
Bryce Covert
2023-01-08 10:25:05 -08:00
parent 06f59ae531
commit 1b3eff8301
2 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/clj/auto_ap/graphql.clj
View File

@@ -835,35 +835,32 @@
([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 :user id} (mu/with-context {:query-string q :user id}
(mu/trace (lc/with-context {:query q}
::user-query (log/info "executing query name" (query-name q))
[] (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)
(warn-event "validation error" {:validation-error v
:data (ex-data e)})
(throw e)
#_{:errors [{:message v}]})
(do
(error-event "query error" {:error e})
(alog/error ::query-error
:exception e) :exception e)
(warn-event "validation error" {:validation-error v
:data (ex-data e)})
(throw e)
#_{:errors [{:message v}]})
(do
(error-event "query error" {:error e})
(alog/error ::query-error
:exception e)
(throw e))))))))))) (throw e))))))))))

3
src/clj/auto_ap/graphql/utils.clj
View File

@@ -147,7 +147,8 @@
(fn trace [a b c] (fn trace [a b c]
(mu/with-context {:query key (mu/with-context {:query key
:mutation (boolean (= "mutation" :mutation (boolean (= "mutation"
(namespace key)))} (namespace key)))
:user (:id a)}
(mu/trace (keyword "graphql" (name key)) (mu/trace (keyword "graphql" (name key))
[] []
(f a b c))))) (f a b c)))))