Merge pull request #146 from segmentio/retries

Improve Retry Behaviour.

index.js

@@ -4,7 +4,7 @@ const assert = require('assert')
 const removeSlash = require('remove-trailing-slash')
 const validate = require('@segment/loosely-validate-event')
 const axios = require('axios')
-const retries = require('axios-retry')
+const axiosRetry = require('axios-retry')
 const ms = require('ms')
 const uid = require('crypto-token')
 const version = require('./package.json').version
@@ -38,7 +38,10 @@ class Analytics {
     this.flushInterval = options.flushInterval || 10000
     this.flushed = false
 
-    retries(axios, options.retryCount || 3)
+    axiosRetry(axios, {
+      retries: options.retryCount || 3,
+      retryCondition: this._isErrorRetryable
+    })
   }
 
   /**
@@ -254,6 +257,30 @@ class Analytics {
         done(err)
       })
   }
+
+  _isErrorRetryable (error) {
+    // Retry Network Errors.
+    if (axiosRetry.isNetworkError(error)) {
+      return true
+    }
+
+    if (!error.response) {
+      // Cannot determine if the request can be retried
+      return false
+    }
+
+    // Retry Server Errors (5xx).
+    if (error.response.status >= 500 && error.response.status <= 599) {
+      return true
+    }
+
+    // Retry if rate limited.
+    if (error.response.status === 429) {
+      return true
+    }
+
+    return false
+  }
 }
 
 module.exports = Analytics

test.js

@@ -503,6 +503,23 @@ test('alias - require previousId and userId', t => {
   })
 })
 
+test('isErrorRetryable', t => {
+  const client = createClient()
+
+  t.false(client._isErrorRetryable({}))
+
+  // ETIMEDOUT is retryable as per `is-retry-allowed` (used by axios-retry in `isNetworkError`).
+  t.true(client._isErrorRetryable({ code: 'ETIMEDOUT' }))
+
+  // ECONNABORTED is not retryable as per `is-retry-allowed` (used by axios-retry in `isNetworkError`).
+  t.false(client._isErrorRetryable({ code: 'ECONNABORTED' }))
+
+  t.true(client._isErrorRetryable({ response: { status: 500 } }))
+  t.true(client._isErrorRetryable({ response: { status: 429 } }))
+
+  t.false(client._isErrorRetryable({ response: { status: 200 } }))
+})
+
 const { RUN_E2E_TESTS } = process.env
 
 if (RUN_E2E_TESTS) {