move hydro sentry error out of /events, to hydro

Author: mikesurowiec

lib/hydro.js

@@ -1,6 +1,7 @@
 const crypto = require('crypto')
 const fetch = require('node-fetch')
 const statsd = require('../lib/statsd')
+const FailBot = require('../lib/failbot')
 
 const hydroStats = statsd.childClient({
   prefix: 'hydro.'
@@ -82,6 +83,21 @@ module.exports = class Hydro {
     hydroStats.increment(`response_code.${res.statusCode}`, 1)
     hydroStats.increment('response_code.all', 1)
 
+    // Track hydro exceptions in Sentry, but don't track 503s because we can't do anything about service availability
+    if (!res.ok && res.status !== 503) {
+      const err = new Error(`Hydro request failed: ${res.statusText}`)
+      err.status = res.status
+      err.path = fields.path
+
+      FailBot.report(err, {
+        path: fields.path,
+        hydroStatus: res.status,
+        hydroText: res.statusText
+      })
+
+      throw err;
+    }
+
     return res;
   }
 }

middleware/events.js

@@ -2,7 +2,6 @@ const express = require('express')
 const { omit } = require('lodash')
 const Ajv = require('ajv')
 const schema = require('../lib/schema-event')
-const FailBot = require('../lib/failbot')
 
 const OMIT_FIELDS = ['type', 'token']
 
@@ -25,22 +24,7 @@ router.post('/', async function postEvents (req, res, next) {
     req.hydro.publish(
       req.hydro.schemas[fields.type],
       omit(fields, OMIT_FIELDS)
-    ).then(async (hydroRes) => {
-      // Track hydro exceptions in Sentry, but don't track 503s because we can't do anything about service availability
-      if (!hydroRes.ok && hydroRes.status !== 503) {
-        const err = new Error(`Hydro request failed: ${hydroRes.statusText}`)
-        err.status = hydroRes.status
-        err.path = fields.path
-
-        await FailBot.report(err, {
-          path: fields.path,
-          hydroStatus: hydroRes.status,
-          hydroText: hydroRes.statusText
-        })
-
-        throw err
-      }
-    }).catch((e) => {
+    ).catch((e) => {
       if (isDev) console.error(e)
     })
   }