fix: handle opensearch error when sending log

Author: J0sueTM

src/com/moclojer/components/logs.clj

@@ -3,9 +3,15 @@
    [clojure.core.async :as async]
    [clojure.data.json :as json]
    [clj-http.client :as http-client]
+   [com.moclojer.components.sentry :as sentry]
    [taoensso.telemere :as t])
   (:import [clojure.core.async.impl.channels ManyToManyChannel]))
 
+(defn send-sentry-evt-from-req! [req ex]
+  (if-let [sentry-cmp (get-in req [:components :sentry])]
+    (sentry/send-event! sentry-cmp {:throwable ex})
+    (prn :error "failed to send sentry event (nil component)")))
+
 (defn ->str-values
   "Adapts all values (including nested maps' values) from given
   map `m` to a string.
@@ -45,8 +51,11 @@
 
 (defn send-opensearch-log-req
   [base-req log]
-  (http-client/request
-   (update base-req :body str \newline log \newline)))
+  (try
+    (http-client/request
+     (update base-req :body str \newline log \newline))
+    (catch Exception e
+      (send-sentry-evt-from-req! base-req e))))
 
 (defonce log-ch (atom nil))
 
@@ -55,16 +64,15 @@
   level. On `prod` env however, an async channel waits for log events,
   which are then sent to OpenSearch."
   [config level env & [index]]
-  (let [prod? (= env :prod)
-        log-ch' (swap!
-                 log-ch
-                 (fn [ch]
-                   (when ch (async/close! ch))
-                   (async/chan)))]
+  (let [prod? (= env :prod)]
+
+    (when-let [ch @log-ch]
+      (async/close! ch))
+    (reset! log-ch (async/chan))
 
     (t/set-min-level! level)
 
-    (when (and prod? (instance? ManyToManyChannel log-ch'))
+    (when (and prod? (instance? ManyToManyChannel @log-ch))
       (let [os-cfg (when prod? (:opensearch config))
             os-base-req (build-opensearch-base-req os-cfg index)]
 
@@ -75,11 +83,11 @@
          :opensearch
          (fn [signal]
            (async/go
-             (async/>! log-ch' (signal->opensearch-log signal)))))
+             (async/>! @log-ch (signal->opensearch-log signal)))))
 
         (async/go
           (while true
-            (let [[log _] (async/alts! [log-ch'])]
+            (let [[log _] (async/alts! [@log-ch])]
               (send-opensearch-log-req os-base-req log))))))))
 
 (defn log [level msg & [:as data]]

src/com/moclojer/components/router.clj

@@ -1,7 +1,6 @@
 (ns com.moclojer.components.router
   (:require
    [com.moclojer.components.logs :as logs]
-   [com.moclojer.components.sentry :as sentry]
    [com.stuartsierra.component :as component]
    [muuntaja.core :as m]
    [reitit.coercion.malli :as reitit.malli]
@@ -17,17 +16,12 @@
    [reitit.swagger :as swagger]
    [reitit.swagger-ui :as swagger-ui]))
 
-(defn send-sentry-evt-from-req! [req ex]
-  (if-let [sentry-cmp (get-in req [:components :sentry])]
-    (sentry/send-event! sentry-cmp {:throwable ex})
-    (logs/log :error "failed to send sentry event (nil component)")))
-
 (defn- coercion-error-handler [status]
   (fn [exception request]
     (logs/log :error "failed to coerce req/resp"
               :ctx {:ex-message (.getMessage exception)
                     :coercion (:errors (ex-data exception))})
-    (send-sentry-evt-from-req! request exception)
+    (logs/send-sentry-evt-from-req! request exception)
     {:status status
      :body (if (= 400 status)
              (str "Invalid path or request parameters, with the following errors: "
@@ -37,7 +31,7 @@
 (defn- exception-info-handler [exception request]
   (logs/log :error "server exception"
             :ctx {:ex-message (.getMessage exception)})
-  (send-sentry-evt-from-req! request exception)
+  (logs/send-sentry-evt-from-req! request exception)
   {:status 500
    :body   "Internal error."})