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

improvements.

Browse Source
This commit is contained in:
Bryce Covert
2022-01-04 16:28:29 -08:00
parent 83f2827553
commit 2e1fab5fd0
4 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/clj/auto_ap/background/metrics.clj
View File

@@ -4,5 +4,5 @@
[config.core :refer [env]])) [config.core :refer [env]]))
(mount/defstate metrics-setup (mount/defstate metrics-setup
:start (statsd/setup! :host "127.0.0.1" :port 8125 :prefix "integreat.app" :tags #{(:dd-env env)}) :start (statsd/setup! :host "127.0.0.1" :port 8125 :prefix "integreat.app")
:stop (statsd/shutdown!)) :stop (statsd/shutdown!))

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

@@ -1337,9 +1337,8 @@
([id q] ([id q]
(query id q nil)) (query id q nil))
([id q v] ([id q v]
(statsd/increment "query.count") (statsd/increment "query.graphql.count" {:tags #{(str "query:" (query-name q))}})
(statsd/increment (str "query." (query-name q) ".count")) (statsd/time! [(str "query.graphql.time" ) {:tags #{(str "query:" (query-name q))}}]
(statsd/time! [(str "query." (query-name q) ".time") {}]
(lc/with-context {:query q} (lc/with-context {:query q}
(log/info "executing query name" (query-name q)) (log/info "executing query name" (query-name q))
(try (try

37
src/clj/auto_ap/routes/exports.clj
View File

@@ -48,12 +48,17 @@
[(auto-ap.time/unparse ?d3 auto-ap.time/normal-date) ?d4]]} [(auto-ap.time/unparse ?d3 auto-ap.time/normal-date) ?d4]]}
:args [(d/db conn) client-id]})))))) :args [(d/db conn) client-id]}))))))
(defn client-tag [params]
(when-let [code (or (params "client-code")
(:client-code params))]
(str "client:" code)))
(def admin-only-routes (def admin-only-routes
(context "/" [] (context "/" []
(GET "/invoices/export" {:keys [query-params identity] :as request} (GET "/invoices/export" {:keys [query-params identity] :as request}
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.invoice.count") {:tags #{(query-params "client-code")}}) (statsd/increment (str "export.invoice.count") {:tags #{(client-tag query-params)}})
(statsd/time! [(str "export.invoice.time") {:tags #{(query-params "client-code")}}] (statsd/time! [(str "export.invoice.time") {:tags #{(client-tag query-params)}}]
(let [query [[:all_invoices (let [query [[:all_invoices
{:client-code (query-params "client-code") {:client-code (query-params "client-code")
:original-id (query-params "original")} :original-id (query-params "original")}
@@ -70,8 +75,8 @@
) )
(GET "/payments/export" {:keys [query-params identity]} (GET "/payments/export" {:keys [query-params identity]}
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.payment.count") {:tags #{(query-params "client-code")}}) (statsd/increment (str "export.payment.count") {:tags #{(client-tag query-params)}})
(statsd/time! [(str "export.payment.time") {:tags #{(query-params "client-code")}}] (statsd/time! [(str "export.payment.time") {:tags #{(client-tag query-params)}}]
(let [query [[:all_payments (let [query [[:all_payments
{:client-code (query-params "client-code") {:client-code (query-params "client-code")
:original-id (query-params "original")} :original-id (query-params "original")}
@@ -87,8 +92,8 @@
(GET "/sales/export" {:keys [query-params identity :as params]} (GET "/sales/export" {:keys [query-params identity :as params]}
(assert-admin identity) (assert-admin identity)
(println params) (println params)
(statsd/increment (str "export.sales.count") {:tags #{(query-params "client-code")}}) (statsd/increment (str "export.sales.count") {:tags #{(client-tag query-params)}})
(statsd/time! [(str "export.sales.time") {:tags #{(query-params "client-code")}}] (statsd/time! [(str "export.sales.time") {:tags #{(client-tag query-params)}}]
(let [query [[:all_sales_orders (let [query [[:all_sales_orders
(cond-> {:client-code (query-params "client-code")} (cond-> {:client-code (query-params "client-code")}
(query-params "after") (assoc :date-range {:start (query-params "after") (query-params "after") (assoc :date-range {:start (query-params "after")
@@ -140,8 +145,8 @@
(GET "/expected-deposit/export" {:keys [query-params identity]} (GET "/expected-deposit/export" {:keys [query-params identity]}
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.expected_deposit.count") {:tags #{(query-params "client-code")}}) (statsd/increment (str "export.expected_deposit.count") {:tags #{(client-tag query-params)}})
(statsd/time! [(str "export.expected_deposit.time") {:tags #{(query-params "client-code")}}] (statsd/time! [(str "export.expected_deposit.time") {:tags #{(client-tag query-params)}}]
(let [query [[:all_expected_deposits (let [query [[:all_expected_deposits
(cond-> {:client-code (query-params "client-code")} (cond-> {:client-code (query-params "client-code")}
(query-params "after") (assoc :date-range {:start (query-params "after") (query-params "after") (assoc :date-range {:start (query-params "after")
@@ -172,8 +177,8 @@
(GET "/ledger/export" {:keys [query-params identity]} (GET "/ledger/export" {:keys [query-params identity]}
(log/info "exporting for " (query-params "client-code")) (log/info "exporting for " (query-params "client-code"))
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.ledger.count") {:tags #{(query-params "client-code")}}) (statsd/increment (str "export.ledger.count") {:tags #{(client-tag query-params)}})
(statsd/time! [(str "export.ledger.time") {:tags #{(query-params "client-code")}}] (statsd/time! [(str "export.ledger.time") {:tags #{(client-tag query-params)}}]
(transduce (comp (transduce (comp
(map #(update % :journal-entry/date to-date)) (map #(update % :journal-entry/date to-date))
(map <-graphql)) (map <-graphql))
@@ -184,8 +189,8 @@
(GET "/accounts/export" {:keys [query-params identity]} (GET "/accounts/export" {:keys [query-params identity]}
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.accounts.count") {:tags #{(query-params "client-code")}}) (statsd/increment (str "export.accounts.count") {:tags #{(client-tag query-params)}})
(statsd/time! [(str "export.accounts.time") {:tags #{(query-params "client-code")}}] (statsd/time! [(str "export.accounts.time") {:tags #{(client-tag query-params)}}]
(let [client-id (d-clients/code->id (query-params "client-code")) (let [client-id (d-clients/code->id (query-params "client-code"))
query [[:accounts query [[:accounts
[:id :numeric_code :type :applicability :location :name [:client_overrides [:name [:client [:id :code :name]]]]]]] [:id :numeric_code :type :applicability :location :name [:client_overrides [:name [:client [:id :code :name]]]]]]]
@@ -213,8 +218,8 @@
(GET "/transactions/export" {:keys [query-params identity]} (GET "/transactions/export" {:keys [query-params identity]}
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.transactions.count") {:tags #{(query-params "client-code")}}) (statsd/increment (str "export.transactions.count") {:tags #{(client-tag query-params)}})
(statsd/time! [(str "export.transactions.time") {:tags #{(query-params "client-code")}}] (statsd/time! [(str "export.transactions.time") {:tags #{(client-tag query-params)}}]
(let [[transactions] (d-transactions/get-graphql {:client-code (query-params "client-code") (let [[transactions] (d-transactions/get-graphql {:client-code (query-params "client-code")
#_#_:original-id (Integer/parseInt (query-params "original")) #_#_:original-id (Integer/parseInt (query-params "original"))
:count Integer/MAX_VALUE})] :count Integer/MAX_VALUE})]
@@ -231,8 +236,8 @@
(GET "/transactions/export2" {:keys [query-params identity]} (GET "/transactions/export2" {:keys [query-params identity]}
(assert-admin identity) (assert-admin identity)
(statsd/increment (str "export.transactions2.count") {:tags #{(query-params "client-code")}}) (statsd/increment (str "export.transactions2.count") {:tags #{(client-tag query-params)}})
(statsd/time! [(str "export.transactions2.time") {:tags #{(query-params "client-code")}}] (statsd/time! [(str "export.transactions2.time") {:tags #{(client-tag query-params)}}]
(let [db (d/db conn)] (let [db (d/db conn)]
(->> (->>
(d/query {:query {:find ['?e] (d/query {:query {:find ['?e]

8
src/clj/auto_ap/routes/queries.clj
View File

@@ -89,8 +89,8 @@
:key (str/replace (:key o) #"^queries\/" "")})))})) :key (str/replace (:key o) #"^queries\/" "")})))}))
(GET "/:query-id/results/json" {:keys [query-params identity params]} (GET "/:query-id/results/json" {:keys [query-params identity params]}
(statsd/increment (str "export.query.count") {:tags #{(:query-id params)}}) (statsd/increment (str "export.query.count") {:tags #{(str "query:" (:query-id params))}})
(statsd/time! [(str "export.query.time") {:tags #{(:query-id params)}}] (statsd/time! [(str "export.query.time") {:tags #{(str "query:" (:query-id params))}}]
{:body (execute-query query-params params)})))) {:body (execute-query query-params params)}))))
@@ -108,8 +108,8 @@
(def csv-routes (def csv-routes
(context "/queries" [] (context "/queries" []
(GET "/:query-id/results/csv" {:keys [query-params identity params]} (GET "/:query-id/results/csv" {:keys [query-params identity params]}
(statsd/increment (str "export.query.count") {:tags #{(:query-id params)}}) (statsd/increment (str "export.query.count") {:tags #{(str "query:" (:query-id params))}})
(statsd/time! [(str "export.query.time") {:tags #{(:query-id params)}}] (statsd/time! [(str "export.query.time") {:tags #{(str "query:" (:query-id params))}}]
{:body (execute-query query-params params)})))) {:body (execute-query query-params params)}))))
(defroutes query2-routes (defroutes query2-routes
(routes (routes