diff --git a/src/clj/auto_ap/routes/exports.clj b/src/clj/auto_ap/routes/exports.clj index 01b6d72c..e8b0d5b7 100644 --- a/src/clj/auto_ap/routes/exports.clj +++ b/src/clj/auto_ap/routes/exports.clj @@ -57,8 +57,8 @@ (context "/" [] (GET "/invoices/export" {:keys [query-params identity] :as request} (assert-admin identity) - (statsd/increment (str "export.invoice.count") {:tags #{(client-tag query-params)}}) - (statsd/time! [(str "export.invoice.time") {:tags #{(client-tag query-params)}}] + (statsd/time! [(str "export.time") {:tags #{(client-tag query-params) + "export:invoice"}}] (let [query [[:all_invoices {:client-code (query-params "client-code") :original-id (query-params "original")} @@ -75,8 +75,8 @@ ) (GET "/payments/export" {:keys [query-params identity]} (assert-admin identity) - (statsd/increment (str "export.payment.count") {:tags #{(client-tag query-params)}}) - (statsd/time! [(str "export.payment.time") {:tags #{(client-tag query-params)}}] + (statsd/time! [(str "export.time") {:tags #{(client-tag query-params) + "export:payment"}}] (let [query [[:all_payments {:client-code (query-params "client-code") :original-id (query-params "original")} @@ -92,8 +92,8 @@ (GET "/sales/export" {:keys [query-params identity :as params]} (assert-admin identity) (println params) - (statsd/increment (str "export.sales.count") {:tags #{(client-tag query-params)}}) - (statsd/time! [(str "export.sales.time") {:tags #{(client-tag query-params)}}] + (statsd/time! [(str "export.time") {:tags #{(client-tag query-params) + "export:sales"}}] (let [query [[:all_sales_orders (cond-> {:client-code (query-params "client-code")} (query-params "after") (assoc :date-range {:start (query-params "after") @@ -145,8 +145,8 @@ (GET "/expected-deposit/export" {:keys [query-params identity]} (assert-admin identity) - (statsd/increment (str "export.expected_deposit.count") {:tags #{(client-tag query-params)}}) - (statsd/time! [(str "export.expected_deposit.time") {:tags #{(client-tag query-params)}}] + (statsd/time! [(str "export.time") {:tags #{(client-tag query-params) + "export:deposit"}}] (let [query [[:all_expected_deposits (cond-> {:client-code (query-params "client-code")} (query-params "after") (assoc :date-range {:start (query-params "after") @@ -171,14 +171,13 @@ (GET "/vendors/export" {:keys [query-params identity]} (assert-admin identity) - (statsd/increment (str "export.vendor.count" )) - (statsd/time! [(str "export.vendor.time") {}] + (statsd/time! [(str "export.time") {:tags #{"export:vendors"}}] (map <-graphql (d-vendors/get-graphql {})))) (GET "/ledger/export" {:keys [query-params identity]} (log/info "exporting for " (query-params "client-code")) (assert-admin identity) - (statsd/increment (str "export.ledger.count") {:tags #{(client-tag query-params)}}) - (statsd/time! [(str "export.ledger.time") {:tags #{(client-tag query-params)}}] + (statsd/time! [(str "export.time") {:tags #{(client-tag query-params) + "export:ledger"}}] (transduce (comp (map #(update % :journal-entry/date to-date)) (map <-graphql)) @@ -189,8 +188,8 @@ (GET "/accounts/export" {:keys [query-params identity]} (assert-admin identity) - (statsd/increment (str "export.accounts.count") {:tags #{(client-tag query-params)}}) - (statsd/time! [(str "export.accounts.time") {:tags #{(client-tag query-params)}}] + (statsd/time! [(str "export.time") {:tags #{(client-tag query-params) + "export:accounts"}}] (let [client-id (d-clients/code->id (query-params "client-code")) query [[:accounts [:id :numeric_code :type :applicability :location :name [:client_overrides [:name [:client [:id :code :name]]]]]]] @@ -218,8 +217,8 @@ (GET "/transactions/export" {:keys [query-params identity]} (assert-admin identity) - (statsd/increment (str "export.transactions.count") {:tags #{(client-tag query-params)}}) - (statsd/time! [(str "export.transactions.time") {:tags #{(client-tag query-params)}}] + (statsd/time! [(str "export.time") {:tags #{(client-tag query-params) + "export:transactions"}}] (let [[transactions] (d-transactions/get-graphql {:client-code (query-params "client-code") #_#_:original-id (Integer/parseInt (query-params "original")) :count Integer/MAX_VALUE})] @@ -236,8 +235,8 @@ (GET "/transactions/export2" {:keys [query-params identity]} (assert-admin identity) - (statsd/increment (str "export.transactions2.count") {:tags #{(client-tag query-params)}}) - (statsd/time! [(str "export.transactions2.time") {:tags #{(client-tag query-params)}}] + (statsd/time! [(str "export.time") {:tags #{(client-tag query-params) + "export:transactions2"}}] (let [db (d/db conn)] (->> (d/query {:query {:find ['?e] @@ -265,9 +264,7 @@ (GET "/raw" {:keys [query-params identity]} (assert-admin identity) (log/info "Executing raw query " (get query-params "query" )) - - (statsd/increment (str "export.raw." (get query-params "query" ) ".count")) - (statsd/time! [(str "export.raw." (get query-params "query" ) ".time") {}] + (statsd/time! [(str "export.time") {:tags #{"export:raw"}}] (into (list) (apply d/q (clojure.edn/read-string (get query-params "query" )) (into [(d/db conn)] (clojure.edn/read-string (get query-params "args" "[]"))))))))) (defroutes export-routes (routes diff --git a/src/clj/auto_ap/routes/queries.clj b/src/clj/auto_ap/routes/queries.clj index 624bfeef..41315fc0 100644 --- a/src/clj/auto_ap/routes/queries.clj +++ b/src/clj/auto_ap/routes/queries.clj @@ -89,7 +89,6 @@ :key (str/replace (:key o) #"^queries\/" "")})))})) (GET "/:query-id/results/json" {:keys [query-params identity params]} - (statsd/increment (str "export.query.count") {:tags #{(str "query:" (:query-id params))}}) (statsd/time! [(str "export.query.time") {:tags #{(str "query:" (:query-id params))}}] {:body (execute-query query-params params)})))) @@ -108,7 +107,6 @@ (def csv-routes (context "/queries" [] (GET "/:query-id/results/csv" {:keys [query-params identity params]} - (statsd/increment (str "export.query.count") {:tags #{(str "query:" (:query-id params))}}) (statsd/time! [(str "export.query.time") {:tags #{(str "query:" (:query-id params))}}] {:body (execute-query query-params params)})))) (defroutes query2-routes